Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zowe 2.18.0 release #3953

Merged
merged 10 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion bin/commands/support/verify-fingerprints/index.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
2 changes: 1 addition & 1 deletion bin/libs/java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/libs/node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/libs/zosmf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion example-zowe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 14 additions & 10 deletions files/SZWESAMP/ZWEINSTL
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
/*

4 changes: 2 additions & 2 deletions files/SZWESAMP/ZWEITSS
Original file line number Diff line number Diff line change
Expand Up @@ -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}) +
Expand All @@ -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}) +
Expand Down
Loading