Merge branch 'master' into onboarding/conformance_statements

zowe · Jan 30, 2024 · 107c8cd · 107c8cd
2 parents 0ad8c93 + d947719
commit 107c8cd
Show file tree

Hide file tree

Showing 7 changed files with 190 additions and 88 deletions.
diff --git a/_data/releases.yml b/_data/releases.yml
@@ -2,15 +2,29 @@
 # Note - keep this in order as the latest release is pulled from the first item in the list!
 future:
   v2:
+    - version: 2.15.1
+      release_date: 2024-05-27
     - version: 2.15.0
       release_date: 2024-03-04
-    - version: 2.14.0
-      release_date: 2024-01-22
   v1:
     - version: 1.28.6
       release_date: 2024-09-30
 
 v2:
+  - version: 2.14.0
+    zos_version: 2.14.0
+    smpe_version: 2.14.0
+    smpe_sysmod: PTF
+    smpe_numbers: UO90047 UO90048
+    containerization_version: 2.13.0
+    cli_version: 2.14.0
+    cli_plugins_version: 2.14.0
+    explorer_version: 2.14.0
+    node_sdk_version: 2.14.0
+    python_sdk_version: 2.14.0
+    release_date: 2023-01-26
+    documentation: stable
+    release_notes: v2_14_0
   - version: 2.13.0
     zos_version: 2.13.0
     smpe_version: 2.13.0
@@ -23,7 +37,7 @@ v2:
     node_sdk_version: 2.13.0
     python_sdk_version: 2.13.0
     release_date: 2023-12-14
-    documentation: stable
+    documentation: v2_13_x
     release_notes: v2_13_0
   - version: 2.12.0
     zos_version: 2.12.0

diff --git a/_data/vnext_changes.yml b/_data/vnext_changes.yml
@@ -40,14 +40,13 @@
 
     **Breaking changes**
 
+    - Introduce new format for error messages to improve clarity
     - Remove V1 profile support
-    - Change authentication order of preference
     - Remove deprecated items - [CLI](https://github.com/zowe/zowe-cli/issues/1694) and [Imperative](https://github.com/zowe/imperative/issues/970)
     - IMS CLI extension is archived
 
     **Important updates**
 
-    - Support multiple API ML Gateway connections within a single config file. 
     - Provide a Jenkinsfile template to replace shared library (github.com/zowe/zowe-cli-version-controller)
 
 - name: Explorer for Intellij

diff --git a/_data/vnext_faq.yml b/_data/vnext_faq.yml
@@ -121,3 +121,56 @@ extenders:
          answer: |
            
            Zowe provides the SBOMs with V3 in updated SPDX Formats.
+
+consumers:
+   - name: API ML for Users Frequently Asked Questions
+     id: questions-apiml-users
+     questions: 
+       - number: 1
+         question: APIML v3 won't support clients with onboarding enabler v2, right?
+         answer: |
+           
+           The API ML in version 3 supports clients with onboarding enablers from version 2. It also works the other way around the onboarding enablers from version 3 will continue working with Zowe v2
+
+       - number: 2
+         question: For us, as for extenders, jump to Java 17 means that we have to maintain 2 separate versions of our application - one with apiml-enabler v2 and another one with v3 to support customers who want to stay with Java 8. Do you have any recommendation or a workaround how to support both java versions?
+         answer: |
+           
+           Plain Java Enabler in v2 will work in v3 - you can keep this for 1 - 2 years
+
+           Using Spring Boot, Java 17 requirement comes from SPRING, recommendation is to MOVE if you are using something from SPRING
+
+       - number: 3
+         question: Can you speak about the migration from Zuul to Spring Cloud Gateway? Today there are two separate gateway services in API-ML with separate config.
+         answer: |
+           
+           Goal is to have 1, spring-cloud gateway. The spring-cloud-gateway configuration should move under the component.gateway namespace. We expect to have one cluster od spring cloud gateway ahead of multiple sysplexes and then one cluster on every sysplex. Most of the configuration that was used should remain, new one from Spring Cloud Gateway remains. 
+
+       - number: 4
+         question: If you have a legacy gateway deployed will there be migration help? / is the old gateway gone?
+         answer: |
+           
+           It is gone in V3, but nothing should change from the point of view of the user…  if we discover that is not true we will plan to deliver a configuration utility to help with this transition
+
+       - number: 5
+         question: Can you talk us through how a client-side end-user will find and obtain the correct APIML service instance ID for the desired instance of their service?
+         answer: |
+           
+           Since one service can have multiple instances, living on different LPARS or different Environments how can clients identify a specific service on a specific system? 
+
+           TODAY - Clients can use the header instance ID to route to a specific instance / get information from specific services via an API on discovery service, but this part is going to be improved in 2Q 2024
+
+       - number: 6
+         question: Will the LPAR id be available for the clients to obtain?
+         answer: |
+           
+           It isn't now, but we will work on this functionality in 2Q 2024
+
+       - number: 7
+         question: Regarding Static Onboarding - we're using a template that Zowe upon startup would find through manifest, then read, fill variables and put into the api-defs directory, no manual user action required. Will this still be available?
+         answer: |
+           
+           It will remain available. The recommendation is through the V3 to move the directory away from Zowe workspace, if it isn't away by now. The zowe.yaml contains parameter specifying where the static definitions directories live components.discovery.alternativeStaticApiDefinitionsDirectories 
+
+
+
diff --git a/_data/vnext_office_hours.yml b/_data/vnext_office_hours.yml
@@ -29,18 +29,23 @@ consumers:
   - date: 01/05/2024 8AM - 9AM ET
     topic: API Mediation Layer
     meeting_link: https://zoom-lfx.platform.linuxfoundation.org/meeting/95815909111?password=57c97886-d2b6-4430-9c05-1eedfa1e0fa7
-    recording_link: 
-    materials_link: 
+    recording_link: https://zoom.us/rec/share/iZ6-6mv0qy8tlnaIshVYyEF5fWAREjWYuwuvyyB9v9QKUcAzrpXZArT83qgpmO4u.tQFWMquAL3_sqgug
+    materials_link: https://ibm.box.com/s/06rtqh1at3nd7q3lgi36ly8uum1h4adn
   - date: 01/12/2024 8AM - 9AM ET
-    topic: CLI & Node SDK
+    topic: CLI
     meeting_link: https://zoom-lfx.platform.linuxfoundation.org/meeting/95815909111?password=57c97886-d2b6-4430-9c05-1eedfa1e0fa7
-    recording_link: 
-    materials_link: 
+    recording_link: https://zoom.us/rec/share/oWx79e8rAeAMFSikY9klU0-zURSE4TBZGxUQg33aqsBRPQs8LWQuE8DG4qIWy4fK.bGhUwOZitTNq0gYz
+    materials_link: https://ibm.box.com/s/aqcwrc83i8uq9llyo3kae8pjxi0p1xlb
+  - date: 01/12/2024 8AM - 9AM ET
+    topic: Node Client SDK
+    meeting_link: https://zoom-lfx.platform.linuxfoundation.org/meeting/95815909111?password=57c97886-d2b6-4430-9c05-1eedfa1e0fa7
+    recording_link: https://zoom.us/rec/share/oWx79e8rAeAMFSikY9klU0-zURSE4TBZGxUQg33aqsBRPQs8LWQuE8DG4qIWy4fK.bGhUwOZitTNq0gYz
+    materials_link: https://ibm.box.com/s/ujdkjfb6f1zhx4amse1x7aysdb76ai80
   - date: 01/19/2024 8AM - 9AM ET
     topic: Explorer (VSCode)
     meeting_link: https://zoom-lfx.platform.linuxfoundation.org/meeting/95815909111?password=57c97886-d2b6-4430-9c05-1eedfa1e0fa7
-    recording_link: 
-    materials_link: 
+    recording_link: https://zoom.us/rec/share/DjXmEXpMaQKTww7czM2IgDpHvUPi4ltC7DsrvNXI0EX1pBel3S4F7cgLXp_qOo-y.ChpJROsc0PhkhAh4
+    materials_link: https://ibm.box.com/s/366i3i576c3r2s6kn3sqtwxzsj9lcpzm
   - date: 01/26/2024 8AM - 9AM ET
     topic: Explorer (Intellij)
     meeting_link: https://zoom-lfx.platform.linuxfoundation.org/meeting/95815909111?password=57c97886-d2b6-4430-9c05-1eedfa1e0fa7

diff --git a/_includes/post-download-script.html b/_includes/post-download-script.html
@@ -2,59 +2,76 @@
 <script>
     params = new URLSearchParams(location.search);
 
-    filename_prefix = 'zowe'
-    file_ext = 'pax'
-    package_name = 'Zowe Binary'
+    filename_prefix = 'zowe';
+    file_ext = 'pax';
+    package_name = 'Zowe Binary';
 
     if(params.has('type')){
         switch(params.get('type')){
             case 'cli':
                 filename_prefix = 'zowe-cli-package';
                 file_ext = 'zip';
-                package_name = 'Zowe CLI Package'
+                package_name = 'Zowe CLI Package';
                 break;
             case 'cli-plugins':
                 filename_prefix = 'zowe-cli-plugins';
                 file_ext = 'zip';
-                package_name = 'Zowe CLI Plugins Package'
+                package_name = 'Zowe CLI Plugins Package';
                 break;
             case 'nodejs-sdk':
                 filename_prefix = 'zowe-nodejs-sdk';
                 file_ext = 'zip';
-                package_name = 'Zowe Node.js Client SDK'
+                package_name = 'Zowe Node.js Client SDK';
                 break;
             case 'python-sdk':
                 filename_prefix = 'zowe-python-sdk';
                 file_ext = 'zip';
-                package_name = 'Zowe Python Client SDK'
+                package_name = 'Zowe Python Client SDK';
+                break;
+            case 'smpe':
+                filename_prefix = 'zowe-smpe-package';
+                file_ext = 'zip';
+                package_name = 'Zowe SMP/E Package';
+                break;
+            case 'pswi':
+                filename_prefix = 'zowe-PSWI';
+                file_ext = 'pax.Z';
+                package_name = 'Zowe Portable Software Instance';
+                break;
+            case 'containerization':
+                filename_prefix = 'zowe-containerization';
+                file_ext = 'zip';
+                package_name = 'Zowe Containerization Build';
                 break;
         }
     }
 
+    filename = filename_prefix + "-" + params.get('version') + "." + file_ext;
+
     if (params.has('version')) {
-        document.getElementById('download_link').href = "legal.html?version=" + params.get('version');
+        document.getElementById('download_link').href = "legal.html?type=" + params.get('type') + "&version=" + params.get('version');
+
+        if(params.get('version').toString().startsWith('1')) {
+            document.getElementById('end-of-support-reminder').style.display = "block";
+        }
 
         document.getElementById('page_title').innerText = 'Thank you for downloading the ' + package_name;
         document.getElementById('verify_drop').innerText = 'Verify Hash and Signature of ' + package_name;
         document.getElementById('hash_download').href = "https://zowe.jfrog.io/zowe/list/libs-release-local/org/zowe/" +
-            params.get('version') + "/" + filename_prefix + "-" + params.get('version') + "." + file_ext + ".sha512";
+            params.get('version') + "/" + filename + ".sha512";
         document.getElementById('hash_download').onclick = function () {
-            ga && ga('send', 'event', 'download', package_name + ' Hash ' + params.get('version'), filename_prefix + '-' + 
-                params.get('version') + '.' + file_ext + '.sha512');
+            ga && ga('send', 'event', 'download', package_name + ' Hash ' + params.get('version'), filename + '.sha512');
         }
-        document.getElementById('hash_download').innerHTML = filename_prefix + "-" + params.get('version') + "." + file_ext + ".sha512"; 
-        document.getElementById('hash_code').innerHTML = '(gpg --print-md SHA512 ' + filename_prefix + "-" + params.get('version') +
-            '.' + file_ext + ' &gt; ' + filename_prefix + "-" + params.get('version') + '.' + file_ext + '.sha512.my) && diff ' + filename_prefix +
-            "-" + params.get('version') + '.' + file_ext + '.sha512.my ' + filename_prefix + "-" + params.get('version') + '.' + file_ext + 
-            '.sha512 && echo matched || echo "not match"';
-        document.getElementById('hash_my').innerHTML = filename_prefix + "-" + params.get('version') + '.' + file_ext + '.sha512.my';
+        document.getElementById('hash_download').innerHTML = filename + ".sha512"; 
+        document.getElementById('hash_code').innerHTML = '(gpg --print-md SHA512 ' + filename + ' &gt; ' + filename + '.sha512.my) && diff ' + filename + 
+            '.sha512.my ' + filename + '.sha512 && echo matched || echo "not match"';
+        document.getElementById('hash_my').innerHTML = filename + '.sha512.my';
         document.getElementById('signature_download').href = "https://zowe.jfrog.io/zowe/list/libs-release-local/org/zowe/" + params.get('version') +
-            "/" + filename_prefix + "-" + params.get('version') + "." + file_ext + ".asc";
+            "/" + filename + ".asc";
         document.getElementById('signature_download').onclick = function () {
-            ga && ga('send', 'event', 'download', package_name + ' Signature ' + params.get('version'), filename_prefix + "-" + params.get('version') + 
-            '.' + file_ext + '.asc');
+            ga && ga('send', 'event', 'download', package_name + ' Signature ' + params.get('version'), filename + '.asc');
         }
-        document.getElementById('signature_download').innerHTML = filename_prefix + "-" + params.get('version') + '.' + file_ext + '.asc';
+        document.getElementById('signature_download').innerHTML = filename + '.asc';
         xhttp = new XMLHttpRequest();
         xhttp.onreadystatechange = function () {
             if (this.readyState == 4 && this.status == 200) {
@@ -73,8 +90,7 @@
         xhttp.open("GET", "https://zowe.jfrog.io/zowe/list/libs-release-local/org/zowe/" + params.get('version') +
             "/code-signing-key-info.json", true);
         xhttp.send();
-        document.getElementById('gpg_command').innerHTML = 'gpg --verify ' + filename_prefix + "-" + params.get('version') +
-            '.' + file_ext + '.asc ' + filename_prefix + "-" + params.get('version') + '.' + file_ext; 
+        document.getElementById('gpg_command').innerHTML = 'gpg --verify ' + filename + '.asc ' + filename; 
     }
 
 </script>
diff --git a/contribute.md b/contribute.md
@@ -29,7 +29,7 @@
       <p class="card-text">Hosted by the Open Mainframe Project, this is a messaging board where you can directly engage with Zowe users and contributors - ask questions, engage in discussions, and contribute your ideas!</p>
       <p>Some popular channels to get started: <ul>
       <li><a href="{{ site.zowe_onboarding_slack_url }}">#zowe-onboarding</a></li> 
-      <li><a href="{{ site.zowe_user_slack_url }}">#zowe-user</a></li> 
+      <li><a href="{{ site.zowe_user_slack_url }}">#zowe-help</a></li> 
       <li><a href="{{ site.zowe_cli_slack_url }}">#zowe-cli</a></li> 
       <li><a href="{{ site.zowe_explorer_slack_url }}">#zowe-explorer</a></li> 
       <li><a href="{{ site.apiml_slack_url }}">#zowe-api</a></li>
@@ -146,4 +146,4 @@
         </tbody>
       </table>
     </div>
-  {% endif %} -->
+  {% endif %} -->