Backport fixes in v2.x/master to v2.x/staging (#3923)

zowe · Jul 24, 2024 · 07b929e · 07b929e
1 parent 1bf063b
commit 07b929e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/.github/scripts/manifest_verification/check_sources.js b/.github/scripts/manifest_verification/check_sources.js
@@ -81,15 +81,18 @@ async function main() {
       }
 
       // If not a commit, check repo tags
-      const tags = await octokit.rest.repos.listTags({
-        owner: 'zowe',
-        repo: repo,
-      }).then((resp) => {
-        if (resp.status < 400) {
-          return resp.data;
+      //  requires paginate API.
+
+      const tags = await octokit.paginate(
+        "GET /repos/{owner}/{repo}/tags",
+        {
+            owner: 'zowe',
+            repo: repo,
         }
-        return [];
-      })
+      ).then((resp) => {
+        // resp is the aggregated data from paginate.. [ { name: 'tag-a', ..other-fields.. }, {}, {}, ...]
+        return resp; 
+      });
 
       const knownTag = tags.find((item) => item.name === tag);
       if (knownTag != null && knownTag.name.trim().length > 0) {

diff --git a/.github/scripts/manifest_verification/package-lock.json b/.github/scripts/manifest_verification/package-lock.json
diff --git a/example-zowe.yaml b/example-zowe.yaml
@@ -98,7 +98,7 @@ zowe:
     # >>>> Certificate setup scenario 1
     # PKCS12 (keystore) with Zowe generate certificates.
     certificate:
-      # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+      # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
       type: PKCS12
       pkcs12:
         # **COMMONLY_CUSTOMIZED**
@@ -143,7 +143,7 @@ zowe:
     # # >>>> Certificate setup scenario 2
     # # PKCS12 (keystore) with importing certificate generated by other CA.
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: PKCS12
     #   pkcs12:
     #     # **COMMONLY_CUSTOMIZED**
@@ -176,7 +176,7 @@ zowe:
     # # >>>> Certificate setup scenario 3
     # # Zowe generated z/OS Keyring with Zowe generated certificates.
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
@@ -211,7 +211,7 @@ zowe:
     # # >>>> Certificate setup scenario 4
     # # Zowe generated z/OS Keyring and connect to existing certificate
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
@@ -235,7 +235,7 @@ zowe:
     # # >>>> Certificate setup scenario 5
     # # Zowe generated z/OS Keyring with importing certificate stored in data set
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**

diff --git a/files/defaults.yaml b/files/defaults.yaml
@@ -70,15 +70,15 @@ zowe:
 
       # Distinguished name for Zowe generated certificates.
       dname: 
-        caCommonName: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Zowe Development Instances CA' : null }}"
-        commonName: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Zowe Development Instances Certificate' : null }}"
-        orgUnit: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'API Mediation Layer' : null }}"
-        org: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Zowe Sample' : null }}"
-        locality: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Prague' : null }}"
-        state: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Prague' : null }}"
-        country: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'CZ' : null }}"
+        caCommonName: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Zowe Development Instances CA' : null }}"
+        commonName: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Zowe Development Instances Certificate' : null }}"
+        orgUnit: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'API Mediation Layer' : null }}"
+        org: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Zowe Sample' : null }}"
+        locality: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Prague' : null }}"
+        state: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Prague' : null }}"
+        country: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'CZ' : null }}"
       # Validity days for Zowe generated certificates
-      validity: "${{ (zowe.setup.certificate.pkcs12?.import || zowe.setup.certificate.keyring?.label) ? null : 3650 }}"
+      validity: "${{ (zowe.setup.certificate.pkcs12?.import || zowe.setup.certificate.keyring?.name) ? null : 3650 }}"
 
     vsam:
       # Default to caching service entry as it predates this one

diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
@@ -227,31 +227,31 @@
                       "description": "Certificate distinguish name",
                       "properties": {
                         "caCommonName": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Common name of certificate authority generated by Zowe."
                         },
                         "commonName": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Common name of certificate generated by Zowe."
                         },
                         "orgUnit": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Organization unit of certificate generated by Zowe."
                         },
                         "org": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Organization of certificate generated by Zowe."
                         },
                         "locality": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Locality of certificate generated by Zowe. This is usually the city name."
                         },
                         "state": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "State of certificate generated by Zowe. You can also put province name here."
                         },
                         "country": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "2 letters country code of certificate generated by Zowe."
                         }
                       }

diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt
@@ -24,4 +24,4 @@
 #UO90049 UO90050 - IO29349 IO29350   IO29351 - Fri Mar  8 19:42:44 UTC 2024
 #UO90057 UO90058 - IO29424 IO29425   IO29426 - Fri May 24 14:23:02 UTC 2024
 #UO90059 UO90060 - IO29428 IO29429   IO29430 - Thu Jul 18 16:30:14 UTC 2024
-UO90061 UO90062 - IO29431 IO29432   IO29433
+UO90061 UO90062 - IO29431 IO29432   IO29433