Merge pull request #3953 from zowe/user/markackert/2.18-release

Zowe 2.18.0 release
zowe · Aug 27, 2024 · c3eaf1f · c3eaf1f
2 parents 682bcae + 05d6586
commit c3eaf1f
Show file tree

Hide file tree

Showing 17 changed files with 264 additions and 153 deletions.
diff --git a/bin/commands/support/verify-fingerprints/index.sh b/bin/commands/support/verify-fingerprints/index.sh
@@ -63,7 +63,10 @@ print_message "- Calculate hashes of Zowe files"
 cust_hashes=$(create_tmp_file "${tmp_file_prefix}")
 result=$(java -cp "${ZWE_zowe_runtimeDirectory}/bin/utils/" HashFiles "${all_files}" | sort > "${cust_hashes}")
 code=$?
-if [ ${code} -eq 1 -o ! -f "${cust_hashes}" ]; then
+if [ -f "${cust_hashes}" ]; then
+  file_size_check=$(wc -l "${cust_hashes}" | awk '{print $1}')
+fi
+if [ "${code}" -eq 1 -o ! -f "${cust_hashes}" -o "${file_size_check}" -eq 0 ]; then
   print_error "  * Error ZWEL0151E: Failed to create temporary file ${cust_hashes}. Please check permission or volume free space."
   print_error "  * Exit code: ${code}"
   print_error "  * Output:"

diff --git a/bin/libs/java.sh b/bin/libs/java.sh
@@ -83,7 +83,7 @@ require_java() {
   fi
 
   if [ -z "${JAVA_HOME}" ]; then
-    print_error_and_exit "Error ZWEL0122E: Cannot find java. Set the java.path value in the Zowe YAML, or include java in the PATH environment variable of any accounts that start or manage Zowe" "" 122
+    print_error_and_exit "Error ZWEL0122E: Cannot find java. Set the java.home value in the Zowe YAML, or include java in the PATH environment variable of any accounts that start or manage Zowe" "" 122
   fi
 
   ensure_java_is_on_path

diff --git a/bin/libs/node.sh b/bin/libs/node.sh
@@ -94,7 +94,7 @@ require_node() {
   fi
 
   if [ -z "${NODE_HOME}" ]; then
-    print_error_and_exit "Error ZWEL0121E: Cannot find node. Set the node.path value in the Zowe YAML, or include node in the PATH environment variable of any accounts that start or manage Zowe" "" 121
+    print_error_and_exit "Error ZWEL0121E: Cannot find node. Set the node.home value in the Zowe YAML, or include node in the PATH environment variable of any accounts that start or manage Zowe" "" 121
   fi
 
   ensure_node_is_on_path

diff --git a/bin/libs/zosmf.ts b/bin/libs/zosmf.ts
@@ -31,7 +31,7 @@ export function validateZosmfHostAndPort(zosmfHost: string, zosmfPort: number):
     common.printError(`Warning: Could not validate if z/OS MF is available on 'https://${zosmfHost}:${zosmfPort}/zosmf/info'. NODE_HOME is not defined.`);
     zosmfCheckPassed=false;
   } else {
-    let execReturn = shell.execOutSync(`${std.getenv('NODE_HOME')}/bin/node`, `${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl.js`, `"https://${zosmfHost}:${zosmfPort}/zosmf/info"`, `-k`, `-H`, `"X-CSRF-ZOSMF-HEADER: true"`, `--response-type`, `status`);
+    const execReturn = shell.execOutSync(`${std.getenv('NODE_HOME')}/bin/node`, `${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl.js`, `https://${zosmfHost}:${zosmfPort}/zosmf/info`, `-k`, `-H`, `X-CSRF-ZOSMF-HEADER: true`, `--response-type`, `status`);
     if (execReturn.rc || !execReturn.out) {
       common.printError(`Warning: Could not validate if z/OS MF is available on 'https://${zosmfHost}:${zosmfPort}/zosmf/info'. No response code from z/OSMF server.`);
       zosmfCheckPassed=false

diff --git a/example-zowe.yaml b/example-zowe.yaml
@@ -178,7 +178,6 @@ zowe:
     # certificate:
     #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
-    #   createZosmfTrust: true
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
     #     # keyring name

diff --git a/files/SZWESAMP/ZWEINSTL b/files/SZWESAMP/ZWEINSTL
@@ -36,20 +36,24 @@ blksize(32760) unit(sysallda) space(30,15) tracks
 //STDOUT   DD SYSOUT=*
 //STDERR   DD SYSOUT=*
 //STDPARM DD *
-SH cd {zowe.runtimeDirectory} &&
-cd files/SZWESAMP &&
+SH cd '{zowe.runtimeDirectory}' &&
+cd 'files/SZWESAMP' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWESAMP'" &&
-cd ../SZWEEXEC &&
+cd '../SZWEEXEC' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWEEXEC'" &&
-cd ../SZWELOAD &&
+cd '../SZWELOAD' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWELOAD'" &&
-cd ../../components/launcher/bin
-cp zowe_launcher "//'{zowe.setup.dataset.prefix}.SZWEAUTH'" &&
-cd ../../zss/SAMPLIB &&
-cp ZWESASTC ZWESIP00 ZWESISTC ZWESISCH
+cd '../../components/launcher/bin' &&
+cp zowe_launcher
+   "//'{zowe.setup.dataset.prefix}.SZWEAUTH(ZWELNCH)'" &&
+cd '../../zss/SAMPLIB' &&
+cp ZWESIP00 ZWESISCH
    "//'{zowe.setup.dataset.prefix}.SZWESAMP'" &&
-cd ../LOADLIB &&
+cp ZWESAUX
+   "//'{zowe.setup.dataset.prefix}.SZWESAMP(ZWESASTC)'" &&
+cp ZWESIS01
+   "//'{zowe.setup.dataset.prefix}.SZWESAMP(ZWESISTC)'" &&
+cd '../LOADLIB' &&
 cp ZWESIS01 ZWESAUX ZWESISDL
    "//'{zowe.setup.dataset.prefix}.SZWEAUTH'"
 /*
-
diff --git a/files/SZWESAMP/ZWEITSS b/files/SZWESAMP/ZWEITSS
@@ -99,7 +99,7 @@
 
 /* userid for ZOWE main server                                       */
   TSS LIST({zowe.setup.security.users.zowe}) SEGMENT(OMVS)
-  TSS CREATE({zowe.setup.security.users.zowe}) TYPE(USER) PASS(NOPW,0) +
+  TSS CREATE({zowe.setup.security.users.zowe}) TYPE(USER) PROTECTED +
    NAME('ZOWE MAIN SERVER') +
    DEPT(&STCUDEP.)
    TSS ADD({zowe.setup.security.users.zowe}) +
@@ -109,7 +109,7 @@
 
 /* userid for ZIS cross memory server                                */
   TSS LIST({zowe.setup.security.users.zis}) SEGMENT(OMVS)
-  TSS CREATE({zowe.setup.security.users.zis}) TYPE(USER) PASS(NOPW,0) +
+  TSS CREATE({zowe.setup.security.users.zis}) TYPE(USER) PROTECTED +
    NAME('ZOWE ZIS CROSS MEMORY SERVER') +
    DEPT(&STCUDEP.)
   TSS ADD({zowe.setup.security.users.zis}) +