Merge branch 'v2.x/staging' into clarification-example-zowe

zowe · Nov 28, 2023 · f4c56be · f4c56be
2 parents 2333cac + d6234a2
commit f4c56be
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 23 deletions.
diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh
@@ -83,7 +83,7 @@ if [[ ! -z "$test_force_system" ]]; then
 else
   if [[ -z "$dont_parse_test_server" ]]; then
     if [[ "$test_server" == "Any zzow servers" ]]; then
-      test_server="zzow0"$(echo $(($RANDOM % 3 + 2)))
+      test_server="zzow0"$(echo $(($RANDOM % 3 + 6)))
     fi
     TEST_FILE_SERVER="$test_file($test_server)"
   else

diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml
@@ -171,7 +171,7 @@ jobs:
         with:
           manifest-file-path: ${{ github.workspace }}/manifest.json
           default-target-path: .pax/binaryDependencies/
-          expected-count: 29
+          expected-count: 30
 
       # this step is not doing a publish, we are just utilizing this actions to get the PUBLISH_TARGET_PATH, 
       # and it will be used in the next step: [Download 3] Download SMPE build log

diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh
@@ -249,6 +249,13 @@ mv ./content/templates .
 chmod +x templates/*.rex
 
 mkdir -p "${ZOWE_ROOT_DIR}/bin/utils"
+getesm=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "getesm*.pax" \) | head -n 1)
+echo "[$SCRIPT_NAME] extract getesm $getesm"
+cd "${ZOWE_ROOT_DIR}/bin/utils"
+pax -ppx -rf "${getesm}"
+rm "${getesm}"
+cd "${BASE_DIR}"
+
 configmgr=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "configmgr-2*.pax" \) | head -n 1)
 echo "[$SCRIPT_NAME] extract configmgr $configmgr"
 cd "${ZOWE_ROOT_DIR}/bin/utils"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,12 @@ All notable changes to the Zowe Installer will be documented in this file.
 ## `2.13.0`
 
 ### New features and enhancements
+- Enhancement: Added utility "getesm" into bin/utils. When run it outputs to STDOUT which ESM your system is using. (#3662)
 
 #### Minor enhancements/defect fixes
 - Bugfix: Workflow files in the Zowe PAX are now ASCII-encoded. Fixes [#3591](https://github.com/zowe/zowe-install-packaging/issues/3591).
 
+
 ## `2.12.0`
 
 ### New features and enhancements

diff --git a/bin/README.md b/bin/README.md
@@ -56,6 +56,7 @@ Please be aware of using functions marked as `@experimental`. These functions ma
 
 - `bin/utils/opercmd.rex`: To issue operator command on z/OS. This script can only run on z/OS.
 - `bin/utils/curl.js`: This is node.js script works similar to popular Linux tool `curl`. It can make HTTP/HTTPS request and display response.
+- `bin/utils/getesm`: Executable to get the name of External Security Manager
 
 Please be aware of using utilities marked as `@experimental`. These utilities may be changed or improved in the future, and they may not be stable enough for extenders to use if they target to support multiple versions of Zowe.
 

diff --git a/manifest.json.template b/manifest.json.template
@@ -111,6 +111,10 @@
       "artifact": "cloud-gateway-*.zip",
       "exclusions": ["*PR*.zip"]
     },
+    "org.zowe.getesm": {
+      "version": "^2.0.0-V2.X-STAGING",
+      "artifact": "*.pax"
+    },
     "org.zowe.configmgr": {
       "version": "^2.0.0-V2.X-STAGING",
       "artifact": "*.pax"

diff --git a/schemas/server-common.json b/schemas/server-common.json
@@ -46,6 +46,27 @@
       "minLength": 1,
       "maxLength": 8
     },
+    "userAnyCase": {
+      "$anchor": "zoweUserAnyCase",
+      "type": "string",
+      "pattern": "^([A-Za-z0-9$#@]){1,8}$",
+      "minLength": 1,
+      "maxLength": 8
+    },
+    "groupNameAnyCase": {
+      "$anchor": "zoweGroupNameAnyCase",
+      "type": "string",
+      "pattern": "[A-Z#$@][A-Z0-9Z#@]{0,7}",
+      "minLength": 1,
+      "maxLength": 8
+    },
+    "groupNameUppercase": {
+      "$anchor": "zoweGroup",
+      "type": "string",
+      "pattern": "[A-Za-z#$@][A-Za-z0-9Z#@]{0,7}",
+      "minLength": 1,
+      "maxLength": 8
+    },
     "token": {
       "$anchor": "zoweToken",
       "type": "string",

diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
@@ -21,15 +21,15 @@
               "description": "MVS data set related configurations",
               "properties": {
                 "prefix": {
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zoweDataset",
                   "description": "Where Zowe MVS data sets will be installed"
                 },
                 "proclib": {
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zoweDataset",
                   "description": "PROCLIB where Zowe STCs will be copied over"
                 },
                 "parmlib": {
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zoweDataset",
                   "description": "Zowe PARMLIB"
                 },
                 "parmlibMembers": {
@@ -44,21 +44,21 @@
                   }
                 },
                 "jcllib": {
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zoweDataset",
                   "description": "JCL library where Zowe will store temporary JCLs during initialization"
                 },
                 "loadlib": {
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zoweDataset",
                   "description": "States the dataset where Zowe executable utilities are located",
                   "default": "<hlq>.SZWELOAD"
                 },
                 "authLoadlib": {
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zoweDataset",
                   "description": "The dataset that contains any Zowe core code that needs to run APF-authorized, such as ZIS",
                   "default": "<hlq>.SZWEAUTH"
                 },
                 "authPluginLib": {
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zoweDataset",
                   "description": "APF authorized LOADLIB for Zowe ZIS Plugins"
                 }
               }
@@ -103,17 +103,17 @@
                   "description": "security group name",
                   "properties": {
                     "admin": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase",
                       "description": "Zowe admin user group",
                       "default": "ZWEADMIN"
                     },
                     "stc": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase",
                       "description": "Zowe STC group",
                       "default": "ZWEADMIN"
                     },
                     "sysProg": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase",
                       "description": "Zowe SysProg group",
                       "default": "ZWEADMIN"
                     }
@@ -125,12 +125,12 @@
                   "description": "security user name",
                   "properties": {
                     "zowe": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweUserAnyCase",
                       "description": "Zowe runtime user name of main service",
                       "default": "ZWESVUSR"
                     },
                     "zis": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweUserAnyCase",
                       "description": "Zowe runtime user name of ZIS",
                       "default": "ZWESIUSR"
                     }
@@ -142,17 +142,17 @@
                   "description": "STC names",
                   "properties": {
                     "zowe": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweJobname",
                       "description": "STC name of main service",
                       "default": "ZWESLSTC"
                     },
                     "zis": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweJobname",
                       "description": "STC name of ZIS",
                       "default": "ZWESISTC"
                     },
                     "aux": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweJobname",
                       "description": "STC name of Auxiliary Service",
                       "default": "ZWESASTC"
                     }
@@ -244,7 +244,7 @@
                   "description": "Configure this section if you are using z/OS keyring",
                   "properties": {
                     "owner": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zoweUserAnyCase",
                       "description": "keyring owner. If this is empty, Zowe will use the user ID defined as zowe.setup.security.users.zowe."
                     },
                     "name": {
@@ -282,7 +282,7 @@
                       "description": "Configure this section if you want to import existing certificate stored in data set to Zowe.",
                       "properties": {
                         "dsName": {
-                          "type": "string",
+                          "$ref": "/schemas/v2/server-common#zoweDataset",
                           "description": "Name of the data set holds the certificate issued by other CA. This data set should be in PKCS12 format and contain private key."
                         },
                         "password": {
@@ -301,7 +301,7 @@
                           "description": "z/OSMF certificate authority alias"
                         },
                         "user": {
-                          "type": "string",
+                          "$ref": "/schemas/v2/server-common#zoweUserAnyCase",
                           "description": "z/OSMF user. Zowe initialization utility can detect alias of z/OSMF CA for RACF security system. The automated detection requires this z/OSMF user as input."
                         }
                       }
@@ -339,7 +339,8 @@
                     },
                     "country": {
                       "type": "string",
-                      "description": "2 letters country code of certificate generated by Zowe."
+                      "description": "2 letters country code of certificate generated by Zowe.",
+                      "pattern": "[A-Z][A-Z]"
                     }
                   }
                 },
@@ -377,7 +378,8 @@
                 },
                 "volume": {
                   "type": "string",
-                  "description": "Volume name if you are using VSAM in NONRLS mode"
+                  "description": "Volume name if you are using VSAM in NONRLS mode",
+                  "maxLength": 6
                 },
                 "storageClass": {
                   "type": "string",
@@ -409,7 +411,7 @@
           "description": "Customize your Zowe z/OS JES job.",
           "properties": {
             "name": {
-              "type": "string",
+              "$ref": "/schemas/v2/server-common#zoweJobname",
               "description": "Job name of Zowe primary ZWESLSTC started task."
             },
             "prefix": {