From 79e73f57966c6e2659728cd85f11f28a84dbc5e5 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:07:20 -0500 Subject: [PATCH 001/104] Remove node 14 support node 14 is no longer supported. our documentation says so Signed-off-by: 1000TurquoisePogs --- bin/libs/node.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/libs/node.ts b/bin/libs/node.ts index e9f0a427fd..b1e9c57884 100644 --- a/bin/libs/node.ts +++ b/bin/libs/node.ts @@ -18,7 +18,7 @@ import * as shell from './shell'; import * as config from './config'; import { PathAPI as pathoid } from './pathoid'; -const NODE_MIN_VERSION=14; +const NODE_MIN_VERSION=16; // enforce encoding of stdio/stdout/stderr // sometimes /dev/tty* ($SSH_TTY) are not configured properly, for example tagged as binary or wrong encoding @@ -109,11 +109,6 @@ export function validateNodeHome(nodeHome:string|undefined=std.getenv("NODE_HOME //const nodeMinorVersion = Number(parts[1]); //const nodePatchVersion = Number(parts[2]); - if (version == 'v14.17.2') { - common.printError(`Node ${version} specifically is not compatible with Zowe. Please use a different version. See https://docs.zowe.org/stable/troubleshoot/app-framework/app-known-issues.html#desktop-apps-fail-to-load for more details.`); - return false; - } - if (version == 'v18.12.1') { common.printError(`Node ${version} specifically is not compatible with Zowe. Please use a different version. See https://github.com/ibmruntimes/node-zos/issues/21 for more details.`); return false; From fd0831c15761e6fe31715ea3c3b8c34056d970b9 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:07:52 -0500 Subject: [PATCH 002/104] Update node.sh Signed-off-by: 1000TurquoisePogs --- bin/libs/node.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/libs/node.sh b/bin/libs/node.sh index 63cc564ca8..cef1050787 100644 --- a/bin/libs/node.sh +++ b/bin/libs/node.sh @@ -122,17 +122,12 @@ validate_node_home() { node_fix_version=$(echo ${node_version} | cut -d '.' -f 3) # check node version - if [ "${node_version}" = "v14.17.2" ]; then - print_error "Node ${node_version} specifically is not compatible with Zowe. Please use a different version. See https://docs.zowe.org/stable/troubleshoot/app-framework/app-known-issues.html#desktop-apps-fail-to-load for more details." - return 1 - fi - if [ "${node_version}" = "v18.12.1" ]; then print_error "Node ${node_version} specifically is not compatible with Zowe. Please use a different version. See https://github.com/ibmruntimes/node-zos/issues/21 for more details." return 1 fi - if [ ${node_major_version} -lt 14 ]; then + if [ ${node_major_version} -lt 16 ]; then print_error "Node ${node_version} is less than the minimum level required of v14+." return 1 fi From 013c2b88ca80ffc064e5bff62a013d8378abbc27 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:10:36 -0500 Subject: [PATCH 003/104] Update cicd-test.yml Signed-off-by: 1000TurquoisePogs --- .github/workflows/cicd-test.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 4c4ea7b1d2..5deecc5ef9 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -24,7 +24,6 @@ on: - SMPE PTF - Extensions - Keyring - - z/OS node v14 - z/OS node v16 - z/OS node v18 - Non-strict Verify External Certificate @@ -63,8 +62,8 @@ env: DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax # below block can be overwritten, adjusted by DevOps only - # ZOS_NODE_VERSION more to choose from: v14.21.3.1, v16.20.1 - ZOS_NODE_VERSION: v14.21.3.1 + # ZOS_NODE_VERSION more to choose from: v16.20.1 + ZOS_NODE_VERSION: v16.20.1 CLIENT_NODE_VERSION: v12.18.3 INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:* SANITY_TEST_DEBUG_INFORMATION: zowe-sanity-test:* @@ -75,7 +74,6 @@ env: SMPE_PTF_TESTFILE: basic/install-ptf.ts EXTENSIONS_TESTFILE: basic/install-ext.ts KEYRING_TESTFILE: extended/keyring.ts - ZOS_NODE_V14_TESTFILE: extended/node-versions/node-v14.ts ZOS_NODE_V16_TESTFILE: extended/node-versions/node-v16.ts ZOS_NODE_V18_TESTFILE: extended/node-versions/node-v18.ts NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE: extended/certificates/nonstrict-verify-external-certificate.ts @@ -293,9 +291,6 @@ jobs: case 'Keyring': eta = 53 break; - case 'z/OS node v14': - eta = 45 - break; case 'z/OS node v16': eta = 45 break; From 4ed7cafed8d20ee4a56003a8488b3020f95fefbf Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:10:58 -0500 Subject: [PATCH 004/104] Update cicd-test-readme.md Signed-off-by: 1000TurquoisePogs --- .github/workflows/cicd-test-readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index 6e71645572..26c6a38836 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -29,7 +29,6 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin - SMPE PTF - Extensions - Keyring - - z/OS node v14 - z/OS node v16 - z/OS node v18 - Non-strict Verify External Certificate @@ -125,7 +124,6 @@ Selected test running elapsed time: | SMPE PTF | 68m | | z/OS node v18 | 45m | | z/OS node v16 | 45m | -| z/OS node v14 | 45m | | Keyring | 53m | | Non-strict Verify External Certificate | 51m | | Extensions | 67m From 4338f3ca5f2f48291f1a41debf329da6d7785a2b Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:11:17 -0500 Subject: [PATCH 005/104] Update make_matrix.sh Signed-off-by: 1000TurquoisePogs --- .github/scripts/cicd_test/make_matrix.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index ac4dfc146b..899a6a0a77 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -32,10 +32,6 @@ case $install_test_choice in test_file="$KEYRING_TESTFILE" ;; -"z/OS node v14") - test_file="$ZOS_NODE_V14_TESTFILE" - ;; - "z/OS node v16") test_file="$ZOS_NODE_V16_TESTFILE" ;; From 4a31ab06afb966141a4b6a206f85d349275ef205 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 20 Oct 2023 07:19:45 -0500 Subject: [PATCH 006/104] Update node.sh Signed-off-by: 1000TurquoisePogs --- bin/libs/node.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/libs/node.sh b/bin/libs/node.sh index cef1050787..068fa7abc7 100644 --- a/bin/libs/node.sh +++ b/bin/libs/node.sh @@ -22,6 +22,8 @@ export NODE_STDIN_CCSID=1047 # Workaround Fix for node 8.16.1 that requires compatibility mode for untagged files export __UNTAGGED_READ_MODE=V6 +NODE_MIN=16 + ensure_node_is_on_path() { if [[ ":${PATH}:" != *":${NODE_HOME}/bin:"* ]]; then export PATH="${NODE_HOME}/bin:${PATH}" @@ -127,8 +129,8 @@ validate_node_home() { return 1 fi - if [ ${node_major_version} -lt 16 ]; then - print_error "Node ${node_version} is less than the minimum level required of v14+." + if [ ${node_major_version} -lt ${NODE_MIN} ]; then + print_error "Node ${node_version} is less than the minimum level required of v${NODE_MIN}+." return 1 fi print_debug "Node ${node_version} is supported." From 6afc567a5bd44018a06d4d613306bc4a918764a5 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:27:34 +0200 Subject: [PATCH 007/104] Tracing messages with correct function names (#3619) Signed-off-by: Martin Zeithaml --- bin/libs/json.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/libs/json.ts b/bin/libs/json.ts index c4f5f77bb1..70243b8901 100644 --- a/bin/libs/json.ts +++ b/bin/libs/json.ts @@ -73,7 +73,7 @@ export function readYaml(file: string, key: string) { const jq=`${utils_dir}/njq/src/index.js`; const fconv=`${utils_dir}/fconv/src/index.js`; - common.printTrace(`- read_yaml load content from ${file}`); + common.printTrace(`- readYaml load content from ${file}`); if (std.getenv('ZWE_CLI_PARAMETER_CONFIG') == file) { return fakejq.jqget(ZOWE_CONFIG, key); } else { @@ -86,7 +86,7 @@ export function readYaml(file: string, key: string) { return; } - common.printTrace(`- read_yaml ${key} from yaml content`); + common.printTrace(`- readYaml ${key} from yaml content`); const result=shell.execOutSync('sh', '-c', `echo "${ZWE_PRIVATE_YAML_CACHE}" | node "${jq}" -r "${key}" 2>&1`); code=result.rc; common.printTrace(` * Exit code: ${code}`); @@ -104,7 +104,7 @@ export function readJson(file: string, key: string):any { const utils_dir=`${ZOWE_CONFIG.zowe.runtimeDirectory}/bin/utils`; const jq=`${utils_dir}/njq/src/index.js`; - common.printTrace(`- read_json ${key} from ${file}`); + common.printTrace(`- readJson ${key} from ${file}`); let result=shell.execOutSync('sh', '-c', `cat "${file}" | node "${jq}" -r "${key}" 2>&1`); const code = result.rc; common.printTrace(` * Exit code: ${code}`); From 5bb6282107371830cb4cfbf8155d8646ad7a0bfd Mon Sep 17 00:00:00 2001 From: Andrea Tabone <39694626+taban03@users.noreply.github.com> Date: Fri, 20 Oct 2023 16:57:06 +0200 Subject: [PATCH 008/104] Replace introspect URL with JWK for OIDC validation (#3614) * Replace introspect url with JWK Signed-off-by: at670475 * fix name Signed-off-by: at670475 * temporary change to test Signed-off-by: at670475 * fix Signed-off-by: at670475 * fix Signed-off-by: at670475 * revert back the manifest.json Signed-off-by: at670475 --------- Signed-off-by: at670475 Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- playbooks/roles/configfmid/defaults/main.yml | 2 +- playbooks/roles/configfmid/tasks/main.yml | 4 ++-- playbooks/roles/configure/defaults/main.yml | 2 +- playbooks/roles/configure/tasks/main.yml | 4 ++-- playbooks/roles/custom_for_test/defaults/main.yml | 2 +- tests/installation/src/constants.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml index 65d34fcae1..322e90b06d 100644 --- a/playbooks/roles/configfmid/defaults/main.yml +++ b/playbooks/roles/configfmid/defaults/main.yml @@ -70,7 +70,7 @@ zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: zowe_apiml_security_oidc_registry: -zowe_apiml_security_oidc_introspect_url: +zowe_apiml_security_oidc_jwks_uri: # explorer APIs/plugins ports zowe_jobs_api_port: 7558 zowe_mvs_api_port: 7559 diff --git a/playbooks/roles/configfmid/tasks/main.yml b/playbooks/roles/configfmid/tasks/main.yml index bd049e7cf9..7b2ad2c6c5 100644 --- a/playbooks/roles/configfmid/tasks/main.yml +++ b/playbooks/roles/configfmid/tasks/main.yml @@ -39,7 +39,7 @@ - zowe_apiml_security_oidc_client_id - zowe_apiml_security_oidc_client_secret - zowe_apiml_security_oidc_registry - - zowe_apiml_security_oidc_introspect_url + - zowe_apiml_security_oidc_jwks_uri - zowe_jobs_api_port - zowe_mvs_api_port - zowe_jobs_explorer_port @@ -299,7 +299,7 @@ "components.gateway.apiml.security.oidc.clientId": "{{ zowe_apiml_security_oidc_client_id|string }}" "components.gateway.apiml.security.oidc.clientSecret": "{{ zowe_apiml_security_oidc_client_secret|string }}" "components.gateway.apiml.security.oidc.registry": "{{ zowe_apiml_security_oidc_registry|string }}" - "components.gateway.apiml.security.oidc.introspectUrl": "{{ zowe_apiml_security_oidc_introspect_url|string }}" + "components.gateway.apiml.security.oidc.jwks.uri": "{{ zowe_apiml_security_oidc_jwks_uri|string }}" # desktop customizations "zowe.environments.ZWED_SSH_PORT": "{{ zowe_zlux_terminal_ssh_port }}" "zowe.environments.ZWED_TN3270_PORT": "{{ zowe_zlux_terminal_telnet_port }}" diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml index 5e0cd717d4..24ff9b6446 100644 --- a/playbooks/roles/configure/defaults/main.yml +++ b/playbooks/roles/configure/defaults/main.yml @@ -71,7 +71,7 @@ zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: zowe_apiml_security_oidc_registry: -zowe_apiml_security_oidc_introspect_url: +zowe_apiml_security_oidc_jwks_uri: # explorer APIs/plugins ports zowe_jobs_api_port: 7558 zowe_mvs_api_port: 7559 diff --git a/playbooks/roles/configure/tasks/main.yml b/playbooks/roles/configure/tasks/main.yml index e8fbfa267e..0cc6b1f017 100644 --- a/playbooks/roles/configure/tasks/main.yml +++ b/playbooks/roles/configure/tasks/main.yml @@ -39,7 +39,7 @@ - zowe_apiml_security_oidc_client_id - zowe_apiml_security_oidc_client_secret - zowe_apiml_security_oidc_registry - - zowe_apiml_security_oidc_introspect_url + - zowe_apiml_security_oidc_jwks_uri - zowe_jobs_api_port - zowe_mvs_api_port - zowe_jobs_explorer_port @@ -301,7 +301,7 @@ "components.gateway.apiml.security.oidc.clientId": "{{ zowe_apiml_security_oidc_client_id|string }}" "components.gateway.apiml.security.oidc.clientSecret": "{{ zowe_apiml_security_oidc_client_secret|string }}" "components.gateway.apiml.security.oidc.registry": "{{ zowe_apiml_security_oidc_registry|string }}" - "components.gateway.apiml.security.oidc.introspectUrl": "{{ zowe_apiml_security_oidc_introspect_url|string }}" + "components.gateway.apiml.security.oidc.jwks.uri": "{{ zowe_apiml_security_oidc_jwks_uri|string }}" # desktop customizations "zowe.environments.ZWED_SSH_PORT": "{{ zowe_zlux_terminal_ssh_port }}" "zowe.environments.ZWED_TN3270_PORT": "{{ zowe_zlux_terminal_telnet_port }}" diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml index 9dbd3c90c8..0f223bc20e 100644 --- a/playbooks/roles/custom_for_test/defaults/main.yml +++ b/playbooks/roles/custom_for_test/defaults/main.yml @@ -68,7 +68,7 @@ zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: zowe_apiml_security_oidc_registry: -zowe_apiml_security_oidc_introspect_url: +zowe_apiml_security_oidc_jwks_uri: zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: auto diff --git a/tests/installation/src/constants.ts b/tests/installation/src/constants.ts index 74ecdddce8..c60aa86853 100644 --- a/tests/installation/src/constants.ts +++ b/tests/installation/src/constants.ts @@ -43,7 +43,7 @@ export const APIML_OIDC_VARS = { 'zowe_apiml_security_oidc_client_id': process.env['OKTA_CLIENT_ID'] || 'dummy_id_from_constants_ts', 'zowe_apiml_security_oidc_client_secret': process.env['OKTA_CLIENT_SECRET'] || 'dummy_secret_from_constants_ts', 'zowe_apiml_security_oidc_registry': process.env['OIDC_REGISTRY'] || 'dummy_registry_from_constants_ts', - 'zowe_apiml_security_oidc_introspect_url': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/introspect`, + 'zowe_apiml_security_oidc_jwks_uri': `https://${process.env['OKTA_HOSTNAME']}/oauth2/default/v1/keys`, }; // debug(`process.env >>>>>>>>>>>>>>>>>>>>>>>>>>\n${JSON.stringify(process.env)}\n<<<<<<<<<<<<<<<<<<<<<<<`); From 9f5c095d47cc851f2f2195b0685e33adebe55f73 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Fri, 20 Oct 2023 12:00:28 -0400 Subject: [PATCH 009/104] Ensure workflow files are in ascii in final PAX (#3593) * build: convert workflow files to ascii before paxing Signed-off-by: MarkAckert * chore: add changelog Signed-off-by: MarkAckert * build: adjust dir base Signed-off-by: MarkAckert * build: remove quotes from ls command Signed-off-by: MarkAckert * build: fix quotes in iconv Signed-off-by: MarkAckert * deleted hyphen Signed-off-by: mm667937 * script was trying to convert files that are in input directory but it was trying it from working directory Signed-off-by: mm667937 * build: fix variable Signed-off-by: MarkAckert * build: correct conversion script; use find instead of ls Signed-off-by: MarkAckert * Have to convert all the workflows back to IBM-1047 before copy into dataset(not going into pswi, just test dir) Signed-off-by: mm667937 * update changelog target version Signed-off-by: MarkAckert --------- Signed-off-by: MarkAckert Signed-off-by: mm667937 Co-authored-by: mm667937 --- .pax/pre-packaging.sh | 143 +++++++++++++++++++++++++++--------------- CHANGELOG.md | 12 ++++ pswi/03_create.sh | 30 +++++---- 3 files changed, 124 insertions(+), 61 deletions(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 819d4818ea..85f92603a7 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -26,6 +26,51 @@ # ./content/templates/ # ./content/ +# --------------------------------------------------------------------- +# --- convert files to ascii +# $1: (input) pattern to convert. +# Files will be determined by 'find -type f' +# $2: (input) optional output directory. +# If unset, conversion happens in-place +# If set, conversion will mirror directory structure in output +# (output) converted files or directory following $2 +# TODO: is this replacable with autoconv? +# --------------------------------------------------------------------- +function _convertEbcdicToAscii { + input=$1 + output_dir=$2 + using_output_dir="no" + + if [ -z "$output_dir" ]; then + echo "[$SCRIPT_NAME] converting $input to ascii in-place" + else + if [ -f "$output_dir" ]; then + echo "[$SCRIPT_NAME] $output_dir already exists and is a file, aborting _convertEbcdicToAscii" + return 1 + elif [ ! -d "$output_dir" ]; then + mkdir -p "$output_dir" + fi + using_output_dir="yes" + echo "[$SCRIPT_NAME] will convert $input to ascii, results in $output_dir" + fi + + files_to_convert=$(find $input -type f) # processes all files + for ebcdic_file in $files_to_convert; do + echo "[$SCRIPT_NAME] converting $ebcdic_file to ascii..." + tmpfile="$(basename $ebcdic_file).tmp" + iconv -f IBM-1047 -t ISO8859-1 "${ebcdic_file}" >${tmpfile} + if [[ "$using_output_dir" == "yes" ]]; then + dir_path=$(dirname $ebcdic_file) + mkdir -p ${output_dir}/${dir_path} + mv "${tmpfile}" "${output_dir}/${ebcdic_file}" + else + mv "${tmpfile}" "${ebcdic_file}" + fi + done + + return 0 +} # _convertEbcdicToAscii + # --------------------------------------------------------------------- # --- create JCL files # $1: (input) location of .vtl & .properties files @@ -35,33 +80,31 @@ # --------------------------------------------------------------------- function _createJCL { - VTLCLI_PATH="/ZOWE/vtl-cli" # tools, path must be absolute + VTLCLI_PATH="/ZOWE/vtl-cli" # tools, path must be absolute # vtl-cli source: https://github.com/plavjanik/vtl-cli if [ -f "$1/$2.vtl" ]; then - vtlList="$2.vtl" # process just this file + vtlList="$2.vtl" # process just this file vtlPath="$1" elif [ -d "$1/$2" ]; then - vtlList="$(ls $1/$2/)" # process all if directory passed in + vtlList="$(ls $1/$2/)" # process all if directory passed in vtlPath="$1/${2:-.}" else echo "[$SCRIPT_NAME] $1/$2.vtl not found" exit 1 fi - for vtlEntry in $vtlList - do - if [ "${vtlEntry##*.}" = "vtl" ] # keep from last . (exclusive) - then - vtlBase="${vtlEntry%.*}" # keep up to last . (exclusive) + for vtlEntry in $vtlList; do + if [ "${vtlEntry##*.}" = "vtl" ]; then # keep from last . (exclusive) + vtlBase="${vtlEntry%.*}" # keep up to last . (exclusive) JCL="${JCL_PATH}/${vtlBase}.jcl" VTL="${vtlPath}/${vtlEntry}" if [ -f ${vtlPath}/${vtlBase}.properties ]; then YAML="${vtlPath}/${vtlBase}.properties" - # elif [ -f ${vtlPath}/${vtlBase}.yaml ]; then - # YAML="${vtlPath}/${vtlBase}.yaml" - # elif [ -f ${vtlPath}/${vtlBase}.yml ]; then - # YAML="${vtlPath}/${vtlBase}.yml" + # elif [ -f ${vtlPath}/${vtlBase}.yaml ]; then + # YAML="${vtlPath}/${vtlBase}.yaml" + # elif [ -f ${vtlPath}/${vtlBase}.yml ]; then + # YAML="${vtlPath}/${vtlBase}.yml" else echo "[$SCRIPT_NAME] ${vtlPath}/${vtlBase}.properties not found" exit 1 @@ -74,9 +117,9 @@ function _createJCL # assumes java is in $PATH java -jar ${VTLCLI_PATH}/vtl-cli.jar \ -ie Cp1140 --yaml-context ${YAML} ${VTL} -o ${JCL} -oe Cp1140 - fi # vtl found + fi # vtl found done -} # _createJCL +} # _createJCL # --------------------------------------------------------------------- # --- create workflow & JCL files @@ -89,62 +132,63 @@ function _createJCL function _createWorkflow { here=$(pwd) - CREAXML_PATH="${here}/templates" # tools, path must be absolute + CREAXML_PATH="${here}/templates" # tools, path must be absolute if [ -f "$1/$2.xml" ]; then - xmlList="$2.xml" # process just this file + xmlList="$2.xml" # process just this file xmlPath="$1" elif [ -d "$1/$2" ]; then - xmlList="$(ls $1/$2/)" # process all if directory passed in + xmlList="$(ls $1/$2/)" # process all if directory passed in xmlPath="$1/${2:-.}" else echo "[$SCRIPT_NAME] $1/$2.xml not found" exit 1 fi - for xmlEntry in $xmlList - do - if [ "${xmlEntry##*.}" = "xml" ] # keep from last . (exclusive) - then - xmlBase="${xmlEntry%.*}" # keep up to last . (exclusive) - XML="${here}/${WORKFLOW_PATH}/${xmlBase}.xml" # use absolute path + for xmlEntry in $xmlList; do + if [ "${xmlEntry##*.}" = "xml" ]; then # keep from last . (exclusive) + xmlBase="${xmlEntry%.*}" # keep up to last . (exclusive) + XML="${here}/${WORKFLOW_PATH}/${xmlBase}.xml" # use absolute path if [ -d ${xmlBase} ]; then # TODO ensure workflow yaml has all variables of JCL yamls fi - + # create JCL related to this workflow - _createJCL ${xmlPath} ${xmlBase} # ${xmlBase} can be a directory + _createJCL ${xmlPath} ${xmlBase} # ${xmlBase} can be a directory # create workflow echo "[$SCRIPT_NAME] creating $XML" # inlineTemplate definition in xml expects us to be in $xmlPath cd "${xmlPath}" ${CREAXML_PATH}/build-workflow.rex -d -i ${xmlEntry} -o ${XML} - rm -f ${xmlEntry} # remove to avoid processing twice - cd - # return to previous directory + rm -f ${xmlEntry} # remove to avoid processing twice + cd - # return to previous directory # copy default variable definitions to ${WORKFLOW_PATH} if [ -f ${xmlPath}/${xmlBase}.properties ]; then YAML="${xmlPath}/${xmlBase}.properties" - # elif [ -f ${xmlPath}/${xmlBase}.yaml ]; then - # YAML="${xmlPath}/${xmlBase}.yaml" - # elif [ -f ${xmlPath}/${xmlBase}.yml ]; then - # YAML="${xmlPath}/${xmlBase}.yml" + # elif [ -f ${xmlPath}/${xmlBase}.yaml ]; then + # YAML="${xmlPath}/${xmlBase}.yaml" + # elif [ -f ${xmlPath}/${xmlBase}.yml ]; then + # YAML="${xmlPath}/${xmlBase}.yml" else echo "[$SCRIPT_NAME] ${xmlPath}/${xmlBase}.properties not found" exit 1 fi cp "${YAML}" "${WORKFLOW_PATH}/${xmlBase}.properties" - fi # xml found + fi # xml found done -} # _createWorkflow +} # _createWorkflow # --------------------------------------------------------------------- # --- main --- main --- main --- main --- main --- main --- main --- # --------------------------------------------------------------------- -SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh -BASE_DIR=$(cd $(dirname "$0"); pwd) # /.pax +SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh +BASE_DIR=$( + cd $(dirname "$0") + pwd +) # /.pax # use node v14 to build export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x @@ -196,15 +240,14 @@ cd "${BASE_DIR}" # prepare for SMPE echo "[$SCRIPT_NAME] smpe is not part of zowe.pax, moving it out ..." -mv ./content/smpe . +mv ./content/smpe . # workflow customization # >>> echo "[$SCRIPT_NAME] templates is not part of zowe.pax, moving it out ..." -mv ./content/templates . +mv ./content/templates . chmod +x templates/*.rex - mkdir -p "${ZOWE_ROOT_DIR}/bin/utils" configmgr=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "configmgr-2*.pax" \) | head -n 1) echo "[$SCRIPT_NAME] extract configmgr $configmgr" @@ -221,9 +264,8 @@ pax -ppx -rf "${configmgr_rexx}" rm "${configmgr_rexx}" cd "${BASE_DIR}" - echo "[$SCRIPT_NAME] create dummy zowe.yaml for install" -cat <> "${BASE_DIR}/zowe.yaml" +cat <>"${BASE_DIR}/zowe.yaml" zowe: extensionDirectory: "${ZOWE_ROOT_DIR}/components" useConfigmgr: false @@ -250,9 +292,9 @@ for component in app-server; do echo "[$SCRIPT_NAME] - ${component}" # FIXME: these environment variables are changed in v2 ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \ - ZWED_INSTALL_DIR=${ZOWE_ROOT_DIR} \ - LOG_FILE="${BASE_DIR}/logs/zwe-components-install-process-hook.log" \ - "${ZOWE_ROOT_DIR}/bin/zwe" \ + ZWED_INSTALL_DIR=${ZOWE_ROOT_DIR} \ + LOG_FILE="${BASE_DIR}/logs/zwe-components-install-process-hook.log" \ + "${ZOWE_ROOT_DIR}/bin/zwe" \ components install process-hook \ --component-name "${component}" \ --config "${BASE_DIR}/zowe.yaml" \ @@ -318,7 +360,10 @@ else exit 1 fi -#3. clean up working files +#3. Convert z/OSMF workflows and templates to ASCII in-place +_convertEbcdicToAscii "${WORKFLOW_PATH}" + +#4. clean up working files echo "[$SCRIPT_NAME] clean up working files" rm -rf "./templates" @@ -332,11 +377,11 @@ echo "[$SCRIPT_NAME] generate fingerprints" mkdir -p "${BASE_DIR}/fingerprints" mkdir -p "${ZOWE_ROOT_DIR}/fingerprint" cd "${ZOWE_ROOT_DIR}" -find . -name ./SMPE -prune \ - -o -name "./ZWE*" -prune \ - -o -name ./fingerprint -prune \ - -o -type f -print > "${BASE_DIR}/fingerprints/files.in" -java -cp "${ZOWE_ROOT_DIR}/bin/utils" HashFiles "${BASE_DIR}/fingerprints/files.in" | sort > "${ZOWE_ROOT_DIR}/fingerprint/RefRuntimeHash-${ZOWE_VERSION}.txt" +find . -name ./SMPE -prune \ + -o -name "./ZWE*" -prune \ + -o -name ./fingerprint -prune \ + -o -type f -print >"${BASE_DIR}/fingerprints/files.in" +java -cp "${ZOWE_ROOT_DIR}/bin/utils" HashFiles "${BASE_DIR}/fingerprints/files.in" | sort >"${ZOWE_ROOT_DIR}/fingerprint/RefRuntimeHash-${ZOWE_VERSION}.txt" echo "[$SCRIPT_NAME] cleanup fingerprints code" rm -fr "${BASE_DIR}/fingerprints" diff --git a/CHANGELOG.md b/CHANGELOG.md index 4892c37682..7c6ce5f47b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.13.0` + +### New features and enhancements + +#### 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 + +#### Minor enhancements/defect fixes ## `2.11.0` diff --git a/pswi/03_create.sh b/pswi/03_create.sh index a300646fab..99d4ab7687 100644 --- a/pswi/03_create.sh +++ b/pswi/03_create.sh @@ -131,28 +131,34 @@ echo "SH set -x;set -e;" >> JCL echo "cd ${WORK_MOUNT};" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWEWRF02.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWEWRF02)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWEWRF02;" >> JCL -echo "cp -T _ZWEWRF02 \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWEWRF02;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWEWRF02 > ZWEWRF02;" >> JCL +echo "cp -T ZWEWRF02 \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWECRECR.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWECRECR)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWECRECR;" >> JCL -echo "cp -T _ZWECRECR \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWECRECR;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWECRECR > ZWECRECR;" >> JCL +echo "cp -T ZWECRECR \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWEKRING.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWEKRING)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWEKRING;" >> JCL -echo "cp -T _ZWEKRING \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWEKRING;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWEKRING > ZWEKRING;" >> JCL +echo "cp -T ZWEKRING \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWELOADC.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWELOADC)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWELOADC;" >> JCL -echo "cp -T _ZWELOADC \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWELOADC;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWELOADC > ZWELOADC;" >> JCL +echo "cp -T ZWELOADC \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWESIGNC.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWESIGNC)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWESIGNC;" >> JCL -echo "cp -T _ZWESIGNC \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWESIGNC;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWESIGNC > ZWESIGNC;" >> JCL +echo "cp -T ZWESIGNC \$target;" >> JCL echo "source=\"${ZOWE_MOUNT}files/workflows/ZWECONF.xml\";" >> JCL echo "target=\"//'${WORKFLOW_DSN}(ZWECONF)'\";" >> JCL -echo "sed 's|UTF-8|IBM-1047|g' \$source > _ZWECONF;" >> JCL -echo "cp -T _ZWECONF \$target;" >> JCL +echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWECONF;" >> JCL +echo "sed 's|UTF-8|IBM-1047|g' _ZWECONF > ZWECONF;" >> JCL +echo "cp -T ZWECONF \$target;" >> JCL echo "/*" >> JCL sh scripts/submit_jcl.sh "`cat JCL`" From bfc4f26b8bac4dee3272cffcb50dbf3f610293fb Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Fri, 20 Oct 2023 19:05:37 +0200 Subject: [PATCH 010/104] Formatting in general pattern (#3615) Signed-off-by: Martin Zeithaml Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- CHANGELOG.md | 4 +++ bin/libs/certificate.sh | 4 +-- bin/utils/date-add.rex | 59 ++++++++++++++++++++++++++++++++++------- 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c6ce5f47b..f0dfd72d56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ All notable changes to the Zowe Installer will be documented in this file. #### Minor enhancements/defect fixes +## `2.13.0` +#### Minor enhancements/defect fixes +- Enhancement: `/bin/utils/date-add.rex` utility is accepting the date formatting as combination of YY|YYYY, MM, DD and any separator. + ## `2.11.0` ### New features and enhancements diff --git a/bin/libs/certificate.sh b/bin/libs/certificate.sh index d323d4f25a..49fcc232ef 100644 --- a/bin/libs/certificate.sh +++ b/bin/libs/certificate.sh @@ -884,8 +884,8 @@ EOF fi date_add_util="${ZWE_zowe_runtimeDirectory}/bin/utils/date-add.rex" - validity_ymd=$("${date_add_util}" ${validity} 1234-56-78) - validity_mdy=$("${date_add_util}" ${validity} 56/78/34) + validity_ymd=$("${date_add_util}" ${validity} YYYY-MM-DD) + validity_mdy=$("${date_add_util}" ${validity} MM/DD/YY) # option 2 needs further changes on JCL racf_connect1="s/dummy/dummy/" diff --git a/bin/utils/date-add.rex b/bin/utils/date-add.rex index c8f3649a3e..bf6b0d120d 100755 --- a/bin/utils/date-add.rex +++ b/bin/utils/date-add.rex @@ -13,19 +13,58 @@ /* * Parameters: - * 1: how many days in the future - * 2: date format. - * For example, 1234-56-78 will be YYYY-MM-DD. - * For example, 56/78/34 will be MM/DD/YY. + * 1: days: how many days in the future or past + * negative number for past + * 2: dformat: date format + * Combination of YY|YYYY, MM and DD and (optional) any separator + * For example: YYYY-MM-DD, MM/DD/YY, DD.MM.YY, YYMMDD... * - * Example: date-add.rexx 7 1234-56-78 + * Examples: + * date-add.rex 7 YYYY-MM-DD + * date-add.rex -1 MM/DD/YY */ arg options -parse var options days format +parse upper var options days dformat -today = Date('Base') +ERR_DATE.1 = "YY or YYYY (year)" +ERR_DATE.2 = "MM (month)" +ERR_DATE.3 = "DD (day)" + +if datatype(days) \= "NUM" then do + say "ERROR: expected numeric value for days: '"days"'" + exit 1 +end +/* YYMMDD -> YYYY/MM/DD */ +if length(dformat) < 6 | length(dformat) > 10 then do + len = 'short' + if length(dformat) > 10 then + len = 'long' + say "ERROR: invalid date format: '"||dformat||"' is too "||len + exit 1 +end +else do i = 1 to 3 + if pos(word(ERR_DATE.i, 1), dformat) = 0 then do + say "ERROR: invalid date format: '"||dformat||, + "' is missing "||ERR_DATE.i + exit 1 + end +end + +today = Date("Base") target = today + days -ISOTarget = Date('Standard', target, 'Base') -result = Translate(format, ISOTarget, '12345678') -say result +ISOTarget = Date("Standard", target, "Base") + +/* ISOTarget YYYYMMDD */ +/* 12344578 => YYYY = 1234, MM = 56, DD = 78 */ + +if pos("YYYY", dformat) = 0 then + dformat = overlay("34", dformat, pos("YY", dformat)) +else + dformat = overlay("1234", dformat, pos("YYYY", dformat)) +dformat = overlay("56", dformat, pos("MM", dformat)) +dformat = overlay("78", dformat, pos("DD", dformat)) + +res = translate(dformat, ISOTarget, "12345678") +say res +exit 0 From 9c584f96118bdcc0bbee4d310b012496f7c0efda Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 24 Oct 2023 12:23:20 -0400 Subject: [PATCH 011/104] add new PTF numbers Signed-off-by: ojcelis --- smpe/bld/service/ptf-bucket.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index ac0efb82f1..678f551643 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -18,4 +18,7 @@ #UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 -UO90033 UO90034 - IO29289 IO29290 IO29291 \ No newline at end of file +UO90033 UO90034 - IO29289 IO29290 IO29291 +UO90045 UO90046 - IO29343 IO29344 IO29345 +UO90047 UO90048 - IO29346 IO29347 IO29348 +UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file From 1cf6d441042ad4051e329847ebd973a18a2c0632 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Tue, 24 Oct 2023 19:49:49 +0000 Subject: [PATCH 012/104] Promote PTF after release v2.12.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index 7675df3320..eda8068aeb 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29289 +IO29290 +IO29291 IO29286 IO29287 IO29288 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index ad937b94d8..1a8d92b9ca 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29289 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.12.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29290 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.12.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29291 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.12.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29286 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index e4a768ccd8..7df8737e0f 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90033) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23297) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90031) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23255) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 0867777fc6..4782225075 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90033 +UO90034 UO90031 UO90032 UO90022 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index ac0efb82f1..060c2378b6 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -18,4 +18,4 @@ #UO90020 UO90021 - IO29182 IO29183 IO29184 - Tue Jun 13 21:20:27 UTC 2023 #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 -UO90033 UO90034 - IO29289 IO29290 IO29291 \ No newline at end of file +#UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 \ No newline at end of file From ea362ceeda238927b4a3bc803c4b3dce76de42fb Mon Sep 17 00:00:00 2001 From: ojcelis Date: Wed, 25 Oct 2023 08:19:18 -0400 Subject: [PATCH 013/104] updated PTF bucket Signed-off-by: ojcelis --- smpe/bld/service/ptf-bucket.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 67168bbe66..daa206b57a 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -19,7 +19,6 @@ #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 -UO90033 UO90034 - IO29289 IO29290 IO29291 UO90045 UO90046 - IO29343 IO29344 IO29345 UO90047 UO90048 - IO29346 IO29347 IO29348 UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file From f84232216a86625b885919f50d1fa46688d958cf Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 25 Oct 2023 09:24:35 -0500 Subject: [PATCH 014/104] Update cicd-test-readme.md Signed-off-by: 1000TurquoisePogs --- .github/workflows/cicd-test-readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index 26c6a38836..e2da92b983 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -110,7 +110,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 21 independent jobs will be spawned. ``` -basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v8.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v14.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) +basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) ``` Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours. From 250e53a6b591de7cea7c49fcd9defc38d855b414 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 25 Oct 2023 09:25:47 -0500 Subject: [PATCH 015/104] Update cicd-test.yml Signed-off-by: 1000TurquoisePogs --- .github/workflows/cicd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 5deecc5ef9..a1e5119d39 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -83,7 +83,7 @@ env: CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all) - ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v14.ts(any);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) + ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) jobs: display-dispatch-event-id: From b31828d2ff9813c77efdd11b9ac394d4cef21d44 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Wed, 25 Oct 2023 13:23:29 -0400 Subject: [PATCH 016/104] update zowe version to next release Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index bfd04cc9fa..d925e240e8 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.12.0", + "version": "2.13.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From 75414a8ec3f2ac59fc73e51f880c45b4c2363f9b Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 25 Oct 2023 15:07:11 -0400 Subject: [PATCH 017/104] build: remove node v14/v16 refs; cicd defaults to v16 Signed-off-by: MarkAckert --- .github/scripts/cicd_test/make_matrix.sh | 4 -- .github/workflows/cicd-test-readme.md | 4 +- .github/workflows/cicd-test.yml | 9 +--- .pax/pre-packaging.sh | 4 +- containers/conformance.md | 2 +- .../extended/node-versions/node-v14.ts | 44 ------------------- .../extended/node-versions/node-v16.ts | 44 ------------------- 7 files changed, 6 insertions(+), 105 deletions(-) delete mode 100644 tests/installation/src/__tests__/extended/node-versions/node-v14.ts delete mode 100644 tests/installation/src/__tests__/extended/node-versions/node-v16.ts diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index 899a6a0a77..5a94f3c4b5 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -32,10 +32,6 @@ case $install_test_choice in test_file="$KEYRING_TESTFILE" ;; -"z/OS node v16") - test_file="$ZOS_NODE_V16_TESTFILE" - ;; - "z/OS node v18") test_file="$ZOS_NODE_V18_TESTFILE" test_force_system="zzow04" diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index e2da92b983..c6820292bb 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -29,7 +29,6 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin - SMPE PTF - Extensions - Keyring - - z/OS node v16 - z/OS node v18 - Non-strict Verify External Certificate - Install PTF twice @@ -110,7 +109,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 21 independent jobs will be spawned. ``` -basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) +basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v18.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) ``` Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours. @@ -123,7 +122,6 @@ Selected test running elapsed time: | Convenience Pax | 53m | | SMPE PTF | 68m | | z/OS node v18 | 45m | -| z/OS node v16 | 45m | | Keyring | 53m | | Non-strict Verify External Certificate | 51m | | Extensions | 67m diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index a1e5119d39..412fd38b1f 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -24,7 +24,6 @@ on: - SMPE PTF - Extensions - Keyring - - z/OS node v16 - z/OS node v18 - Non-strict Verify External Certificate - Install PTF Twice @@ -62,7 +61,7 @@ env: DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax # below block can be overwritten, adjusted by DevOps only - # ZOS_NODE_VERSION more to choose from: v16.20.1 + # ZOS_NODE_VERSION more to choose from: v16.20.1, v18.16.0 ZOS_NODE_VERSION: v16.20.1 CLIENT_NODE_VERSION: v12.18.3 INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:* @@ -74,7 +73,6 @@ env: SMPE_PTF_TESTFILE: basic/install-ptf.ts EXTENSIONS_TESTFILE: basic/install-ext.ts KEYRING_TESTFILE: extended/keyring.ts - ZOS_NODE_V16_TESTFILE: extended/node-versions/node-v16.ts ZOS_NODE_V18_TESTFILE: extended/node-versions/node-v18.ts NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE: extended/certificates/nonstrict-verify-external-certificate.ts INSTALL_PTF_TWICE_TESTFILE: extended/install-ptf-two-times.ts @@ -83,7 +81,7 @@ env: CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all) - ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) + ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) jobs: display-dispatch-event-id: @@ -291,9 +289,6 @@ jobs: case 'Keyring': eta = 53 break; - case 'z/OS node v16': - eta = 45 - break; case 'z/OS node v18': eta = 45 break; diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 819d4818ea..6d1c1571a0 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -146,8 +146,8 @@ function _createWorkflow SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh BASE_DIR=$(cd $(dirname "$0"); pwd) # /.pax -# use node v14 to build -export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x +# use node v16 to build +export NODE_HOME=/ZOWE/node/node-v16.20.1-os390-s390x ZOWE_ROOT_DIR="${BASE_DIR}/content" diff --git a/containers/conformance.md b/containers/conformance.md index d487941ef7..e5e43c5e1e 100644 --- a/containers/conformance.md +++ b/containers/conformance.md @@ -16,7 +16,7 @@ Here are our recommendations of base images: - Zowe base images: * `ompzowe/base`: `zowe-docker-release.jfrog.io/ompzowe/base:latest-ubuntu` and `zowe-docker-release.jfrog.io/ompzowe/base:latest-ubi`. - * `ompzowe/base-node`: `zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubuntu` and `zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubi` has node.js LTS (v14) version pre-installed. + * `ompzowe/base-node`: `zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubuntu` and `zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubi` has node.js LTS (v16) version pre-installed. * `ompzowe/base-jdk`: `zowe-docker-release.jfrog.io/ompzowe/base-jdk:latest-ubuntu` and `zowe-docker-release.jfrog.io/ompzowe/base-jdk:latest-ubi` has JRE v8 pre-installed. - [Red Hat Universal Base Image 8 Minimal](https://developers.redhat.com/articles/ubi-faq?redirect_fragment=resources#ubi_details) - [Ubuntu](https://hub.docker.com/_/ubuntu) diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts deleted file mode 100644 index 00d47e38ab..0000000000 --- a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts +++ /dev/null @@ -1,44 +0,0 @@ -/** - * This program and the accompanying materials are made available under the terms of the - * Eclipse Public License v2.0 which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-v20.html - * - * SPDX-License-Identifier: EPL-2.0 - * - * Copyright IBM Corporation 2020 - */ - -import { - checkMandatoryEnvironmentVariables, - installAndVerifyConvenienceBuild, - showZoweRuntimeLogs, -} from '../../../utils'; -import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants'; - -const testServer = process.env.TEST_SERVER; -const testSuiteName = 'Test convenience build installation with node.js v6'; -describe(testSuiteName, () => { - beforeAll(() => { - // validate variables - checkMandatoryEnvironmentVariables([ - 'ZOWE_BUILD_LOCAL', - ]); - }); - - test('install and verify', async () => { - await installAndVerifyConvenienceBuild( - testSuiteName, - testServer, - { - 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v14.21.3.1-os390-s390x', - 'zowe_lock_keystore': 'false', - } - ); - }, TEST_TIMEOUT_CONVENIENCE_BUILD); - - afterAll(async () => { - await showZoweRuntimeLogs(testServer); - }) -}); diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts deleted file mode 100644 index bebbbdb660..0000000000 --- a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts +++ /dev/null @@ -1,44 +0,0 @@ -/** - * This program and the accompanying materials are made available under the terms of the - * Eclipse Public License v2.0 which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-v20.html - * - * SPDX-License-Identifier: EPL-2.0 - * - * Copyright IBM Corporation 2022 - */ - -import { - checkMandatoryEnvironmentVariables, - installAndVerifyConvenienceBuild, - showZoweRuntimeLogs, -} from '../../../utils'; -import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants'; - -const testServer = process.env.TEST_SERVER; -const testSuiteName = 'Test convenience build installation with node.js v16'; -describe(testSuiteName, () => { - beforeAll(() => { - // validate variables - checkMandatoryEnvironmentVariables([ - 'ZOWE_BUILD_LOCAL', - ]); - }); - - test('install and verify', async () => { - await installAndVerifyConvenienceBuild( - testSuiteName, - testServer, - { - 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], - 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v16.20.1-os390-s390x', - 'zowe_lock_keystore': 'false', - } - ); - }, TEST_TIMEOUT_CONVENIENCE_BUILD); - - afterAll(async () => { - await showZoweRuntimeLogs(testServer); - }) -}); From 312bda6a6de3fd03a9fb8631f590ea25c5a86781 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 27 Oct 2023 10:21:16 +0200 Subject: [PATCH 018/104] zwe diagnose running under configmgr Signed-off-by: Martin Zeithaml --- CHANGELOG.md | 6 +-- bin/commands/diagnose/index.sh | 70 ++++++++++++++++++++++++--------- bin/commands/diagnose/index.ts | 71 ++++++++++++++++++++++++---------- 3 files changed, 104 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0dfd72d56..388029c040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ All notable changes to the Zowe Installer will be documented in this file. #### 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). +- Enhancement: `/bin/utils/date-add.rex` utility is accepting the date formatting as combination of YY|YYYY, MM, DD and any separator. +- Bugfix: `zwe diagnose` running under comfigmgr and output formatted. Fixes #[3627](https://github.com/zowe/zowe-install-packaging/issues/3627). ## `2.12.0` @@ -15,10 +17,6 @@ All notable changes to the Zowe Installer will be documented in this file. #### Minor enhancements/defect fixes -## `2.13.0` -#### Minor enhancements/defect fixes -- Enhancement: `/bin/utils/date-add.rex` utility is accepting the date formatting as combination of YY|YYYY, MM, DD and any separator. - ## `2.11.0` ### New features and enhancements diff --git a/bin/commands/diagnose/index.sh b/bin/commands/diagnose/index.sh index e843993523..d1f07e8ebe 100644 --- a/bin/commands/diagnose/index.sh +++ b/bin/commands/diagnose/index.sh @@ -11,25 +11,59 @@ # Copyright Contributors to the Zowe Project. ####################################################################### -error_code="${ZWE_CLI_PARAMETER_ERROR_CODE}" +USE_CONFIGMGR=$(check_configmgr_enabled) +if [ "${USE_CONFIGMGR}" = "true" ]; then + _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/diagnose/cli.js" +else + + error_code="${ZWE_CLI_PARAMETER_ERROR_CODE}" -server_code=$(echo "${error_code}" | cut -c4) + print_message "" -if echo $error_code | grep -q -E "^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$"; then - if [[ "$server_code" == [Dd] ]]; then - print_message "This code corresponds to the errors related to the ZOWE Desktop and the App Server." - print_message "To find the description of this error code, refer to the Zowe documentation at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/appserver-error-codes.md" - elif [[ "$server_code" == [Ss] ]]; then - print_message "This code corresponds to the errors related to the Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)" - print_message "To find the description of this error code, refer to the Zowe documentation for ZSS at https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes and for ZIS at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/zis-error-codes.md" - elif [[ "$server_code" == [Aa] ]]; then - print_message "This code corresponds to the errors related to the Zowe API Mediation Layer (APIML)." - print_message "To find the description of this error code, refer to the Zowe documentation at https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes" - elif [[ "$server_code" == [Ll] ]]; then - print_message "This code corresponds to the errors related to the Zowe Launcher and ZWE" - print_message "To find the description of this error code, refer to the Zowe documentation for the Launcher at https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes and https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h, and for ZWE at https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/ " + if echo $error_code | grep -q -E "^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$"; then + server_code=$(echo "${error_code}" | cut -c4) + if [[ "$server_code" == [Dd] ]]; then + print_message "This code corresponds to the errors related to the ZOWE Desktop and the App Server." + print_message "" + print_message "To find the description of this error code, refer to the:" + print_message "" + print_message " Zowe documentation for Application framework" + print_message " https://docs.zowe.org/stable/troubleshoot/app-framework/appserver-error-codes" + elif [[ "$server_code" == [Ss] ]]; then + print_message "This code corresponds to the errors related to the Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)." + print_message "" + print_message "To find the description of this error code, refer to the:" + print_message "" + print_message " Zowe documentation for ZSS" + print_message " https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes" + print_message " Zowe documentation for ZIS" + print_message " https://docs.zowe.org/stable/troubleshoot/app-framework/zis-error-codes" + elif [[ "$server_code" == [Aa] ]]; then + print_message "This code corresponds to the errors related to the Zowe API Mediation Layer (APIML)." + print_message "" + print_message "To find the description of this error code, refer to the:" + print_message "" + print_message " Zowe documentation for API Mediation Layer" + print_message " https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes" + elif [[ "$server_code" == [Ll] ]]; then + print_message "This code corresponds to the errors related to the Zowe Launcher and ZWE." + print_message "" + print_message "To find the description of this error code, refer to the:" + print_message "" + print_message " Zowe documentation for Launcher" + print_message " https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes" + print_message " Launcher error codes" + print_message " https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h" + print_message " Zowe documentation for ZWE" + print_message " https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/" + fi + print_message "" + print_message "You may also explore reports from other users experiencing the same error by searching" + print_message "https://github.com/search?q=org%3Azowe+${error_code}&type=discussions" + else + print_error_and_exit "ZWEL0102E: Invalid parameter --error-code='${error_code}'" "" 102 fi - print_message "You may also explore reports from other users experiencing the same error by searching here https://github.com/search?q=org%3Azowe+${error_code}&type=discussions" -else - print_error_and_exit "Invalid Error Code" "" 102 + + print_message "" + fi diff --git a/bin/commands/diagnose/index.ts b/bin/commands/diagnose/index.ts index 1fe91dc198..8fb6518277 100644 --- a/bin/commands/diagnose/index.ts +++ b/bin/commands/diagnose/index.ts @@ -8,31 +8,60 @@ Copyright Contributors to the Zowe Project. */ - import * as std from 'cm_std'; import * as common from '../../libs/common'; -export function execute() { - const errorCode: string = std.getenv('ZWE_CLI_PARAMETER_ERROR_CODE'); +const THIS_CODE = "\nThis code corresponds to the errors related to the"; +const FIND_DESC = "To find the description of this error code, refer to the:\n "; +const URL = { + apiML: "https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes", + appFW : "https://docs.zowe.org/stable/troubleshoot/app-framework/appserver-error-codes", + launcher: "https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes", + launcherGit: "https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h", + zss: "https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes", + zis: "https://docs.zowe.org/stable/troubleshoot/app-framework/zis-error-codes", + zwe: "https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/" +} + +function thisCodeCorrespondsTo(component: string){ + common.printMessage(`${THIS_CODE} ${component}.\n`); + common.printMessage(`${FIND_DESC}`); +} - const serverCode: string = errorCode.charAt(3); +function printLinks(description: string, link: string){ + if (link.indexOf('github') > 0) + common.printMessage(` ${description}`) + else + common.printMessage(` Zowe documentation for ${description}`) + common.printMessage(` ${link}`); +} - if (/^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$/.test(errorCode)) { - if (serverCode.toLowerCase() === 'd') { - common.printMessage("This code corresponds to the errors related to the ZOWE Desktop and the App Server."); - common.printMessage("To find the description of this error code, refer to the Zowe documentation at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/appserver-error-codes.md"); - } else if (serverCode.toLowerCase() === 's') { - common.printMessage("This code corresponds to the errors related to the Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)"); - common.printMessage("To find the description of this error code, refer to the Zowe documentation for ZSS at https://docs.zowe.org/stable/troubleshoot/app-framework/zss-error-codes and for ZIS at https://github.com/zowe/docs-site/blob/master/docs/troubleshoot/app-framework/zis-error-codes.md"); - } else if (serverCode.toLowerCase() === 'a') { - common.printMessage("This code corresponds to the errors related to the Zowe API Mediation Layer (APIML)."); - common.printMessage("To find the description of this error code, refer to the Zowe documentation at https://docs.zowe.org/stable/troubleshoot/troubleshoot-apiml-error-codes"); - } else if (serverCode.toLowerCase() === 'l') { - common.printMessage("This code corresponds to the errors related to the Zowe Launcher and ZWE"); - common.printMessage("To find the description of this error code, refer to the Zowe documentation for the Launcher at https://docs.zowe.org/stable/troubleshoot/launcher/launcher-error-codes and https://github.com/zowe/launcher/blob/v2.x/master/src/msg.h, and for ZWE at https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/"); +export function execute() { + const errorCode = std.getenv('ZWE_CLI_PARAMETER_ERROR_CODE'); + if (/^[zZ][wW][eE][AaSsDdLl][A-Za-z]?[0-9]{3,4}[A-Za-z]$/.test(errorCode)) { + const serverCode = errorCode.charAt(3); + if (serverCode.toLowerCase() === 'd') { + thisCodeCorrespondsTo('ZOWE Desktop and the App Server'); + printLinks('Application framework', `${URL.appFW}`); + } + else if (serverCode.toLowerCase() === 's') { + thisCodeCorrespondsTo('Zowe Subsystem Services (ZSS) and Zowe Installation Services (ZIS)'); + printLinks('ZSS', `${URL.zss}`); + printLinks('ZIS', `${URL.zis}`); + } + else if (serverCode.toLowerCase() === 'a') { + thisCodeCorrespondsTo('Zowe API Mediation Layer (APIML)'); + printLinks('API Mediation Layer', `${URL.apiML}`); + } + else if (serverCode.toLowerCase() === 'l') { + thisCodeCorrespondsTo('Zowe Launcher and ZWE'); + printLinks('Launcher', `${URL.launcher}`); + printLinks('Launcher error codes', `${URL.launcherGit}`); + printLinks('ZWE', `${URL.zwe}`); + } + common.printMessage(`\nYou may also explore reports from other users experiencing the same error by searching\nhttps://github.com/search?q=org%3Azowe+${errorCode}&type=discussions\n`); + } + else { + common.printErrorAndExit(`ZWEL0102E: Invalid parameter --error-code='${errorCode}'`, undefined, 102); } - common.printMessage(`You may also explore reports from other users experiencing the same error by searching here https://github.com/search?q=org%3Azowe+${errorCode}&type=discussions`) - } else { - common.printErrorAndExit("Invalid Error Code", undefined, 102); - } } From 6fad6ca625b20b38d7c4dade902e62f2971d3aa8 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Thu, 16 Nov 2023 10:26:06 -0500 Subject: [PATCH 019/104] Make example-zowe.yaml certificate scenarios more accurate Signed-off-by: Leanid Astrakou --- example-zowe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index e82479c0dd..2f121c4128 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -173,7 +173,7 @@ zowe: # - "" # # >>>> Certificate setup scenario 3 - # # z/OS Keyring with Zowe generated certificates. + # # 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: JCERACFKS @@ -209,7 +209,7 @@ zowe: # # - 12.34.56.78 # # >>>> Certificate setup scenario 4 - # # z/OS Keyring and connect to existing certificate + # # 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: JCERACFKS @@ -233,7 +233,7 @@ zowe: # - "" # # >>>> Certificate setup scenario 5 - # # z/OS Keyring with importing certificate stored in data set + # # 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: JCERACFKS From 9aef6279b0f0c241fcb3cbb9120ed522c43afc35 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Fri, 17 Nov 2023 08:57:12 -0500 Subject: [PATCH 020/104] Add global and component level network configuration options (#3509) * Add global and component level network configuration options Signed-off-by: Timothy Gerstel * Use zoweIpv4 for bind addresses and update tls settings to enums Signed-off-by: Timothy Gerstel * Deduplicate schema and separate server from client Also change "bind" to "listen" and tls prefix with TLSv, as seen in the majority of our servers. Signed-off-by: 1000TurquoisePogs * Fix schema json syntax Signed-off-by: 1000TurquoisePogs * Shorten tlsSettings to tls, and fix plural ipAddresses Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: Timothy Gerstel Signed-off-by: 1000TurquoisePogs Co-authored-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 101 +++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 14 deletions(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index b37915a80c..60a2f83374 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -419,20 +419,7 @@ } }, "network": { - "type": "object", - "additionalProperties": false, - "description": "Optional, advanced network configuration parameters", - "properties": { - "vipaIp": { - "type": "string", - "description": "The IP address which all of the Zowe servers will be binding to. If you are using multiple DIPVA addresses, do not use this option." - }, - "validatePortFree": { - "type": "boolean", - "default": true, - "description": "Whether or not to ensure that the port a server is about to use is available. Usually, servers will know this when they attempt to bind to a port, so this option allows you to disable the additional verification step." - } - } + "$ref": "#/$defs/networkSettings" }, "extensionRegistry": { "type": "object", @@ -854,6 +841,92 @@ "default": "yes" } } + }, + "zowe": { + "type": "object", + "description": "Component level overrides for top level Zowe network configuration.", + "additionalProperties": false, + "properties": { + "network": { + "$ref": "#/$defs/networkSettings" + } + } + } + } + }, + "tlsSettings": { + "$anchor": "tlsSettings", + "type": "object", + "properties": { + "ciphers": { + "type": "array", + "description": "Acceptable TLS cipher suites for network connections.", + "items": { + "type": "string" + } + }, + "curves": { + "type": "array", + "description": "Acceptable key exchange elliptic curves for network connections.", + "items": { + "type": "string" + } + }, + "maxTls": { + "type": "string", + "enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"], + "default": "TLSv1.3", + "description": "Maximum TLS version allowed for network connections." + }, + "minTls": { + "type": "string", + "enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"], + "default": "TLSv1.3", + "description": "Minimum TLS version allowed for network connections, and less than network.maxTls." + } + } + }, + "networkSettings": { + "type": "object", + "$anchor": "networkSettings", + "additionalProperties": false, + "description": "Optional, advanced network configuration parameters", + "properties": { + "server": { + "type": "object", + "additionalProperties": false, + "description": "Optional, advanced network configuration parameters for Zowe servers", + "properties": { + "tls": { + "$ref": "#/$defs/tlsSettings" + }, + "listenAddresses": { + "type": "array", + "description": "The IP addresses which all of the Zowe servers will be binding on and listening to. Some servers may only support listening on the first element.", + "items": { + "$ref": "/schemas/v2/server-common#zoweIpv4" + } + }, + "vipaIp": { + "type": "string", + "description": "The IP address which all of the Zowe servers will be binding to. If you are using multiple DIPVA addresses, do not use this option." + }, + "validatePortFree": { + "type": "boolean", + "default": true, + "description": "Whether or not to ensure that the port a server is about to use is available. Usually, servers will know this when they attempt to bind to a port, so this option allows you to disable the additional verification step." + } + } + }, + "client": { + "type": "object", + "additionalProperties": false, + "description": "Optional, advanced network configuration parameters for Zowe servers when sending requests as clients.", + "properties": { + "tls": { + "$ref": "#/$defs/tlsSettings" + } + } } } }, From b2b7b02dc6bd66e0222165f4d25ab61ab5019fe8 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Mon, 20 Nov 2023 11:47:54 -0500 Subject: [PATCH 021/104] Build: fix failing chown from build step (#3658) * build: remove failing chown from build step Signed-off-by: MarkAckert * build: update mkdir to _cmd, chown _super to _cmd Signed-off-by: MarkAckert * chore: update comment Signed-off-by: MarkAckert --------- Signed-off-by: MarkAckert --- smpe/bld/smpe-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smpe/bld/smpe-install.sh b/smpe/bld/smpe-install.sh index 2022745c71..d08c8ad57b 100755 --- a/smpe/bld/smpe-install.sh +++ b/smpe/bld/smpe-install.sh @@ -171,7 +171,7 @@ opts="$opts -l $log" # install log _cmd $extract/$zweScript install $opts Date: Wed, 22 Nov 2023 15:18:56 -0500 Subject: [PATCH 022/104] zzow system updates (#3651) * build: zzow04 to zzow08 Signed-off-by: MarkAckert * build: add port Signed-off-by: MarkAckert * build: remove explicit pax vars. action defaults updated. Signed-off-by: MarkAckert * build: update marist system names Signed-off-by: MarkAckert * chore: update playbook hosts Signed-off-by: MarkAckert * chore: change ansible port for new systems Signed-off-by: MarkAckert * test: update failing vt test; system response correct Signed-off-by: MarkAckert * build: update PSWI builds for zzow07 Signed-off-by: MarkAckert * chore: lint fix Signed-off-by: MarkAckert * chore: update random gen to create 6,7,8 Signed-off-by: MarkAckert * build: temporarily disable vt test Signed-off-by: MarkAckert * build: comment out entire file (lint errors) Signed-off-by: MarkAckert --------- Signed-off-by: MarkAckert --- .github/scripts/cicd_test/make_matrix.sh | 7 +- .../03_process_test_server.sh | 26 ++-- .github/workflows/build-packaging.yml | 3 +- .github/workflows/cicd-test-readme.md | 10 +- .github/workflows/cicd-test.yml | 10 +- .../host_vars/{marist-2.yml => marist-6.yml} | 2 +- .../host_vars/{marist-3.yml => marist-7.yml} | 2 +- .../host_vars/{marist-4.yml => marist-8.yml} | 2 + playbooks/hosts | 6 +- pswi/00_presmpe.sh | 7 +- pswi/01_smpe.sh | 3 +- pswi/02_ptf.sh | 3 +- pswi/03_create.sh | 3 +- pswi/05_test.sh | 3 +- pswi/PSWI-marist.sh | 143 +++++++++--------- .../extended/keyring-modes/acf2-keyring.ts | 2 +- .../extended/keyring-modes/racf-keyring.ts | 2 +- .../extended/keyring-modes/tss-keyring.ts | 2 +- .../extended/node-versions/node-v18.ts | 2 +- .../security-systems/convenience/acf2.ts | 6 +- .../security-systems/convenience/racf.ts | 4 +- .../security-systems/convenience/ts.ts | 6 +- .../extended/security-systems/fmid/acf2.ts | 6 +- .../extended/security-systems/fmid/racf.ts | 4 +- .../extended/security-systems/fmid/ts.ts | 6 +- .../extended/security-systems/ptf/acf2.ts | 6 +- .../extended/security-systems/ptf/racf.ts | 4 +- .../extended/security-systems/ptf/ts.ts | 6 +- tests/sanity/test/e2e/test-06-vt.js | 14 +- 29 files changed, 154 insertions(+), 146 deletions(-) rename playbooks/host_vars/{marist-2.yml => marist-6.yml} (83%) rename playbooks/host_vars/{marist-3.yml => marist-7.yml} (93%) rename playbooks/host_vars/{marist-4.yml => marist-8.yml} (96%) mode change 100644 => 100755 pswi/PSWI-marist.sh diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index 5a94f3c4b5..7a17f253db 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -34,7 +34,7 @@ case $install_test_choice in "z/OS node v18") test_file="$ZOS_NODE_V18_TESTFILE" - test_force_system="zzow04" + test_force_system="zzow08" ;; "Non-strict Verify External Certificate") @@ -90,10 +90,11 @@ else any_occurrence=$(echo $test_file | grep -o "(any)" | wc -l) interim_test_file_server=$test_file for i in $(seq $any_occurrence); do - interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow0$(echo $(($RANDOM % 3 + 2))))#") + # Generates zzow06, zzow07, zzow08 + interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow0$(echo $(($RANDOM % 3 + 6))))#") done - TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow02,zzow03,zzow04)#g") + TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow06,zzow07,zzow08)#g") fi fi diff --git a/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh b/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh index 02ad5813f5..7e7b80ad07 100644 --- a/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh +++ b/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh @@ -14,24 +14,24 @@ TEST_SERVER=$(echo "$MATRIX_SERVER" | cut -d "-" -f2) case $TEST_SERVER in -"zzow02") - TEST_SERVER_NICKNAME=marist-2 - ;; +"zzow06") + TEST_SERVER_NICKNAME=marist-6 + ;; -"zzow03") - TEST_SERVER_NICKNAME=marist-3 - ;; +"zzow07") + TEST_SERVER_NICKNAME=marist-7 + ;; -"zzow04") - TEST_SERVER_NICKNAME=marist-4 - ;; +"zzow08") + TEST_SERVER_NICKNAME=marist-8 + ;; *) - printf "${RED}[Check 2 ERROR] Something went wrong when parsing test server nickname\n" - exit 1 - ;; + printf "${RED}[Check 2 ERROR] Something went wrong when parsing test server nickname\n" + exit 1 + ;; esac assert_env_var "TEST_SERVER" assert_env_var "TEST_SERVER_NICKNAME" -printf "${GREEN}[Check 2/$TOTAL_CHECK] Test server name processing complete!${NC}\n" \ No newline at end of file +printf "${GREEN}[Check 2/$TOTAL_CHECK] Test server name processing complete!${NC}\n" diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 66d21b9395..7751f2f770 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -236,7 +236,7 @@ jobs: with: lock-repository: ${{ github.repository }} github-token: ${{ secrets.GITHUB_TOKEN }} - lock-resource-name: zowe-psi-build-zzow03-lock + lock-resource-name: zowe-psi-build-zzow07-lock lock-avg-retry-interval: 60 - name: '[SMPE Pax 4] Build PSWI' @@ -249,6 +249,7 @@ jobs: env: ZOSMF_USER: ${{ secrets.ZOWE_PSWI_BUILD_USR }} ZOSMF_PASS: ${{ secrets.ZOWE_PSWI_BUILD_PASSWD }} + ZZOW_SSH_PORT: ${{ secrets.SSH_MARIST_ALLSYS_PORT }} VERSION: ${{ env.P_VERSION }} - name: '[K8S] Build Kubernetes' diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index c6820292bb..2a658f5eeb 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -4,9 +4,9 @@ This guide will describe how you should input into Github Actions workflow input Currently we support three testing z/OS servers: -- zzow02 (ACF2) -- zzow03 (Top Secret/TSS) -- zzow04 (RACF) +- zzow06 (ACF2) +- zzow07 (Top Secret/TSS) +- zzow08 (RACF) Testing pipeline is running tests in parallel. The workflow will try to acquire the resource lock if available. If the resource lock is occupied, the workflow will wait until the lock is succesfully acquired. @@ -17,7 +17,7 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin ### Choose Test Server - This input is a choice, and it's mandatory. -- You can choose from one of `zzow02`, `zzow03`, `zzow04`, `zzow02,zzow03,zzow04` (if you want to run the test on all zzow servers), or `Any zzow servers` (pick any zzow servers, potentially help reduce wait time) +- You can choose from one of `zzow06`, `zzow07`, `zzow08`, `zzow06,zzow07,zzow08` (if you want to run the test on all zzow servers), or `Any zzow servers` (pick any zzow servers, potentially help reduce wait time) - Default is `Any zzow servers` ### Choose Install Test @@ -109,7 +109,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 21 independent jobs will be spawned. ``` -basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v18.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02) +basic/install.ts(zzow06,zzow07,zzow08);basic/install-ptf.ts(zzow06,zzow07,zzow08);basic/install-ext.ts(zzow07);extended/keyring.ts(zzow06,zzow07,zzow08);extended/node-versions/node-v18.ts(zzow06,zzow07,zzow08);extended/certificates/nonstrict-verify-external-certificate.ts(zzow06) ``` Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours. diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 412fd38b1f..56a0e2ab89 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -9,10 +9,10 @@ on: default: 'Any zzow servers' options: - Any zzow servers - - zzow02 - - zzow03 - - zzow04 - - zzow02,zzow03,zzow04 + - zzow06 + - zzow07 + - zzow08 + - zzow06,zzow07,zzow08 install-test: description: 'Choose Install Test' type: choice @@ -81,7 +81,7 @@ env: CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all) - ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) + ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow08):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any) jobs: display-dispatch-event-id: diff --git a/playbooks/host_vars/marist-2.yml b/playbooks/host_vars/marist-6.yml similarity index 83% rename from playbooks/host_vars/marist-2.yml rename to playbooks/host_vars/marist-6.yml index 180f8af53e..6a013b35de 100644 --- a/playbooks/host_vars/marist-2.yml +++ b/playbooks/host_vars/marist-6.yml @@ -1,5 +1,5 @@ --- zos_security_system: ACF2 zos_zosmf_ca: ZOSMFSRV - +ansible_port: 65522 zowe_configure_ignore_security_failures: true diff --git a/playbooks/host_vars/marist-3.yml b/playbooks/host_vars/marist-7.yml similarity index 93% rename from playbooks/host_vars/marist-3.yml rename to playbooks/host_vars/marist-7.yml index 939bfb5e26..e5dbecc34b 100644 --- a/playbooks/host_vars/marist-3.yml +++ b/playbooks/host_vars/marist-7.yml @@ -4,5 +4,5 @@ zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js" zowe_apiml_security_x509_enabled: true zowe_apiml_security_oidc_enabled: true zos_zosmf_ca: ZOSMFCA - +ansible_port: 65522 zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 diff --git a/playbooks/host_vars/marist-4.yml b/playbooks/host_vars/marist-8.yml similarity index 96% rename from playbooks/host_vars/marist-4.yml rename to playbooks/host_vars/marist-8.yml index 894500deef..4fd32f3177 100644 --- a/playbooks/host_vars/marist-4.yml +++ b/playbooks/host_vars/marist-8.yml @@ -13,4 +13,6 @@ zowe_install_logs_dir: /ZOWE/logs zowe_smpe_volser: ZOWE03 zowe_caching_vsam_volume: ZOWE03 +ansible_port: 65522 + zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4 diff --git a/playbooks/hosts b/playbooks/hosts index 2fabf917b3..f53a1884e8 100644 --- a/playbooks/hosts +++ b/playbooks/hosts @@ -1,7 +1,7 @@ [marist] -marist-2 -marist-3 -marist-4 +marist-6 +marist-7 +marist-8 [tvt] tvt4188 diff --git a/pswi/00_presmpe.sh b/pswi/00_presmpe.sh index 258d13268b..e8db65fa11 100644 --- a/pswi/00_presmpe.sh +++ b/pswi/00_presmpe.sh @@ -8,6 +8,7 @@ echo "" echo "Script for preparing datasets for SMP/E (PTFs)..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "z/OSMF system :" $ZOSMF_SYSTEM echo "FMID :" $FMID echo "RFDSNPFX :" $RFDSNPFX @@ -27,7 +28,7 @@ sh scripts/tmp_mounts.sh "${TMP_ZFS}" "${TMP_MOUNT}" if [ $? -gt 0 ];then exit -1;fi cd unzipped -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} put ${FMID}.pax.Z EOF @@ -76,13 +77,13 @@ rm JCL cd unzipped if [ $PTFNR -eq 2 ] then -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} put ${RFDSNPFX}.${FMID}.${PTF1} ${PTF1} put ${RFDSNPFX}.${FMID}.${PTF2} ${PTF2} EOF else -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} put ${RFDSNPFX}.${FMID}.${PTF1} ${PTF1} EOF diff --git a/pswi/01_smpe.sh b/pswi/01_smpe.sh index 458d9c9356..8370b9ef54 100644 --- a/pswi/01_smpe.sh +++ b/pswi/01_smpe.sh @@ -9,6 +9,7 @@ echo "" echo "Script for creation of ZOWE SMP/E environment..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "z/OSMF system :" $ZOSMF_SYSTEM echo "Dataset with workflows :" $WORKFLOW_DS echo "SMPE workflow name :" $SMPE_WF_NAME @@ -42,7 +43,7 @@ echo "Uploading workflow SMPE into ${DIR} directory thru SSH" cd workflows -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${DIR} put SMPE20 EOF diff --git a/pswi/02_ptf.sh b/pswi/02_ptf.sh index 5684360470..e2c23e54e3 100644 --- a/pswi/02_ptf.sh +++ b/pswi/02_ptf.sh @@ -9,6 +9,7 @@ echo "" echo "Script for applying of PTFs into SMPE via workflow..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "z/OSMF system :" $ZOSMF_SYSTEM echo "CSI HLQ :" $CSIHLQ echo "PTF dataset :" $SMPE @@ -37,7 +38,7 @@ ADD_WORKFLOW_JSON='{"workflowName":"'$PTF_WF_NAME'", cd workflows -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${DIR} put WFPTF EOF diff --git a/pswi/03_create.sh b/pswi/03_create.sh index 99d4ab7687..3f9e30fb84 100644 --- a/pswi/03_create.sh +++ b/pswi/03_create.sh @@ -8,6 +8,7 @@ echo "" echo "Script for creating a Portable Software Instance..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "CSI HLQ :" $CSIHLQ echo "SMP/E zone :" $ZONE echo "z/OSMF system :" $ZOSMF_SYSTEM @@ -331,7 +332,7 @@ if [ $? -gt 0 ];then exit -1;fi rm JCL cd ../.pax -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} get ${SWI_NAME}.pax.Z EOF diff --git a/pswi/05_test.sh b/pswi/05_test.sh index 8ee0a9f1b9..523458b3c3 100644 --- a/pswi/05_test.sh +++ b/pswi/05_test.sh @@ -8,6 +8,7 @@ echo "" echo "Script for testing a Portable Software Instance..." echo "Host :" $ZOSMF_URL echo "Port :" $ZOSMF_PORT +echo "SSH Port :" $ZZOW_SSH_PORT echo "PSWI name :" $PSWI echo "z/OSMF system :" $ZOSMF_SYSTEM echo "Test HLQ :" $TEST_HLQ @@ -33,7 +34,7 @@ sh scripts/tmp_mounts.sh "${TMP_ZFS}" "${TMP_MOUNT}" if [ $? -gt 0 ];then exit -1;fi cd ../.pax -sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF +sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF cd ${TMP_MOUNT} put ${SWI_NAME}.pax.Z EOF diff --git a/pswi/PSWI-marist.sh b/pswi/PSWI-marist.sh old mode 100644 new mode 100755 index ab3f30b677..80441508af --- a/pswi/PSWI-marist.sh +++ b/pswi/PSWI-marist.sh @@ -1,4 +1,4 @@ -export ZOSMF_URL="https://zzow03.zowe.marist.cloud" +export ZOSMF_URL="https://zzow07.zowe.marist.cloud" export ZOSMF_PORT=10443 export ZOSMF_SYSTEM="S0W1" export DIR="/u/zowead2" @@ -7,7 +7,7 @@ export TMP_ZFS="ZOWEAD2.TMP.ZFS" export ZOWE_MOUNT="/u/zwe/zowe-smpe/" export VOLUME="ZOS003" export TEST_HLQ="ZOWEAD2.PSWIT" -export SYSAFF="(2964,S0W1)" +export SYSAFF="(S0W1)" export ACCOUNT=1 # Variables for workflows @@ -16,11 +16,10 @@ export TZONE="TZONE" export DZONE="DZONE" export JOBNAME="ZWEPSWI1" -if [ -n "$ACCOUNT" ] -then -export JOBST1="//"${JOBNAME}" JOB ("${ACCOUNT}"),'PSWI',MSGCLASS=A,REGION=0M" +if [ -n "$ACCOUNT" ]; then + export JOBST1="//"${JOBNAME}" JOB ("${ACCOUNT}"),'PSWI',MSGCLASS=A,REGION=0M" else -export JOBST1="//"${JOBNAME}" JOB 'PSWI',MSGCLASS=A,REGION=0M" + export JOBST1="//"${JOBNAME}" JOB 'PSWI',MSGCLASS=A,REGION=0M" fi export JOBST2="/*JOBPARM SYSAFF=${SYSAFF}" export DEPLOY_NAME="DEPLOY" @@ -37,8 +36,7 @@ export PTF_WF_NAME="ZOWE_PTF_WF" export HOST=${ZOSMF_URL#https:\/\/} echo "--------------------------------- Getting build specific variables ---------------------------------------" -if [ -f ../.pax/zowe-smpe.zip ] -then +if [ -f ../.pax/zowe-smpe.zip ]; then echo "ok" mkdir -p "unzipped" unzip ../.pax/zowe-smpe.zip -d unzipped @@ -47,36 +45,32 @@ else exit -1 fi -if [ -f unzipped/*.pax.Z ] -then +if [ -f unzipped/*.pax.Z ]; then echo "it's new fmid" - export FMID=`ls unzipped | tail -n 1 | cut -f1 -d'.'` - export RFDSNPFX=`cat unzipped/*htm | grep -o "hlq.*.${FMID}.F1" | cut -f2 -d'.'` + export FMID=$(ls unzipped | tail -n 1 | cut -f1 -d'.') + export RFDSNPFX=$(cat unzipped/*htm | grep -o "hlq.*.${FMID}.F1" | cut -f2 -d'.') else echo "it's ptf/apar" mv unzipped/*htm ptfs.html - export PTFNR=`ls unzipped | wc -l` - - if [ $PTFNR -le 2 ] - then + export PTFNR=$(ls unzipped | wc -l) + + if [ $PTFNR -le 2 ]; then echo "standard situation" - export RFDSNPFX=`ls unzipped | tail -n 1 | cut -f1 -d'.'` - export FMID=`ls unzipped | tail -n 1 | cut -f2 -d'.'` - - FILES=`ls unzipped` + export RFDSNPFX=$(ls unzipped | tail -n 1 | cut -f1 -d'.') + export FMID=$(ls unzipped | tail -n 1 | cut -f2 -d'.') + + FILES=$(ls unzipped) N=0 - for FILE in $FILES - do - N=$((N+1)) - export PTF${N}=`echo $FILE | tail -n 1 | cut -f3 -d'.'` + for FILE in $FILES; do + N=$((N + 1)) + export PTF${N}=$(echo $FILE | tail -n 1 | cut -f3 -d'.') done else echo "Different number of files" #TODO:make it more universal (we have the workflow now just for two files anyway so change it with that) fi - if [ -f ../.pax/${FMID}.zip ] - then + if [ -f ../.pax/${FMID}.zip ]; then unzip ../.pax/${FMID}.zip -d unzipped else echo "File with FMID not found" @@ -94,66 +88,65 @@ export GLOBAL_ZONE=${CSIHLQ}.CSI export EXPORT_DSN=${CSIHLQ}.EXPORT export WORKFLOW_DSN=${CSIHLQ}.WORKFLOW export ZOWE_ZFS="${CSIHLQ}.ZFS" -export VERSION=`cat ../manifest.json.template | grep -o '"version": ".*"' | head -1 | cut -f4 -d\"` +export VERSION=$(cat ../manifest.json.template | grep -o '"version": ".*"' | head -1 | cut -f4 -d\") # Upload and prepare all files sh 00_presmpe.sh presmpe=$? -if [ $presmpe -eq 0 ];then -# Create SMP/E -sh 01_smpe.sh -smpe=$? +if [ $presmpe -eq 0 ]; then + # Create SMP/E + sh 01_smpe.sh + smpe=$? -if [ $smpe -eq 0 ];then -if [ -n "$PTFNR" ];then -# Apply PTFs -sh 02_ptf.sh -ptf=$? -else -# There are no PTFs -ptf=0 -fi - -if [ $ptf -eq 0 ];then -# Create PSWI -sh 03_create.sh -create=$? - -# Cleanup after the creation of PSWI -sh 04_create_cleanup.sh -# Cleanup of SMP/E -sh 07_smpe_cleanup.sh -# Clean RELFILEs and PTFs -sh 08_presmpe_cleanup.sh - -if [ $create -eq 0 ];then -# Test PSWI -sh 05_test.sh -test=$? - -# Cleanup after the test -sh 06_test_cleanup.sh -fi -else - # Cleanup of SMP/E if PTF weren't successful - because the earlier cleanup runs only it it was success - sh 07_smpe_cleanup.sh - # Clean RELFILEs and PTFs -sh 08_presmpe_cleanup.sh -fi -else - # Cleanup of SMP/E if SMPE weren't successful - because the earlier cleanup runs only it it was success - sh 07_smpe_cleanup.sh - # Clean RELFILEs and PTFs -sh 08_presmpe_cleanup.sh + if [ $smpe -eq 0 ]; then + if [ -n "$PTFNR" ]; then + # Apply PTFs + sh 02_ptf.sh + ptf=$? + else + # There are no PTFs + ptf=0 + fi + + if [ $ptf -eq 0 ]; then + # Create PSWI + sh 03_create.sh + create=$? + + # Cleanup after the creation of PSWI + sh 04_create_cleanup.sh + # Cleanup of SMP/E + sh 07_smpe_cleanup.sh + # Clean RELFILEs and PTFs + sh 08_presmpe_cleanup.sh + + if [ $create -eq 0 ]; then + # Test PSWI + sh 05_test.sh + test=$? + + # Cleanup after the test + sh 06_test_cleanup.sh + fi + else + # Cleanup of SMP/E if PTF weren't successful - because the earlier cleanup runs only it it was success + sh 07_smpe_cleanup.sh + # Clean RELFILEs and PTFs + sh 08_presmpe_cleanup.sh + fi + else + # Cleanup of SMP/E if SMPE weren't successful - because the earlier cleanup runs only it it was success + sh 07_smpe_cleanup.sh + # Clean RELFILEs and PTFs + sh 08_presmpe_cleanup.sh + fi fi -fi echo "" echo "" -if [ $smpe -ne 0 ] || [ $ptf -ne 0 ] || [ $create -ne 0 ] || [ $test -ne 0 ] || [ $presmpe -ne 0 ] -then +if [ $smpe -ne 0 ] || [ $ptf -ne 0 ] || [ $create -ne 0 ] || [ $test -ne 0 ] || [ $presmpe -ne 0 ]; then echo "Build unsuccessful!" if [ $presmpe -ne 0 ]; then echo "Pre-SMP/E wasn't successful." diff --git a/tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts b/tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts index 5740f129be..8b740588ee 100644 --- a/tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts +++ b/tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts @@ -18,7 +18,7 @@ import { KEYSTORE_MODE_KEYRING, } from '../../../constants'; -const testServer = 'marist-2'; +const testServer = 'marist-6'; const testSuiteName = 'Test convenience build installation with keystore pointing to an ACF2 keyring'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts b/tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts index 7e950bee6e..f2399de380 100644 --- a/tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts +++ b/tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts @@ -18,7 +18,7 @@ import { KEYSTORE_MODE_KEYRING, } from '../../../constants'; -const testServer = 'marist-4'; +const testServer = 'marist-8'; const testSuiteName = 'Test convenience build installation with keystore pointing to a RACF keyring'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts b/tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts index 19bf77eb98..fbd1f1f69d 100644 --- a/tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts +++ b/tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts @@ -18,7 +18,7 @@ import { KEYSTORE_MODE_KEYRING, } from '../../../constants'; -const testServer = 'marist-3'; +const testServer = 'marist-7'; const testSuiteName = 'Test convenience build installation with keystore pointing to a TSS keyring'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v18.ts b/tests/installation/src/__tests__/extended/node-versions/node-v18.ts index f44632a305..4758b24904 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v18.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v18.ts @@ -15,7 +15,7 @@ import { } from '../../../utils'; import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants'; -// Only runs on zzow04 at time of change (04.2023). See cicd-test.yml and make_matrix.sh. +// Only runs on zzow08 at time of change (04.2023). See cicd-test.yml and make_matrix.sh. const testServer = process.env.TEST_SERVER; const testSuiteName = 'Test convenience build installation with node.js v18'; describe(testSuiteName, () => { diff --git a/tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts index 9e9e6c88dc..7989dd6204 100644 --- a/tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-2 + * @worker marist-6 */ -// hard code to use marist-2 which we started with ACF2 -const testServer = 'marist-2'; +// hard code to use marist-6 which we started with ACF2 +const testServer = 'marist-6'; const testSuiteName = 'Test convenience build installation with ACF2'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts b/tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts index 6dbf38158a..8f5a5a4c01 100644 --- a/tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts @@ -18,9 +18,9 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-4 + * @worker marist-8 */ -const testServer = 'marist-4'; +const testServer = 'marist-8'; const testSuiteName = 'Test convenience build installation with RACF'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts b/tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts index 6fcde1aede..22f339ae6b 100644 --- a/tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-3 + * @worker marist-7 */ -// hard code to use marist-3 which we started with Top Secret -const testServer = 'marist-3'; +// hard code to use marist-7 which we started with Top Secret +const testServer = 'marist-7'; const testSuiteName = 'Test convenience build installation with Top Secret'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts index 1b3c5a2aae..9a6e32810b 100644 --- a/tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-2 + * @worker marist-6 */ -// hard code to use marist-2 which we started with ACF2 -const testServer = 'marist-2'; +// hard code to use marist-6 which we started with ACF2 +const testServer = 'marist-6'; const testSuiteName = 'Test SMPE FMID installation with ACF2'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts b/tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts index 336d3e1181..a283327624 100644 --- a/tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts @@ -18,9 +18,9 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-4 + * @worker marist-8 */ -const testServer = 'marist-4'; +const testServer = 'marist-8'; const testSuiteName = 'Test SMPE FMID installation with RACF'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts b/tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts index 7e33ba2eca..d274358705 100644 --- a/tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-3 + * @worker marist-7 */ -// hard code to use marist-3 which we started with Top Secret -const testServer = 'marist-3'; +// hard code to use marist-7 which we started with Top Secret +const testServer = 'marist-7'; const testSuiteName = 'Test SMPE FMID installation with Top Secret'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts index cdeb1b4b32..3665c08d52 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-2 + * @worker marist-6 */ -// hard code to use marist-2 which we started with ACF2 -const testServer = 'marist-2'; +// hard code to use marist-6 which we started with ACF2 +const testServer = 'marist-6'; const testSuiteName = 'Test SMPE PTF installation with ACF2'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts index 17d51a268f..a796eed96c 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts @@ -18,9 +18,9 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-4 + * @worker marist-8 */ -const testServer = 'marist-4'; +const testServer = 'marist-8'; const testSuiteName = 'Test SMPE PTF installation with RACF'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts index f367c392fd..43d08633ca 100644 --- a/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts +++ b/tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts @@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants'; /** * Define this test should run in a specific worker * - * @worker marist-3 + * @worker marist-7 */ -// hard code to use marist-3 which we started with Top Secret -const testServer = 'marist-3'; +// hard code to use marist-7 which we started with Top Secret +const testServer = 'marist-7'; const testSuiteName = 'Test SMPE PTF installation with Top Secret'; describe(testSuiteName, () => { beforeAll(() => { diff --git a/tests/sanity/test/e2e/test-06-vt.js b/tests/sanity/test/e2e/test-06-vt.js index b9619b793a..8e816ca02b 100644 --- a/tests/sanity/test/e2e/test-06-vt.js +++ b/tests/sanity/test/e2e/test-06-vt.js @@ -8,6 +8,7 @@ * Copyright IBM Corporation 2018, 2019 */ +/* const path = require('path'); const expect = require('chai').expect; const debug = require('debug')('zowe-sanity-test:e2e:vt'); @@ -48,7 +49,7 @@ describe(`test ${APP_TO_TEST}`, function() { ); }); - +/* it('should launch app correctly', async function() { // load app await launchApp(driver, APP_TO_TEST); @@ -87,11 +88,15 @@ describe(`test ${APP_TO_TEST}`, function() { addContext(this, file2); // it shouldn't show any error message + + // Open issue: test systems use non-standard port, so we DO see an error message. validate that. const errorLabel = await getElement(viewport, 'com-rs-mvd-vt .vt-parent .toolbar .error-label', true); - expect(errorLabel).to.not.be.an('object'); + expect(errorLabel).to.be.an('object'); + // const errorLabel = await getElement(viewport, 'com-rs-mvd-vt .vt-parent .toolbar .error-label', true); + // expect(errorLabel).to.not.be.an('object'); }); - - +*/ +/* after('quit webdriver', async function() { // quit webdriver if (driver) { @@ -99,3 +104,4 @@ describe(`test ${APP_TO_TEST}`, function() { } }); }); +*/ From dca2a7ecef6f9ce243a52f5a7a386cf48002d584 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 27 Nov 2023 05:46:16 -0500 Subject: [PATCH 023/104] Update TLS settings (#3659) * Update TLS settings Signed-off-by: 1000TurquoisePogs * Update zowe-yaml-schema.json Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- schemas/zowe-yaml-schema.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 60a2f83374..bd4d2f458d 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -860,7 +860,7 @@ "properties": { "ciphers": { "type": "array", - "description": "Acceptable TLS cipher suites for network connections.", + "description": "Acceptable TLS cipher suites for network connections, in IANA format.", "items": { "type": "string" } @@ -874,15 +874,15 @@ }, "maxTls": { "type": "string", - "enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"], + "enum": ["TLSv1.2", "TLSv1.3"], "default": "TLSv1.3", "description": "Maximum TLS version allowed for network connections." }, "minTls": { "type": "string", - "enum": ["TLSv1.0", "TLSv1.1", "TLSv1.2", "TLSv1.3"], - "default": "TLSv1.3", - "description": "Minimum TLS version allowed for network connections, and less than network.maxTls." + "enum": ["TLSv1.2", "TLSv1.3"], + "default": "TLSv1.2", + "description": "Minimum TLS version allowed for network connections, and less than or equal to network.maxTls." } } }, From 6cfe733774df559757dda47c79773541e71b33c6 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 28 Nov 2023 07:34:17 -0500 Subject: [PATCH 024/104] Add getesm to build (#3663) * Add getesm to build Signed-off-by: 1000TurquoisePogs * Update README.md Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --------- Signed-off-by: 1000TurquoisePogs Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Co-authored-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- .github/workflows/build-packaging.yml | 2 +- .pax/pre-packaging.sh | 7 +++++++ CHANGELOG.md | 2 ++ bin/README.md | 1 + manifest.json.template | 4 ++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 7751f2f770..1591457df4 100644 --- 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 index 8b4fe80b14..8069837337 100755 --- 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 index f0dfd72d56..a6a68c1b21 100644 --- 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 index f508bbf0d6..c41812e683 100644 --- 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 index d925e240e8..7a6a03dfed 100644 --- 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" From 1190cbbd35e7ef5eb6e7234b830f856c1f6a970a Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 28 Nov 2023 11:56:18 -0500 Subject: [PATCH 025/104] Reduce string fields by introducing better typing (#3617) * Reduce string fields by introducing better typing Signed-off-by: 1000TurquoisePogs * Add new reusable types Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs Signed-off-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- schemas/server-common.json | 21 +++++++++++++++++ schemas/zowe-yaml-schema.json | 44 ++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/schemas/server-common.json b/schemas/server-common.json index 4eaa81feb1..cf9e0a6c80 100644 --- 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 index bd4d2f458d..fc3a2bf129 100644 --- 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": ".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": ".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": { From d6234a222ad9ce86a9be919c1fd32fbf79ba823e Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:02:27 -0500 Subject: [PATCH 026/104] build: update zzow matrix generator (#3665) Signed-off-by: MarkAckert --- .github/scripts/cicd_test/make_matrix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index 7a17f253db..7a32aa75f6 100644 --- 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 From 846d8f0b79117bace6377fd5888c1bdb716c1a13 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Tue, 28 Nov 2023 12:51:50 -0500 Subject: [PATCH 027/104] Added more clarification to example-zowe.yaml (#3660) * Added more clarification Signed-off-by: Leanid Astrakou * 512 char --> 126 Signed-off-by: Leanid Astrakou --------- Signed-off-by: Leanid Astrakou Co-authored-by: ojcelis <84936499+ojcelis@users.noreply.github.com> Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Co-authored-by: 1000TurquoisePogs --- example-zowe.yaml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index 2f121c4128..347230414d 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -9,18 +9,19 @@ ################################################################################ #=============================================================================== -# This is a YAML configuration file for Zowe instance. +# This is a YAML configuration file for a Zowe instance. # # YAML is a human-friendly data serialization language for all programming languages. # To learn more about YAML specifications, please check https://yaml.org/. # -# To learn more details about the entries, please check https://docs.zowe.org/. +# To learn more details about the content of this file, please check https://docs.zowe.org/. # # For first time users, or for the most common use cases, please pay more -# attention on the entries marked with "**COMMONLY_CUSTOMIZED**". +# attention to the entries marked with "**COMMONLY_CUSTOMIZED**". A "directory" refers +# to a directory in z/OS Unix. # # If you modify any settings listed in "zwe init --help" command, you may need to -# re-run "zwe init" command to make them take effect. +# re-run the "zwe init" command to make them take effect. #=============================================================================== #------------------------------------------------------------------------------- @@ -268,10 +269,15 @@ zowe: # **COMMONLY_CUSTOMIZED** # Zowe runtime (root) directory # - # **NOTE**: if it is not specified and you passed "--update-config" argument - # when you run "zwe init" command, this value will be updated with the Zowe + # **NOTE**: + # 1. if it is not specified and you passed "--update-config" argument + # when you ran "zwe init" command, this value will be updated with the Zowe # runtime where the "zwe" command is located. # + # 2. the runtime directory is designed to be "read only". This is different from the + # log, workspace, and extension directories. Setting those three to the same parent folder + # as the runtime directory is unsupported & may cause issues + # # This value is required by ZWESLSTC to know where is Zowe runtime. runtimeDirectory: "" @@ -325,8 +331,8 @@ zowe: # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # **COMMONLY_CUSTOMIZED** - # You can list your external domains how you want to access Zowe. - # This should be the domain list you would like to put into your web browser + # You can list your external domains on how you want to access Zowe. + # This should be the domain list you would like to put into your web browser's # address bar. externalDomains: # this should be the domain name to access Zowe APIML Gateway @@ -351,7 +357,8 @@ zowe: # ZWED_TN3270_PORT: 23 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - # You can define any Zowe message portions to be checked for and the whole message added to the system log + # You can define any Zowe message portions to be checked for and the message added to the + # system log upon its logging, truncated to 126 characters. sysMessages: # # Zowe starting - "ZWEL0021I" @@ -375,15 +382,15 @@ zowe: # # ZSS ready - "ZWES1013I" - # # Not limited to Zowe message ID's + # # Not limited to Zowe message ID's, you can specify your own string for example: # - "ERROR" # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - # Enable debug mode for zowe launch scripts + # Enable debug mode for Zowe launch scripts launchScript: - # set to "debug" or "trace" to display extra debug information + # Set to "debug" or "trace" to display extra debug information logLevel: "info" - # set to "exit" if you'd like startup to exit if any component has an error in the configure stage, otherwise zwe will warn but continue. + # Set to "exit" if you'd like startup to exit if any component has an error in the configure stage, otherwise zwe will warn but continue. onComponentConfigureFail: "warn" # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -421,7 +428,7 @@ zowe: # This mode does not validate certificate Common Name and Subject # Alternative Name (SAN). # - DISABLED: disable certificate validation. This is NOT recommended for - # security + # security. verifyCertificates: STRICT @@ -463,7 +470,7 @@ node: #------------------------------------------------------------------------------- zOSMF: # **COMMONLY_CUSTOMIZED** - # host name of your z/OSMF instance + # Host name of your z/OSMF instance host: dvipa.my-company.com # **COMMONLY_CUSTOMIZED** port: 443 From 98048f11e398db70b2f47035b682fe5a91a933cc Mon Sep 17 00:00:00 2001 From: Pablo Carle Date: Wed, 29 Nov 2023 14:19:37 +0100 Subject: [PATCH 028/104] Add zosmf scheme option for at-tls in api ml (#3661) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add zosmf scheme option for at-tls in api ml Signed-off-by: Pablo Hernán Carle * add common-java Signed-off-by: Pablo Hernán Carle * common-java lib package Signed-off-by: Pablo Hernán Carle * try without comp Signed-off-by: Pablo Hernán Carle * back to allowlist common-java-lib Signed-off-by: Pablo Hernán Carle * remove env Signed-off-by: Pablo Hernán Carle --------- Signed-off-by: Pablo Hernán Carle Co-authored-by: Pablo Hernán Carle Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- .pax/pre-packaging.sh | 2 +- manifest.json.template | 2 +- schemas/zowe-yaml-schema.json | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 8069837337..cb17b8244b 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -295,7 +295,7 @@ done echo "[$SCRIPT_NAME] process commands.install hooks" # not all core components has commands.install -for component in app-server; do +for component in app-server common-java-lib; do echo "[$SCRIPT_NAME] - ${component}" # FIXME: these environment variables are changed in v2 ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \ diff --git a/manifest.json.template b/manifest.json.template index 7a6a03dfed..a3cc856311 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -97,7 +97,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.common-java-lib-package": { - "version": "~2.0.0-SNAPSHOT", + "version": "^2.0.0-SNAPSHOT", "artifact": "common-java-lib-*.zip", "exclusions": ["*PR*.zip"] }, diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index fc3a2bf129..ceca72bcb0 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -580,6 +580,10 @@ "$ref": "#/$defs/port", "description": "Port number of your z/OSMF instance." }, + "scheme": { + "$ref" : "#/$defs/scheme", + "description": "Scheme used to connect to z/OSMF instance. Optional for outbout AT-TLS, defaults to https" + }, "applId": { "type": "string", "description": "Appl ID of your z/OSMF instance." @@ -629,6 +633,14 @@ "minimum": 0, "maximum": 65535 }, + "scheme": { + "type": "string", + "enum": [ + "http", + "https" + ], + "default": "https" + }, "certificate": { "oneOf": [ { "$ref": "#/$defs/pkcs12-certificate" }, From c436e5e7f3e896e16423d732cb14354a637ac289 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Fri, 1 Dec 2023 10:43:49 -0500 Subject: [PATCH 029/104] Revert "Reduce string fields by introducing better typing (#3617)" (#3674) This reverts commit 1190cbbd35e7ef5eb6e7234b830f856c1f6a970a. Signed-off-by: MarkAckert --- schemas/server-common.json | 21 ----------------- schemas/zowe-yaml-schema.json | 44 +++++++++++++++++------------------ 2 files changed, 21 insertions(+), 44 deletions(-) diff --git a/schemas/server-common.json b/schemas/server-common.json index cf9e0a6c80..4eaa81feb1 100644 --- a/schemas/server-common.json +++ b/schemas/server-common.json @@ -46,27 +46,6 @@ "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 index ceca72bcb0..23bebfff07 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -21,15 +21,15 @@ "description": "MVS data set related configurations", "properties": { "prefix": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "Where Zowe MVS data sets will be installed" }, "proclib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "PROCLIB where Zowe STCs will be copied over" }, "parmlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "Zowe PARMLIB" }, "parmlibMembers": { @@ -44,21 +44,21 @@ } }, "jcllib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "JCL library where Zowe will store temporary JCLs during initialization" }, "loadlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "States the dataset where Zowe executable utilities are located", "default": ".SZWELOAD" }, "authLoadlib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "The dataset that contains any Zowe core code that needs to run APF-authorized, such as ZIS", "default": ".SZWEAUTH" }, "authPluginLib": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "description": "APF authorized LOADLIB for Zowe ZIS Plugins" } } @@ -103,17 +103,17 @@ "description": "security group name", "properties": { "admin": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe admin user group", "default": "ZWEADMIN" }, "stc": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe STC group", "default": "ZWEADMIN" }, "sysProg": { - "$ref": "/schemas/v2/server-common#zoweGroupNameAnyCase", + "type": "string", "description": "Zowe SysProg group", "default": "ZWEADMIN" } @@ -125,12 +125,12 @@ "description": "security user name", "properties": { "zowe": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "Zowe runtime user name of main service", "default": "ZWESVUSR" }, "zis": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "description": "Zowe runtime user name of ZIS", "default": "ZWESIUSR" } @@ -142,17 +142,17 @@ "description": "STC names", "properties": { "zowe": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "STC name of main service", "default": "ZWESLSTC" }, "zis": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "STC name of ZIS", "default": "ZWESISTC" }, "aux": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "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": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "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": { - "$ref": "/schemas/v2/server-common#zoweDataset", + "type": "string", "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": { - "$ref": "/schemas/v2/server-common#zoweUserAnyCase", + "type": "string", "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,8 +339,7 @@ }, "country": { "type": "string", - "description": "2 letters country code of certificate generated by Zowe.", - "pattern": "[A-Z][A-Z]" + "description": "2 letters country code of certificate generated by Zowe." } } }, @@ -378,8 +377,7 @@ }, "volume": { "type": "string", - "description": "Volume name if you are using VSAM in NONRLS mode", - "maxLength": 6 + "description": "Volume name if you are using VSAM in NONRLS mode" }, "storageClass": { "type": "string", @@ -411,7 +409,7 @@ "description": "Customize your Zowe z/OS JES job.", "properties": { "name": { - "$ref": "/schemas/v2/server-common#zoweJobname", + "type": "string", "description": "Job name of Zowe primary ZWESLSTC started task." }, "prefix": { From 7810be6aa36c3719a46f8cef23b9b228395d196d Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:12:15 +0100 Subject: [PATCH 030/104] Typo in comment (#3679) Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/utils/date-add.rex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/utils/date-add.rex b/bin/utils/date-add.rex index bf6b0d120d..3763be6af7 100755 --- a/bin/utils/date-add.rex +++ b/bin/utils/date-add.rex @@ -56,7 +56,7 @@ target = today + days ISOTarget = Date("Standard", target, "Base") /* ISOTarget YYYYMMDD */ -/* 12344578 => YYYY = 1234, MM = 56, DD = 78 */ +/* 12345678 => YYYY = 1234, MM = 56, DD = 78 */ if pos("YYYY", dformat) = 0 then dformat = overlay("34", dformat, pos("YY", dformat)) From ceb26636c20abfebdd7e3129a8962bb0ba3e3c16 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Thu, 14 Dec 2023 16:23:26 +0000 Subject: [PATCH 031/104] Promote PTF after release v2.13.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index eda8068aeb..a2d7a4efd6 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29343 +IO29344 +IO29345 IO29289 IO29290 IO29291 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index 1a8d92b9ca..e8b8ecc2fe 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29343 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.13.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29344 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.13.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29345 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.13.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29289 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index 7df8737e0f..ac8bc27006 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90045) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23348) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90033) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23297) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 4782225075..77aa3f6180 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90045 +UO90046 UO90033 UO90034 UO90031 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index daa206b57a..206a6a7933 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -19,6 +19,6 @@ #UO90022 UO90023 - IO29185 IO29186 IO29187 - Fri Jul 28 01:08:59 UTC 2023 #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 -UO90045 UO90046 - IO29343 IO29344 IO29345 +#UO90045 UO90046 - IO29343 IO29344 IO29345 - Thu Dec 14 16:23:26 UTC 2023 UO90047 UO90048 - IO29346 IO29347 IO29348 UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file From c389fafc08bb9f957ada2053f494e59f161f9575 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 14 Dec 2023 15:41:06 -0500 Subject: [PATCH 032/104] update manifest version Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index a3cc856311..871e1f817f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.13.0", + "version": "2.14.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From b3b76b76490a3a50d5979db796777436e7076596 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 19 Dec 2023 13:05:39 -0500 Subject: [PATCH 033/104] Update version to 2.14.0 (#3691) Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index a3cc856311..871e1f817f 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.13.0", + "version": "2.14.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From 8c220246a726826e7ed7ee76a829998218605e54 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 11:10:36 -0500 Subject: [PATCH 034/104] Add return code to zis plugin install Signed-off-by: James Struga --- bin/libs/component.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/libs/component.sh b/bin/libs/component.sh index 6494b53930..7f405e972f 100644 --- a/bin/libs/component.sh +++ b/bin/libs/component.sh @@ -551,6 +551,10 @@ zis_plugin_install() { if [ $changed -eq 1 ]; then copy_to_data_set "$parmlib_member_as_unix_file" "$zwes_zis_parmlib($zwes_zis_parmlib_member)" "" "true" + if [ $? != 0 ]; then + print_error "Error ZWEL0200E: Failed to copy USS file ${parmlib_member_as_unix_file} to MVS data set ${zwes_zis_parmlib}." + return 200 + fi fi } From 832bd260676afbc9d56213561b361ad76c7abafa Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 11:15:53 -0500 Subject: [PATCH 035/104] add typescript too Signed-off-by: James Struga --- bin/libs/component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/libs/component.ts b/bin/libs/component.ts index 7318c3b4ff..1680ca3f61 100644 --- a/bin/libs/component.ts +++ b/bin/libs/component.ts @@ -672,7 +672,11 @@ export function zisPluginInstall(pluginPath: string, zisPluginlib: string, zisPa if (changed) { common.printDebug(`Parmlib modified, writing as \n${parmlibContents}`); xplatform.storeFileUTF8(parmlibMemberAsUnixFile, xplatform.AUTO_DETECT, parmlibContents); - zosdataset.copyToDataset(parmlibMemberAsUnixFile, `${zisParmlib}(${zisParmlibMember})`, "", true); + const rc = zosdataset.copyToDataset(parmlibMemberAsUnixFile, `${zisParmlib}(${zisParmlibMember})`, "", true); + if (rc != 0) { + common.printError(`Error ZWEL0200E: Failed to copy USS file ${parmlibMemberAsUnixFile} to MVS data set ${zisParmlib}.`); + return 200; + } } return 0; } From 62415b51de71ac63b7307e729c20e8447c692846 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 8 Jan 2024 14:12:46 -0500 Subject: [PATCH 036/104] Schema missing in staging Signed-off-by: James Struga --- schemas/zowe-yaml-schema.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 23bebfff07..32fe423772 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -861,11 +861,25 @@ "properties": { "network": { "$ref": "#/$defs/networkSettings" + }, + "job": { + "$ref": "#/$defs/componentJobSettings" } } } } }, + "componentJobSettings": { + "$anchor": "componentJobSettings", + "type": "object", + "description": "Component level overrides for job execution behavior", + "properties": { + "suffix": { + "type": "string", + "description": "Can be used by components to declare a jobname suffix to append to their job. This is not currently used by Zowe itself, it is up to components to use this value if desired. Zowe may use this value in the future." + } + } + }, "tlsSettings": { "$anchor": "tlsSettings", "type": "object", From 78f3f656d3f5db0a4cf3b3fe2a99283d7cfc816e Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 9 Jan 2024 12:47:32 -0600 Subject: [PATCH 037/104] Fix components not being enabled or disabled at ha instance level (#3692) * Fix components not being enabled or disabled at ha instance level Signed-off-by: 1000TurquoisePogs * Fix for env vars too Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs Co-authored-by: Timothy Gerstel --- CHANGELOG.md | 8 ++++++++ bin/libs/component.ts | 23 +++++++++-------------- bin/libs/configmgr.ts | 25 +++++++++++++++++++++---- 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6a68c1b21..be6da56e68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.14.0` + +### New features and enhancements +- Enhancement: configmgr.ts now can return a Zowe config with the given HA instance's configuration substituted for convenience. This now used in zwe to fix an issue where zwe would not respect the preference of if a component was enabled or disabled in a particular instance when zowe.useConfigmgr was set to true. + +#### Minor enhancements/defect fixes +- Bugfix: environment variables were not using the values specified for each HA instance when zowe.useConfigmgr was set to true. + ## `2.13.0` ### New features and enhancements diff --git a/bin/libs/component.ts b/bin/libs/component.ts index 1680ca3f61..ddf6eb3037 100644 --- a/bin/libs/component.ts +++ b/bin/libs/component.ts @@ -24,6 +24,7 @@ import * as shell from './shell'; import * as configmgr from './configmgr'; import * as varlib from './var'; import * as fakejq from './fakejq'; +import * as configUtils from './config'; const CONFIG_MGR=configmgr.CONFIG_MGR; const ZOWE_CONFIG=configmgr.ZOWE_CONFIG; @@ -44,11 +45,13 @@ const PLUGIN_DEF_SCHEMA_ID = "https://zowe.org/schemas/v2/appfw-plugin-definitio const PLUGIN_DEF_SCHEMAS = `${runtimeDirectory}/components/app-server/schemas/plugindefinition-schema.json`; -export function getEnabledComponents(): string[] { - let components = Object.keys(ZOWE_CONFIG.components); - let enabled:string[] = []; - components.forEach((key:string) => { - if (ZOWE_CONFIG.components[key].enabled == true) { +export function getEnabledComponents() { + let haInstance = configUtils.sanitizeHaInstanceId(); + let haConfig = configmgr.getZoweConfig(haInstance); + let components = Object.keys(haConfig.components); + let enabled: string[] = []; + components.forEach((key) => { + if (haConfig.components[key].enabled == true) { enabled.push(key); } }); @@ -353,15 +356,7 @@ export function findAllEnabledComponents(): string { } export function findAllEnabledComponents2(): string[] { - let installedComponentsEnv=std.getenv('ZWE_INSTALLED_COMPONENTS'); - let installedComponents = installedComponentsEnv ? installedComponentsEnv.split(',') : null; - if (!installedComponents) { - installedComponents = findAllInstalledComponents2(); - } - return installedComponents.filter(function(component: string) { - let componentNameAsEnv=stringlib.sanitizeAlphanum(component); - return std.getenv(`ZWE_components_${componentNameAsEnv}_enabled`) == 'true'; - }); + return getEnabledComponents(); } export function findAllLaunchComponents(): string { diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index 03863f3d7a..ba16685f1e 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -48,6 +48,7 @@ const ZOWE_SCHEMA_ID = 'https://zowe.org/schemas/v2/server-base'; const ZOWE_SCHEMA_SET=`${ZOWE_SCHEMA}:${COMMON_SCHEMA}`; export let ZOWE_CONFIG=getZoweConfig(); +let HA_CONFIGS = {}; export function getZoweBaseSchemas(): string { return ZOWE_SCHEMA_SET; @@ -373,6 +374,7 @@ export function updateZoweConfig(updateObj: any, writeUpdate: boolean, arrayMerg let rc = updateConfig(getZoweConfigName(), updateObj, arrayMergeStrategy); if (rc == 0) { ZOWE_CONFIG=getZoweConfig(); + HA_CONFIGS = {}; //reset if (writeUpdate) { writeZoweConfigUpdate(updateObj, arrayMergeStrategy); writeMergedConfig(ZOWE_CONFIG); @@ -490,14 +492,29 @@ function getConfig(configName: string, configPath: string, schemas: string): any } } -export function getZoweConfig(): any { - if (configLoaded) { +function makeHaConfig(haInstance: string): any { + let config = getConfig(ZOWE_CONFIG_NAME, ZOWE_CONFIG_PATH, ZOWE_SCHEMA_SET); + if (config.haInstances && config.haInstances[haInstance]) { + let merger = new objUtils.Merger(); + merger.mergeArrays = false; + let mergedConfig = merger.merge(config.haInstances[haInstance], config); + INSTANCE_KEYS_NOT_IN_BASE.forEach((key) => delete mergedConfig[key]); + HA_CONFIGS[haInstance] = mergedConfig; + return mergedConfig; + } + return config; +} + +export function getZoweConfig(haInstance?: string): any { + if (configLoaded && !haInstance) { return getConfig(ZOWE_CONFIG_NAME, ZOWE_CONFIG_PATH, ZOWE_SCHEMA_SET); + } else if (configLoaded) { + return HA_CONFIGS[haInstance] || makeHaConfig(haInstance); } else { let config = getConfig(ZOWE_CONFIG_NAME, ZOWE_CONFIG_PATH, ZOWE_SCHEMA_SET); configLoaded = true; const writeResult = writeMergedConfig(config); - return config; + return haInstance ? makeHaConfig(haInstance) : config; } } @@ -528,7 +545,7 @@ export function getZoweConfigEnv(haInstance: string): any { haFlattener.setSeparator('_'); haFlattener.setPrefix('ZWE_'); haFlattener.setKeepArrays(true); - let overrides = haFlattener.flatten(config.haInstances[haInstance]); + overrides = haFlattener.flatten(config.haInstances[haInstance]); } else { envs['ZWE_haInstance_hostname'] = config.zowe.externalDomains[0]; } From a3bf0d237bf9511ed292e5d23363d5b447ebf036 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 12:24:04 -0500 Subject: [PATCH 038/104] build: sigstore sign build artifacts Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 1591457df4..a3c3fec7ff 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -265,6 +265,7 @@ jobs: timeout-minutes: 10 uses: zowe-actions/shared-actions/publish@main with: + sigstore-sign-artifacts: true artifacts: | .pax/zowe.pax .pax/zowe-smpe.zip From 9354d7c4b6afa9d5ebbe045a235aa6a97311dc74 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 12:47:46 -0500 Subject: [PATCH 039/104] build: add id-token permissions for sigstore Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index a3c3fec7ff..8df9ac8d69 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -1,4 +1,8 @@ name: Zowe Build and Packaging + +permissions: + id-token: write + on: push: branches: From 95eefda739ed51e9e3e9224eb85cac3cb803cc04 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 12:51:24 -0500 Subject: [PATCH 040/104] build: discrete permissions cont.. Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 8df9ac8d69..131fe2cae2 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -2,6 +2,7 @@ name: Zowe Build and Packaging permissions: id-token: write + issues: write on: push: @@ -134,7 +135,7 @@ jobs: echo BUILD_WHAT=$BUILD_WHAT >> $GITHUB_OUTPUT - - name: '[Prep 7] Comment on PR to indicate build is started' + - name: '[Prep 7] Comment on PR to indicate build is started' uses: actions/github-script@v5 id: create-comment if: (github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request') && startsWith(env.CURRENT_BRANCH, 'PR-') From 1cde35268b6be98a4aa1bc7a67393ee73bef5954 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 12:57:06 -0500 Subject: [PATCH 041/104] build: discrete permissions cont... PR Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 131fe2cae2..254b17187b 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -3,6 +3,7 @@ name: Zowe Build and Packaging permissions: id-token: write issues: write + pull-requests: write on: push: From d3a35314f5a498a126a9ce0bfbfab1afd7abb852 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 22 Jan 2024 14:29:39 -0500 Subject: [PATCH 042/104] build: update contents permissions (ack locks) Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 254b17187b..dc6dda480d 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -4,6 +4,7 @@ permissions: id-token: write issues: write pull-requests: write + contents: write on: push: From 443e4a06e1f665ce2d8f88cdac7323582cebfd0a Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 25 Jan 2024 09:26:56 -0500 Subject: [PATCH 043/104] upgrade cicd-test to node18 Signed-off-by: MarkAckert --- .github/workflows/cicd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 56a0e2ab89..ef54f73d4f 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -133,7 +133,7 @@ jobs: - name: '[Prep 2] Setup Node' uses: actions/setup-node@v3 with: - node-version: '14' + node-version: '18' - name: '[Prep 3] Cache node modules' uses: actions/cache@v2 From b398038bddf5fa4f56252b95c833877d41b7caea Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 26 Jan 2024 17:21:09 +0000 Subject: [PATCH 044/104] Promote PTF after release v2.14.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 5 ++- smpe/bld/service/promoted-close.txt | 47 ++++++++++++++++++++++++++++- smpe/bld/service/promoted-hold.txt | 27 ++++++++++++++++- smpe/bld/service/promoted-ptf.txt | 4 ++- smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 80 insertions(+), 5 deletions(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index a2d7a4efd6..07ec28cc3e 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29346 +IO29347 +IO29348 IO29343 IO29344 IO29345 @@ -42,4 +45,4 @@ IO28862 IO28866 IO28859 IO28860 -IO28865 \ No newline at end of file +IO28865 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index e8b8ecc2fe..ee6b38e692 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29346 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.14.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29347 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.14.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29348 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.14.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29343 - PROBLEM SUMMARY: **************************************************************** @@ -671,4 +716,4 @@ The Zowe community version was updated to 2.1.0. This PTF provides the community changes in SMP/E format. Follow this link for more details on the community changes: - https://docs.zowe.org/stable/ \ No newline at end of file + https://docs.zowe.org/stable/ diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index ac8bc27006..3337b60c7a 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90047) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24026) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90045) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23348) COMMENT( **************************************************************** @@ -412,4 +437,4 @@ **************************************************************** Start the Zowe servers after installing this update. - ). \ No newline at end of file + ). diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 77aa3f6180..08242dbddd 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90047 +UO90048 UO90045 UO90046 UO90033 @@ -27,4 +29,4 @@ UO02052 UO02049 UO02050 UO02047 -UO02048 \ No newline at end of file +UO02048 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 206a6a7933..47e79c15bd 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -20,5 +20,5 @@ #UO90031 UO90032 - IO29286 IO29287 IO29288 - Tue Sep 12 18:27:05 UTC 2023 #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 #UO90045 UO90046 - IO29343 IO29344 IO29345 - Thu Dec 14 16:23:26 UTC 2023 -UO90047 UO90048 - IO29346 IO29347 IO29348 +#UO90047 UO90048 - IO29346 IO29347 IO29348 - Fri Jan 26 17:21:09 UTC 2024 UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file From 453dd6937b63f23851a1412aa296657a03a14314 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 26 Jan 2024 16:17:08 -0500 Subject: [PATCH 045/104] update manifest to 2.15.0 Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 871e1f817f..5f0645c5fa 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.14.0", + "version": "2.15.0", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From 34c2c30a86d0398224dde838b46ea5d1335eb66c Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:57:53 +0100 Subject: [PATCH 046/104] bin/libs/string.sh: trim update Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/libs/string.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/string.sh b/bin/libs/string.sh index 1c1be161ba..c5b95d38bb 100755 --- a/bin/libs/string.sh +++ b/bin/libs/string.sh @@ -22,7 +22,7 @@ trim() { input=${1} fi - echo "${input}" | xargs + echo "${input}" | sed -e 's/^[[:space:]]*//;s/[[:space:]]*$//' } ############################### From 8ad163e64cc53bf8c3ad6bb4322e30f8996cf0c1 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Tue, 6 Feb 2024 13:27:19 +0100 Subject: [PATCH 047/104] Update zwe for handeling missing parms Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/zwe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/zwe b/bin/zwe index baaf43bb9d..80e6247115 100755 --- a/bin/zwe +++ b/bin/zwe @@ -69,7 +69,9 @@ while [ $# -gt 0 ]; do print_error_and_exit "Error ZWEL0103E: Invalid type of parameter ${arg}" "" 103 fi fi - shift + if [ $# -gt 0 ]; then + shift + fi done # debug results From d8b26529700b77b8327194172805a0eb1e995720 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Tue, 6 Feb 2024 09:23:49 -0500 Subject: [PATCH 048/104] Treat special chars Signed-off-by: Martin Zeithaml --- bin/libs/configmgr.ts | 3 ++- bin/libs/string.ts | 13 +++++++++++++ bin/libs/zos-dataset.ts | 16 ++++++++-------- bin/libs/zos.ts | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index ba16685f1e..e9a4112d38 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -14,6 +14,7 @@ import * as os from 'cm_os'; import * as xplatform from 'xplatform'; import { ConfigManager } from 'Configuration'; import * as fs from './fs'; +import * as stringlib from './string'; import * as objUtils from '../utils/ObjUtils'; @@ -415,7 +416,7 @@ function getMemberNameFromConfigPath(configPath: string): string|undefined { function stripMemberName(configPath: string, memberName: string): string { //Turn PARMLIB(my.zowe(yaml)):PARMLIB(my.other.zowe(yaml)) //Into PARMLIB(my.zowe):FILE(/some/path.yaml):PARMLIB(my.other.zowe) - const replacer = new RegExp('\\('+memberName+'\\)\\)', 'gi'); + const replacer = new RegExp('\\('+stringlib.escapeRegExp(memberName)+'\\)\\)', 'gi'); return configPath.replace(replacer, ")"); } diff --git a/bin/libs/string.ts b/bin/libs/string.ts index 7fa5c6020f..20acafbf6d 100644 --- a/bin/libs/string.ts +++ b/bin/libs/string.ts @@ -344,3 +344,16 @@ export function itemInList(stringList: string, stringToFind?: string, separator: } return stringList.split(separator).includes(stringToFind); } + +export function escapeDollar(str: string): string | undefined { + if (str === null || str === undefined) + return undefined; + return str.replace(/[$]/g, '\\$&'); +} + +export function escapeRegExp(str: string): string | undefined { + if (str === null || str === undefined) + return undefined; + return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); +} + diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index c1960ec929..295afc8d05 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -18,7 +18,7 @@ import * as shell from './shell'; import * as zoslib from './zos'; export function isDatasetExists(datasetName: string): boolean { - const result = shell.execSync('sh', '-c', `cat "//'${datasetName}'" 1>/dev/null 2>&1`); + const result = shell.execSync('sh', '-c', `cat "//'${stringlib.escapeDollar(datasetName)}'" 1>/dev/null 2>&1`); return result.rc === 0; } @@ -27,7 +27,7 @@ export function isDatasetExists(datasetName: string): boolean { // 1: data set is not in catalog // 2: data set member doesn't exist export function tsoIsDatasetExists(datasetName: string): number { - const result = zoslib.tsoCommand(`listds '${datasetName}' label`); + const result = zoslib.tsoCommand(`listds '${stringlib.escapeDollar(datasetName)}' label`); if (result.rc != 0) { if (result.out.includes('NOT IN CATALOG')) { return 1; @@ -44,7 +44,7 @@ export function tsoIsDatasetExists(datasetName: string): number { } export function createDataSet(dsName: string, dsOptions: string): number { - const result=zoslib.tsoCommand(`ALLOCATE NEW DA('${dsName}') ${dsOptions}`); + const result=zoslib.tsoCommand(`ALLOCATE NEW DA('${stringlib.escapeDollar(dsName)}') ${dsOptions}`); return result.rc; } @@ -55,7 +55,7 @@ export function copyToDataset(filePath: string, dsName: string, cpOptions: strin } } - const cpCommand=`cp ${cpOptions} -v "${filePath}" "//'${dsName}'"`; + const cpCommand=`cp ${cpOptions} -v "${filePath}" "//'${stringlib.escapeDollar(dsName)}'"`; common.printDebug('- '+cpCommand); const result=shell.execOutSync('sh', '-c', `${cpCommand} 2>&1`); if (result.rc == 0) { @@ -79,7 +79,7 @@ export function datasetCopyToDataset(prefix: string, datasetFrom: string, datase } } - const cmd=`exec '${prefix}.${std.getenv('ZWE_PRIVATE_DS_SZWEEXEC')}(ZWEMCOPY)' '${datasetFrom} ${datasetTo}'`; + const cmd=`exec '${prefix}.${std.getenv('ZWE_PRIVATE_DS_SZWEEXEC')}(ZWEMCOPY)' '${stringlib.escapeDollar(datasetFrom)} ${stringlib.escapeDollar(datasetTo)}'`; const result = zoslib.tsoCommand(cmd); return result.rc; } @@ -128,7 +128,7 @@ export function listDatasetUser(datasetName: string): number { // 3: data set is in use // @output tso listds label output export function deleteDataset(dataset: string): number { - const cmd=`delete '${dataset}'`; + const cmd=`delete '${stringlib.escapeDollar(dataset)}'`; const result=zoslib.tsoCommand(cmd); if (result.rc != 0) { if (result.out.includes('NOT IN CATALOG')) { @@ -170,7 +170,7 @@ export function isDatasetSmsManaged(dataset: string): { rc: number, smsManaged?: // SMS flag is in `FORMAT 1 DSCB` section second line, after 780037 common.printTrace(`- Check if ${dataset} is SMS managed`); - const labelResult = zoslib.tsoCommand(`listds '${dataset}' label`); + const labelResult = zoslib.tsoCommand(`listds '${stringlib.escapeDollar(dataset)}' label`); const datasetLabel=labelResult.out; if (labelResult.rc == 0) { let formatIndex = datasetLabel.indexOf('--FORMAT 1 DSCB--'); @@ -212,7 +212,7 @@ export function isDatasetSmsManaged(dataset: string): { rc: number, smsManaged?: export function getDatasetVolume(dataset: string): { rc: number, volume?: string } { common.printTrace(`- Find volume of data set ${dataset}`); - const result = zoslib.tsoCommand(`listds '${dataset}'`); + const result = zoslib.tsoCommand(`listds '${stringlib.escapeDollar(dataset)}'`); if (result.rc == 0) { let volumesIndex = result.out.indexOf('--VOLUMES--'); let volume: string; diff --git a/bin/libs/zos.ts b/bin/libs/zos.ts index b49e81451b..8cc5dea000 100644 --- a/bin/libs/zos.ts +++ b/bin/libs/zos.ts @@ -16,7 +16,7 @@ import * as shell from './shell'; import * as stringlib from './string'; export function tsoCommand(...args:string[]): { rc: number, out: string } { - let message="tsocmd "+args.join(' '); + let message = "tsocmd " + '"' + args.join(' ') + '"'; common.printDebug('- '+message); //we echo at the end to avoid a configmgr quirk where trying to read stdout when empty can hang waiting for bytes const result = shell.execOutSync('sh', '-c', `${message} 2>&1 && echo '.'`); From 4bec72ec877ffd5065b278108e5e10c798139dd5 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Tue, 6 Feb 2024 10:08:58 -0500 Subject: [PATCH 049/104] Too many slashes Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/libs/zos-dataset.sh b/bin/libs/zos-dataset.sh index 16154681f5..18ebc5fade 100644 --- a/bin/libs/zos-dataset.sh +++ b/bin/libs/zos-dataset.sh @@ -75,7 +75,7 @@ copy_to_data_set() { allow_overwrite="${4}" if [ "${allow_overwrite}" != "true" ]; then - if [ "$(is_data_set_exists "//'${ds_name}'")" = "true" ]; then + if [ "$(is_data_set_exists "${ds_name}")" = "true" ]; then print_error_and_exit "Error ZWEL0133E: Data set ${ds_name} already exists" "" 133 fi fi @@ -105,7 +105,7 @@ data_set_copy_to_data_set() { allow_overwrite="${4}" if [ "${allow_overwrite}" != "true" ]; then - if [ "$(is_data_set_exists "//'${ds_to}'")" = "true" ]; then + if [ "$(is_data_set_exists "${ds_to}")" = "true" ]; then print_error_and_exit "Error ZWEL0133E: Data set ${ds_to} already exists" "" 133 fi fi From 686cd7967258f6d28692e2d7e214d9eb18baff9c Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Tue, 6 Feb 2024 10:30:58 -0500 Subject: [PATCH 050/104] Minor fixes Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.ts | 6 +++--- bin/libs/zwecli.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index 295afc8d05..912c35eb07 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -235,7 +235,7 @@ export function getDatasetVolume(dataset: string): { rc: number, volume?: string export function apfAuthorizeDataset(dataset: string): number { const result = isDatasetSmsManaged(dataset); if (result.rc) { - common.printError("Error ZWEL0134E: Failed to find SMS status of data set ${dataset}."); + common.printError(`Error ZWEL0134E: Failed to find SMS status of data set ${dataset}.`); return 134; } @@ -256,7 +256,7 @@ export function apfAuthorizeDataset(dataset: string): number { } } - const apfCmd="SETPROG APF,ADD,DSNAME=${dataset},${apfVolumeParam}" + const apfCmd=`SETPROG APF,ADD,DSNAME=${dataset},${apfVolumeParam}`; if (std.getenv('ZWE_CLI_PARAMETER_SECURITY_DRY_RUN') == "true") { common.printMessage("- Dry-run mode, security setup is NOT performed on the system."); common.printMessage(" Please apply this operator command manually:"); @@ -277,7 +277,7 @@ export function apfAuthorizeDataset(dataset: string): number { } export function createDatasetTmpMember(dataset: string, prefix: string='ZW'): string | null { - common.printTrace(` > create_data_set_tmp_member in ${dataset}`); + common.printTrace(` > createDatasetTmpMember in ${dataset}`); for (var i = 0; i < 100; i++) { let rnd=Math.floor(Math.random()*10000); diff --git a/bin/libs/zwecli.sh b/bin/libs/zwecli.sh index eb0e249a3c..0131c5ff5b 100755 --- a/bin/libs/zwecli.sh +++ b/bin/libs/zwecli.sh @@ -376,6 +376,9 @@ zwecli_inline_execute_command() { export ZWE_PRIVATE_CLI_IS_TOP_LEVEL_COMMAND=false + print_trace "- zwecli_inline_execute_command" + print_trace " * ${*}" + # process new command . "${ZWE_zowe_runtimeDirectory}/bin/zwe" From af0e6a000f73ecc123ac50023a849103bd21481e Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Wed, 7 Feb 2024 02:56:26 -0500 Subject: [PATCH 051/104] Switch ChangeTag to sh Signed-off-by: Martin Zeithaml --- bin/libs/zos-fs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zos-fs.ts b/bin/libs/zos-fs.ts index 99305bc4b9..d0c868cb8d 100644 --- a/bin/libs/zos-fs.ts +++ b/bin/libs/zos-fs.ts @@ -109,7 +109,7 @@ export function ensureFileEncoding(file: string, expectedSample: string, expecte } } common.printTrace(`- Remove encoding tag of ${file}.`); - zos.changeTag(file, 0); + shell.execSync('sh', '-c', `chtag -r "${file}"`); } else { common.printTrace(`- Failed to detect encoding of ${file}.`); } From dc66beb2d5578419de2f981dea90ad8796162151 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Thu, 8 Feb 2024 03:48:15 -0500 Subject: [PATCH 052/104] Regex update Signed-off-by: Martin Zeithaml --- bin/libs/configmgr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts index e9a4112d38..26c16fa89a 100644 --- a/bin/libs/configmgr.ts +++ b/bin/libs/configmgr.ts @@ -416,7 +416,7 @@ function getMemberNameFromConfigPath(configPath: string): string|undefined { function stripMemberName(configPath: string, memberName: string): string { //Turn PARMLIB(my.zowe(yaml)):PARMLIB(my.other.zowe(yaml)) //Into PARMLIB(my.zowe):FILE(/some/path.yaml):PARMLIB(my.other.zowe) - const replacer = new RegExp('\\('+stringlib.escapeRegExp(memberName)+'\\)\\)', 'gi'); + const replacer = new RegExp('\\('+stringlib.escapeDollar(memberName)+'\\)\\)', 'gi'); return configPath.replace(replacer, ")"); } From d1abd3e79a8204abd538d79aead5fc56997e21a5 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Thu, 8 Feb 2024 10:20:23 -0500 Subject: [PATCH 053/104] Revert changes Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/libs/zos-dataset.sh b/bin/libs/zos-dataset.sh index 18ebc5fade..16154681f5 100644 --- a/bin/libs/zos-dataset.sh +++ b/bin/libs/zos-dataset.sh @@ -75,7 +75,7 @@ copy_to_data_set() { allow_overwrite="${4}" if [ "${allow_overwrite}" != "true" ]; then - if [ "$(is_data_set_exists "${ds_name}")" = "true" ]; then + if [ "$(is_data_set_exists "//'${ds_name}'")" = "true" ]; then print_error_and_exit "Error ZWEL0133E: Data set ${ds_name} already exists" "" 133 fi fi @@ -105,7 +105,7 @@ data_set_copy_to_data_set() { allow_overwrite="${4}" if [ "${allow_overwrite}" != "true" ]; then - if [ "$(is_data_set_exists "${ds_to}")" = "true" ]; then + if [ "$(is_data_set_exists "//'${ds_to}'")" = "true" ]; then print_error_and_exit "Error ZWEL0133E: Data set ${ds_to} already exists" "" 133 fi fi From 0d461b6f8f35048e47e67ffef3fbe5f707727b41 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 9 Feb 2024 08:53:18 -0500 Subject: [PATCH 054/104] Get volume Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index 912c35eb07..f18fcde5ac 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -218,8 +218,7 @@ export function getDatasetVolume(dataset: string): { rc: number, volume?: string let volume: string; if (volumesIndex != -1) { let startIndex = volumesIndex + '--VOLUMES--'.length; - let endIndex = result.out.indexOf('--',startIndex); - volume = result.out.substring(startIndex, endIndex).trim(); + volume = result.out.substring(startIndex).trim(); } if (!volume) { common.printError(" * Failed to find volume information of the data set."); From f77aba55055821efd872d10b3d475ebc7a0358af Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 9 Feb 2024 10:41:43 -0500 Subject: [PATCH 055/104] Support '$' and '-' in ds name Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index f18fcde5ac..4e4528b5c2 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -91,7 +91,7 @@ export function datasetCopyToDataset(prefix: string, datasetFrom: string, datase // 1: there are some users // @output output of operator command "d grs" export function listDatasetUser(datasetName: string): number { - const cmd=`D GRS,RES=(*,${datasetName})`; + const cmd = `D GRS,RES=(*,'${stringlib.escapeDollar(datasetName)}')`; const result=zoslib.operatorCommand(cmd); return result.out.includes('NO REQUESTORS FOR RESOURCE') ? 0 : 1; // example outputs: From 406e1bc773a7c96b451f83a191e6eea40123f403 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Mon, 12 Feb 2024 05:28:41 -0500 Subject: [PATCH 056/104] Escape prefix Signed-off-by: Martin Zeithaml --- bin/libs/zos-dataset.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zos-dataset.ts b/bin/libs/zos-dataset.ts index 4e4528b5c2..74d10aed9e 100644 --- a/bin/libs/zos-dataset.ts +++ b/bin/libs/zos-dataset.ts @@ -79,7 +79,7 @@ export function datasetCopyToDataset(prefix: string, datasetFrom: string, datase } } - const cmd=`exec '${prefix}.${std.getenv('ZWE_PRIVATE_DS_SZWEEXEC')}(ZWEMCOPY)' '${stringlib.escapeDollar(datasetFrom)} ${stringlib.escapeDollar(datasetTo)}'`; + const cmd = `exec '${stringlib.escapeDollar(prefix)}.${std.getenv('ZWE_PRIVATE_DS_SZWEEXEC')}(ZWEMCOPY)' '${stringlib.escapeDollar(datasetFrom)} ${stringlib.escapeDollar(datasetTo)}'`; const result = zoslib.tsoCommand(cmd); return result.rc; } From d52a3334a90f78e5ea30d74a960e8650fe2c5095 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 14 Feb 2024 17:35:12 +0100 Subject: [PATCH 057/104] Use the zos function for getFileEncoding (#3642) * Use the zos function Signed-off-by: Martin Zeithaml * CCSID only for platform=zos Signed-off-by: Martin Zeithaml * Update type declaration file Signed-off-by: Martin Zeithaml --------- Signed-off-by: Martin Zeithaml Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- bin/libs/zos-fs.ts | 12 +++++++----- build/zwe/types/@qjstypes/zos.d.ts | 5 +++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/libs/zos-fs.ts b/bin/libs/zos-fs.ts index 99305bc4b9..64eae0b2fd 100644 --- a/bin/libs/zos-fs.ts +++ b/bin/libs/zos-fs.ts @@ -20,11 +20,13 @@ import * as shell from './shell'; // Get file encoding from z/OS USS tagging export function getFileEncoding(filePath: string): number|undefined { //zos.changeTag(file, id) - let returnArray = os.stat(filePath); - if (!returnArray[1] && ((returnArray[0].mode & os.S_IFREG) == os.S_IFREG)) { //no error, and is file - return returnArray[0].ccsid; - } else { - common.printError(`getFileEncoding path=${filePath}, err=${returnArray[1]}`); + if (os.platform == 'zos') { + let returnArray = zos.zstat(filePath); + if (!returnArray[1] && ((returnArray[0].mode & os.S_IFMT) == os.S_IFREG)) { //no error, and is file + return returnArray[0].ccsid; + } else { + common.printError(`getFileEncoding path=${filePath}, err=${returnArray[1]}`); + } } return undefined; } diff --git a/build/zwe/types/@qjstypes/zos.d.ts b/build/zwe/types/@qjstypes/zos.d.ts index ec41ae6571..551948c5c2 100644 --- a/build/zwe/types/@qjstypes/zos.d.ts +++ b/build/zwe/types/@qjstypes/zos.d.ts @@ -11,8 +11,13 @@ export type ZStat = { dev: number; ino: number; + mode: number; + nlink: number; uid: number; gid: number; + rdev: number; + size: number; + blocks: number; atime: number; mtime: number; ctime: number; From 1f334af363e4edb68815d77c05371efb526e5bb4 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 14 Feb 2024 14:02:20 -0500 Subject: [PATCH 058/104] update changelog to align with 2.15.0 Signed-off-by: MarkAckert --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3292093c2..9edb889b67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.15.0` + +## New features and enhancements + +## Minor enhancements/defect fixes +- Bugfix: `zwe diagnose` running under comfigmgr and output formatted. Fixes #[3627](https://github.com/zowe/zowe-install-packaging/issues/3627). + ## `2.14.0` ### New features and enhancements @@ -18,8 +25,6 @@ All notable changes to the Zowe Installer will be documented in this file. #### 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). - Enhancement: `/bin/utils/date-add.rex` utility is accepting the date formatting as combination of YY|YYYY, MM, DD and any separator. -- Bugfix: `zwe diagnose` running under comfigmgr and output formatted. Fixes #[3627](https://github.com/zowe/zowe-install-packaging/issues/3627). - ## `2.12.0` From 2d8b04dc457de6d9ef17d16d8d53ae5d9d6d9c37 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Thu, 15 Feb 2024 14:12:18 +0100 Subject: [PATCH 059/104] TSS: Detect zOSMF Root CA (#3725) * TSS: Detect zOSMF Root CA Signed-off-by: Martin Zeithaml * Parameters updated Signed-off-by: Martin Zeithaml * Minor text change Signed-off-by: Martin Zeithaml --------- Signed-off-by: Martin Zeithaml Signed-off-by: Martin Zeithaml Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> --- .../keyring-jcl/connect/.parameters | 2 +- .../keyring-jcl/generate/.parameters | 2 +- .../keyring-jcl/import-ds/.parameters | 2 +- bin/libs/certificate.sh | 80 ++++++++++++++++++- 4 files changed, 79 insertions(+), 7 deletions(-) diff --git a/bin/commands/certificate/keyring-jcl/connect/.parameters b/bin/commands/certificate/keyring-jcl/connect/.parameters index 8ae86cb266..1160a03958 100644 --- a/bin/commands/certificate/keyring-jcl/connect/.parameters +++ b/bin/commands/certificate/keyring-jcl/connect/.parameters @@ -8,6 +8,6 @@ trust-cas||string|||||Labels of extra certificate authorities should be trusted, connect-user||string|required||||Certificate owner. Can be `SITE` or a user ID. connect-label||string|required||||Certificate label to connect. trust-zosmf||boolean|||||Whether to trust z/OSMF CA. -zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify "_auto_" to let Zowe to detect automatically. This only works for RACF. +zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify `_auto_` to let Zowe to detect automatically. This works for RACF and TSS. zosmf-user||string||IZUSVR|||z/OSMF user name. This is used to automatically detect z/OSMF root certificate authorities. ignore-security-failures||boolean|||||Whether to ignore security setup job failures. diff --git a/bin/commands/certificate/keyring-jcl/generate/.parameters b/bin/commands/certificate/keyring-jcl/generate/.parameters index 6017cd675d..5a16628783 100644 --- a/bin/commands/certificate/keyring-jcl/generate/.parameters +++ b/bin/commands/certificate/keyring-jcl/generate/.parameters @@ -16,6 +16,6 @@ country||string|||||Country of certificate and certificate authority. validity||string|||||Validity days of certificate. trust-cas||string|||||Labels of extra certificate authorities should be trusted, separated by comma (Maximum 2). trust-zosmf||boolean|||||Whether to trust z/OSMF CA. -zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify "_auto_" to let Zowe to detect automatically. This only works for RACF. +zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify `_auto_` to let Zowe to detect automatically. This works for RACF and TSS. zosmf-user||string||IZUSVR|||z/OSMF user name. This is used to automatically detect z/OSMF root certificate authorities. ignore-security-failures||boolean|||||Whether to ignore security setup job failures. diff --git a/bin/commands/certificate/keyring-jcl/import-ds/.parameters b/bin/commands/certificate/keyring-jcl/import-ds/.parameters index f0cb41275a..801991dcce 100644 --- a/bin/commands/certificate/keyring-jcl/import-ds/.parameters +++ b/bin/commands/certificate/keyring-jcl/import-ds/.parameters @@ -7,7 +7,7 @@ keyring-name||string|required||||Name of the keyring. alias|a|string|required|localhost|||Certificate alias name. trust-cas||string|||||Labels of extra certificate authorities should be trusted, separated by comma (Maximum 2). trust-zosmf||boolean|||||Whether to trust z/OSMF CA. -zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify "_auto_" to let Zowe to detect automatically. This only works for RACF. +zosmf-ca||string||_auto_|||Labels of z/OSMF root certificate authorities. Specify `_auto_` to let Zowe to detect automatically. This works for RACF and TSS. zosmf-user||string||IZUSVR|||z/OSMF user name. This is used to automatically detect z/OSMF root certificate authorities. import-ds-name||string|required||||Name of the data set holds certificate to import into keyring. import-ds-password||string|required||||Password of the data set holds certificate to import. diff --git a/bin/libs/certificate.sh b/bin/libs/certificate.sh index 49fcc232ef..13dec5e1d4 100644 --- a/bin/libs/certificate.sh +++ b/bin/libs/certificate.sh @@ -876,7 +876,15 @@ EOF if [ "${trust_zosmf}" = "1" ]; then if [ "${zosmf_root_ca}" = "_auto_" ]; then - zosmf_root_ca=$(detect_zosmf_root_ca "${ZWE_PRIVATE_ZOSMF_USER}") + if [ "${security_product}" = "RACF" ]; then + zosmf_root_ca=$(detect_zosmf_root_ca_racf "${ZWE_PRIVATE_ZOSMF_USER}") + fi + if [ "${security_product}" = "TSS" ]; then + zosmf_root_ca=$(detect_zosmf_root_ca_tss "${ZWE_PRIVATE_ZOSMF_USER}") + fi + if [ "${security_product}" = "ACF2" ]; then + zosmf_root_ca=$(detect_zosmf_root_ca_acf2 "${ZWE_PRIVATE_ZOSMF_USER}") + fi fi if [ -z "${zosmf_root_ca}" ]; then print_error_and_exit "Error ZWEL0137E: z/OSMF root certificate authority is not provided (or cannot be detected) with trusting z/OSMF option enabled." "" 137 @@ -1397,12 +1405,76 @@ EOF "${labels_with_private_key}" } -# this only works for RACF -detect_zosmf_root_ca() { +# FIXME +# - Support for multiple? | long | special characters entries +detect_zosmf_root_ca_tss() { + zosmf_user=${1:-IZUSVR} + zosmf_root_ca= + + print_trace "- Detect z/OSMF keyring by listing ID(${zosmf_user}) [TSS]" + zosmf_certs=$(tsocmd "TSS LIST(${zosmf_user}) KEYRING(ALL)" 2>&1) + code=$? + if [ ${code} -ne 0 ]; then + print_trace " * Exit code: ${code}" + print_trace " * Output:" + if [ -n "${zosmf_certs}" ]; then + print_trace "$(padding_left "${zosmf_certs}" " ")" + fi + return 1 + fi + + # Output example: + # KEYRING LABEL = KEYRING.IZUDFLT + zosmf_keyring_name=$(echo "${zosmf_certs}" | grep "KEYRING LABEL = " | awk -F= '{ print $2 }' | head -n 1) + if [ -n "${zosmf_keyring_name}" ]; then + print_trace " * z/OSMF keyring name is ${zosmf_keyring_name}" + # Output example: + # ACID(CERTAUTH) DIGICERT(ABCDEFGH) DEFAULT(NO ) USAGE(CERTAUTH) + # LABLCERT(ZOSMF_ROOT_CA ) + zosmf_root_ca=$(echo "${zosmf_certs}" | grep -A 1 "ACID(CERTAUTH)" | grep "LABLCERT(" | head -n 1) + zosmf_root_ca=$(echo "${zosmf_root_ca}" | awk '{ print substr( $0, 12, length($0)-13) }') + zosmf_root_ca=$(echo "${zosmf_root_ca}" | sed -e 's/^[[:space:]]*//;s/[[:space:]]*$//') + if [ -n "${zosmf_root_ca}" ]; then + print_trace " * z/OSMF root certificate authority found: ${zosmf_root_ca}" + echo "${zosmf_root_ca}" + return 0 + else + print_trace " * Error: cannot detect z/OSMF root certificate authority" + return 2 + fi + else + print_trace " * Error: failed to detect z/OSMF keyring name" + return 3 + fi +} + +# FIXME +# - add similar code using ACFUNIX instead of tsocmd +# - or use JCLs to be sure it will always works +detect_zosmf_root_ca_acf2() { + zosmf_user=${1:-IZUSVR} + zosmf_root_ca= + + print_trace "- Detect z/OSMF keyring by listing ID(${zosmf_user}) [ACF2]" + echo "${zosmf_root_ca}" + return 1 +} + +# FIXME +# - Support for multiple? | long | special characters entries +# - RACDCERT LISTRING will be confused if label contains 'CERTAUTH' word: +# +# Certificate Label Name Cert Owner USAGE DEFAULT +# -------------------------------- ------------ -------- ------- +# CERTAUTH_FOR_T800 ID(SKYNET) DEADLY YES +# JOHN_CONNOR CERTAUTH CERTAUTH NO +# +# Will return CERTAUTH_FOR_T800 instead of JOHN_CONNOR +detect_zosmf_root_ca_racf() { zosmf_user=${1:-IZUSVR} zosmf_root_ca= - print_trace "- Detect z/OSMF keyring by listing ID(${zosmf_user})" + print_trace "- Detect z/OSMF keyring by listing ID(${zosmf_user}) [RACF]" zosmf_certs=$(tsocmd "RACDCERT LIST ID(${zosmf_user})" 2>&1) code=$? if [ ${code} -ne 0 ]; then From e23727250b30f29973caa8d582041208ee3db187 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Thu, 15 Feb 2024 10:07:20 -0500 Subject: [PATCH 060/104] Escape dataset in copyMvsToUss Signed-off-by: Martin Zeithaml --- bin/libs/zos-fs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zos-fs.ts b/bin/libs/zos-fs.ts index ec29d37c69..e0023a449f 100644 --- a/bin/libs/zos-fs.ts +++ b/bin/libs/zos-fs.ts @@ -87,7 +87,7 @@ export function detectFileEncoding(fileName: string, expectedSample: string, exp export function copyMvsToUss(dataset: string, file: string): number { common.printDebug(`copyMvsToUss dataset=${dataset}, file=${file}`); - const result = shell.execSync('sh', '-c', `cp "//'${dataset}'" "${file}"`); + const result = shell.execSync('sh', '-c', `cp "//'${stringlib.escapeDollar(dataset)}'" '${file}'`); return result.rc; } From 1646329d755ac02b82cab7226b09904f0b3c4e55 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Wed, 21 Feb 2024 08:49:17 -0500 Subject: [PATCH 061/104] add backtick to (#3736) Signed-off-by: MarkAckert --- bin/commands/certificate/pkcs12/lock/.parameters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/commands/certificate/pkcs12/lock/.parameters b/bin/commands/certificate/pkcs12/lock/.parameters index 4a539c7aeb..9c137e1f62 100644 --- a/bin/commands/certificate/pkcs12/lock/.parameters +++ b/bin/commands/certificate/pkcs12/lock/.parameters @@ -1,4 +1,4 @@ keystore-dir|d|string|required||||Keystore directory. user||string|required||||Owner of the keystore directory. group||string|required||||Group of the keystore directory. -group-permission||string|||||Group permission. Can be for no permission, or `read`, `write`. +group-permission||string|||||Group permission. Can be `` for no permission, or `read`, `write`. From 468aeb3eec72d7bf83f558b534543205bb4425a6 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 21 Feb 2024 09:07:29 -0600 Subject: [PATCH 062/104] allow custom properties in components.zowe (#3735) Signed-off-by: 1000TurquoisePogs --- schemas/zowe-yaml-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 32fe423772..e3867cb09f 100644 --- a/schemas/zowe-yaml-schema.json +++ b/schemas/zowe-yaml-schema.json @@ -857,7 +857,7 @@ "zowe": { "type": "object", "description": "Component level overrides for top level Zowe network configuration.", - "additionalProperties": false, + "additionalProperties": true, "properties": { "network": { "$ref": "#/$defs/networkSettings" From 70003f487edef87db8b61af1fc536ac2183f9571 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:37:57 +0100 Subject: [PATCH 063/104] Add ESM to support details (#3749) Signed-off-by: Martin Zeithaml --- bin/commands/support/.help | 1 + bin/commands/support/index.sh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/commands/support/.help b/bin/commands/support/.help index 0f9ef64565..07bfab5e29 100644 --- a/bin/commands/support/.help +++ b/bin/commands/support/.help @@ -6,6 +6,7 @@ This command will collect these information: * z/OS version * Java version * Node.js version + * External Security Manager - Zowe configurations * Zowe manifest.json * Zowe configuration file diff --git a/bin/commands/support/index.sh b/bin/commands/support/index.sh index be3ab8c68e..970cde1523 100644 --- a/bin/commands/support/index.sh +++ b/bin/commands/support/index.sh @@ -43,7 +43,7 @@ print_debug "Temporary directory created: ${tmp_dir}" print_message ############################### -print_level1_message "Collecting version of z/OS, Java, NodeJS" +print_level1_message "Collecting information about z/OS, Java, NodeJS and ESM" VERSION_FILE="${tmp_dir}/version_output" ZOS_VERSION=`operator_command "D IPLINFO" | grep -i release | xargs` print_message "- z/OS: ${ZOS_VERSION}" @@ -51,9 +51,12 @@ JAVA_VERSION=`${JAVA_HOME}/bin/java -version 2>&1 | head -n 1` print_message "- Java: ${JAVA_VERSION}" NODE_VERSION=`${NODE_HOME}/bin/node --version` print_message "- NodeJS: ${NODE_VERSION}" +ESM=`"${ZWE_zowe_runtimeDirectory}/bin/utils/getesm"` +print_message "- External Security Manager: ${ESM}" echo "z/OS version: ${ZOS_VERSION}" > "${VERSION_FILE}" echo "Java version: ${JAVA_VERSION}" >> "${VERSION_FILE}" echo "NodeJS version: ${NODE_VERSION}" >> "${VERSION_FILE}" +echo "External Security Manager: ${ESM}" >> "${VERSION_FILE}" print_message ############################### From 2a0cd42177e9b975248a8ef399749b2853146329 Mon Sep 17 00:00:00 2001 From: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:56:23 -0500 Subject: [PATCH 064/104] Promote PTF after release v2.15.0 (#3754) Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index 07ec28cc3e..dacba17f67 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29349 +IO29350 +IO29351 IO29346 IO29347 IO29348 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index ee6b38e692..2b678fc7fa 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29349 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.15.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29350 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.15.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + + IO29351 - + PROBLEM SUMMARY: + **************************************************************** + * USERS AFFECTED: All Zowe users * + **************************************************************** + * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the * + * community release * + **************************************************************** + * RECOMMENDATION: Apply provided service * + **************************************************************** + The Zowe community version was updated to 2.15.0. + This PTF provides the community changes in SMP/E format. + Follow this link for more details on the community changes: + https://docs.zowe.org/stable/ + IO29346 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index 3337b60c7a..41f010ffcc 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90049) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24068) + COMMENT( + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: stop servers * + **************************************************************** + * Timing: pre-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Stop the Zowe servers before installing this update. + + **************************************************************** + * Affected function: Zowe servers * + **************************************************************** + * Description: start servers * + **************************************************************** + * Timing: post-APPLY * + **************************************************************** + * Part: ZWESLSTC and ZWESISTC * + **************************************************************** + Start the Zowe servers after installing this update. + + ). ++HOLD(UO90047) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24026) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index 08242dbddd..f6a1a9488e 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90049 +UO90050 UO90047 UO90048 UO90045 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 47e79c15bd..4acb9c7364 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -21,4 +21,4 @@ #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 #UO90045 UO90046 - IO29343 IO29344 IO29345 - Thu Dec 14 16:23:26 UTC 2023 #UO90047 UO90048 - IO29346 IO29347 IO29348 - Fri Jan 26 17:21:09 UTC 2024 -UO90049 UO90050 - IO29349 IO29350 IO29351 \ No newline at end of file +#UO90049 UO90050 - IO29349 IO29350 IO29351 - Fri Mar 8 19:42:44 UTC 2024 \ No newline at end of file From abadb12436d97a58fabc3bb4fbd0a3fb6ee2c0df Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Sat, 9 Mar 2024 12:33:21 -0500 Subject: [PATCH 065/104] set manifest to 2.15.1 (#3755) Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 5f0645c5fa..20d421ae28 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.15.0", + "version": "2.15.1", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From db377be2dcfe1750b4a52a312fb40e17d6a513da Mon Sep 17 00:00:00 2001 From: ManjuVNair133 <160747386+ManjuVNair133@users.noreply.github.com> Date: Wed, 13 Mar 2024 19:20:25 +0530 Subject: [PATCH 066/104] Added new PTF numbers for v2 (#3757) Signed-off-by: ManjuVNair133 --- smpe/bld/service/ptf-bucket.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 4acb9c7364..ef14889cff 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -21,4 +21,7 @@ #UO90033 UO90034 - IO29289 IO29290 IO29291 - Tue Oct 24 19:49:48 UTC 2023 #UO90045 UO90046 - IO29343 IO29344 IO29345 - Thu Dec 14 16:23:26 UTC 2023 #UO90047 UO90048 - IO29346 IO29347 IO29348 - Fri Jan 26 17:21:09 UTC 2024 -#UO90049 UO90050 - IO29349 IO29350 IO29351 - Fri Mar 8 19:42:44 UTC 2024 \ No newline at end of file +#UO90049 UO90050 - IO29349 IO29350 IO29351 - Fri Mar 8 19:42:44 UTC 2024 +UO90057 UO90058 - IO29424 IO29425 IO29426 +UO90059 UO90060 - IO29428 IO29429 IO29430 +UO90061 UO90062 - IO29431 IO29432 IO29433 \ No newline at end of file From a72d2e8ca259df5061f7fca2d79e8e69c2f07c17 Mon Sep 17 00:00:00 2001 From: Marketka Date: Mon, 18 Mar 2024 16:18:22 +0100 Subject: [PATCH 067/104] User/pavelzlatnik/fix zweconf yaml generator (#3761) * updated header Signed-off-by: pz636264 * tillZislib Signed-off-by: pz636264 * loadLibUtil Signed-off-by: pz636264 * tillVolume Signed-off-by: pz636264 * tillConfigManager Signed-off-by: pz636264 * Updated my part of zowe.yaml in ZWECONF workflow Signed-off-by: mm667937 * tillRbacId Signed-off-by: pz636264 * cookieId Signed-off-by: pz636264 * tillLogLvl Signed-off-by: pz636264 * tillCompConf Signed-off-by: pz636264 * tillAppId Signed-off-by: pz636264 * newProperties Signed-off-by: pz636264 * Added also new variables Signed-off-by: mm667937 * new step for changing owner and mode of ZOWE USS mountpoint Signed-off-by: mm667937 * new variables in variable input file as well Signed-off-by: mm667937 * 775 instead of 755 for zowe.yml Signed-off-by: mm667937 * typos Signed-off-by: mm667937 * new category for certificates separate commands for zwe init vsam, stc and mvs Signed-off-by: mm667937 * updated input file updated some variables security setup mandatory Signed-off-by: mm667937 * Changed grammar based on suggestions Signed-off-by: mm667937 --------- Signed-off-by: pz636264 Signed-off-by: mm667937 Co-authored-by: pz636264 --- workflows/files/ZWECONF.properties | 267 ++++++++-- workflows/files/ZWECONF.xml | 824 ++++++++++++++++++++++++----- workflows/files/ZWEWRF02.xml | 34 +- 3 files changed, 937 insertions(+), 188 deletions(-) diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties index 1e1efb1f38..876020cab4 100644 --- a/workflows/files/ZWECONF.properties +++ b/workflows/files/ZWECONF.properties @@ -22,6 +22,14 @@ zowe_setup_dataset_proclib=USER.PROCLIB # Zowe parameter library zowe_setup_dataset_parmlib=IBMUSER.ZWEV2.CUST.PARMLIB +# zowe_setup_dataset_libzis +# Label: Zowe setup PARMLIB members for ZIS plugins +# Abstract: Zowe ZIS plugins PARMLIB +# Category: zowe +# Description: +# Holds PARMLIB members for ZIS plugins +zowe_setup_dataset_libzis=ZWESIP00 + # zowe_setup_dataset_jcllib # Label: Zowe setup MVS JCL library # Abstract: JCL library where Zowe will store temporary JCLs during initialization @@ -30,13 +38,21 @@ zowe_setup_dataset_parmlib=IBMUSER.ZWEV2.CUST.PARMLIB # JCL library where Zowe will store temporary JCLs during initialization zowe_setup_dataset_jcllib=IBMUSER.ZWEV2.CUST.JCLLIB +# zowe_setup_dataset_loadlibPlugin +# Label: Zowe setup Utilities and extensions library +# Abstract: Load library where Zowe stores libraries for Utilities for use by Zowe and extensions +# Category: zowe +# Description: +# Load library for Utilities for use by Zowe and extensions +zowe_setup_dataset_loadlibPlugin=IBMUSER.ZWEV2.SZWELOAD + # zowe_setup_dataset_authLoadlib # Label: Zowe setup MVS auth load library # Abstract: APF authorized LOADLIB for Zowe # Category: zowe # Description: -# Optional. If it's empty, .SZWEAUTH will be APF authorized -zowe_setup_dataset_authLoadlib= +# APF authorized LOADLIB for Zowe core +zowe_setup_dataset_authLoadlib=IBMUSER.ZWEV2.SZWEAUTH # zowe_setup_dataset_authPluginLib # Label: Zowe setup MVS auth plugin library @@ -46,27 +62,10 @@ zowe_setup_dataset_authLoadlib= # APF authorized LOADLIB for Zowe ZIS Plugins zowe_setup_dataset_authPluginLib=IBMUSER.ZWEV2.CUST.ZWESAPL -# zowe_setup_certificate_type -# Label: Zowe setup certificate type -# Abstract: Type of certificate storage. -# Category: zowe -# Description: -# Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS -# Choices: PKCS12,JCEKS,JCECCAKS,JCERACFKS,JCECCARACFKS,JCEHYBRIDRACFKS -zowe_setup_certificate_type=PKCS12 - -# zowe_setup_certificate_pkcs12_directory -# Label: Zowe setup certificate PKCS12 directory -# Abstract: Keystore directory -# Category: zowe -# Description: -# Keystore directory -zowe_setup_certificate_pkcs12_directory=/var/zowe/keystore - # zowe_setup_vsam_mode # Label: Zowe setup VSAM mode # Abstract: VSAM data set with Record-Level-Sharing enabled or not -# Category: zowe +# Category: components # Description: # VSAM data set with Record-Level-Sharing enabled or not # Choices: NONRLS,RLS @@ -75,15 +74,15 @@ zowe_setup_vsam_mode=NONRLS # zowe_setup_vsam_volume # Label: Zowe setup VSAM volume # Abstract: Volume name if you are using VSAM in NONRLS mode -# Category: zowe +# Category: components # Description: # Volume name if you are using VSAM in NONRLS mode -zowe_setup_vsam_volume=VOL123 +zowe_setup_vsam_volume= # zowe_setup_vsam_storageClass # Label: Zowe setup VSAM storage class # Abstract: Storage class name if you are using VSAM in RLS mode -# Category: zowe +# Category: components # Description: # Storage class name if you are using VSAM in RLS mode zowe_setup_vsam_storageClass= @@ -163,13 +162,22 @@ zowe_externalPort=7554 # Category: zowe # Description: # Set to "debug" or "trace" to display extra debug information -# Choices: debug,trace -zowe_launchScript_logLevel= +# Choices: info,debug,trace +zowe_launchScript_logLevel=info + +# zowe_launchScript_CompConf +# Label: Zowe launch script component configuration +# Abstract: Set to "exit" or "warn" if any component has an error +# Category: zowe +# Description: +# Set to "exit" if you want startup to exit if any component has an error in the configuration stage, otherwise zwe will issue a warning but continue running. +# Choices: warn,exit +zowe_launchScript_CompConf=warn # zowe_certificate_keystore_type # Label: Zowe certificate keystore type # Abstract: Certificate keystore type (PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS) -# Category: zowe +# Category: certificates # Description: # Certificate keystore type (PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS) # Choices: PKCS12,JCEKS,JCECCAKS,JCERACFKS,JCECCARACFKS,JCEHYBRIDRACFKS @@ -177,8 +185,8 @@ zowe_certificate_keystore_type=PKCS12 # zowe_certificate_keystore_file # Label: Zowe certificate keystore file -# Abstract: Zowe certificate keystore file -# Category: zowe +# Abstract: Zowe certificate keystore file. In case of keyring the format is "safkeyring://OWNER/KEYRING". +# Category: certificates # Description: # Zowe certificate keystore file zowe_certificate_keystore_file=/global/zowe/keystore/localhost/localhost.keystore.p12 @@ -186,31 +194,32 @@ zowe_certificate_keystore_file=/global/zowe/keystore/localhost/localhost.keystor # zowe_certificate_keystore_password # Label: Zowe certificate keystore password # Abstract: Certificate keystore password. -# Category: zowe +# Category: certificates # Description: # Certificate keystore password. -zowe_certificate_keystore_password= +zowe_certificate_keystore_password=password # zowe_certificate_keystore_alias # Label: Zowe certificate keystore alias # Abstract: Alias for the certificate keystore -# Category: zowe +# Category: certificates # Description: # Alias for the certificate keystore zowe_certificate_keystore_alias=localhost # zowe_certificate_truststore_type # Label: Zowe certificate truststore type -# Abstract: zowe_certificate_truststore_type -# Category: zowe +# Abstract: Zowe certificate truststore type +# Category: certificates # Description: -# zowe_certificate_truststore_type +# Zowe certificate truststore type +# Choices: PKCS12,JCEKS,JCECCAKS,JCERACFKS,JCECCARACFKS,JCEHYBRIDRACFKS zowe_certificate_truststore_type=PKCS12 # zowe_certificate_truststore_file # Label: Zowe certificate truststore file -# Abstract: File location for the certificate truststore -# Category: zowe +# Abstract: File location for the certificate truststore. Keyring is in the format "safkeyring://OWNER/KEYRING". +# Category: certificates # Description: # File location for the certificate truststore zowe_certificate_truststore_file=/global/zowe/keystore/localhost/localhost.truststore.p12 @@ -218,15 +227,15 @@ zowe_certificate_truststore_file=/global/zowe/keystore/localhost/localhost.trust # zowe_certificate_truststore_password # Label: Zowe certificate truststore password # Abstract: Password for the certificate truststore -# Category: zowe +# Category: certificates # Description: # Password for the certificate truststore -zowe_certificate_truststore_password= +zowe_certificate_truststore_password=password # zowe_certificate_pem_key # Label: Zowe certificate PEM key # Abstract: Path to the Zowe certificate PEM key -# Category: zowe +# Category: certificates # Description: # Path to the Zowe certificate PEM key zowe_certificate_pem_key=/global/zowe/keystore/localhost/localhost.key @@ -234,7 +243,7 @@ zowe_certificate_pem_key=/global/zowe/keystore/localhost/localhost.key # zowe_certificate_pem_certificate # Label: Zowe certificate PEM certificate # Abstract: Path to the PEM certificate -# Category: zowe +# Category: certificates # Description: # Path to the PEM certificate zowe_certificate_pem_certificate=/global/zowe/keystore/localhost/localhost.cer @@ -242,7 +251,7 @@ zowe_certificate_pem_certificate=/global/zowe/keystore/localhost/localhost.cer # zowe_certificate_pem_certificateAuthorities # Label: Zowe certificate PEM certificate authorities # Abstract: zowe_certificate_pem_certificateAuthorities -# Category: zowe +# Category: certificates # Description: # zowe_certificate_pem_certificateAuthorities zowe_certificate_pem_certificateAuthorities=/global/zowe/keystore/local_ca/local_ca.cer @@ -250,7 +259,7 @@ zowe_certificate_pem_certificateAuthorities=/global/zowe/keystore/local_ca/local # zowe_verifyCertificates # Label: Zowe verify certificates # Abstract: Zowe certificate verification -# Category: zowe +# Category: certificates # Description: # Zowe certificate verification # Choices: STRICT,NONSTRICT,DISABLED @@ -278,7 +287,7 @@ node_home= # Category: zOSMF # Description: # Hostname of the running z/OSMF instance -zOSMF_host=example-domain.com +zOSMF_host=dvipa.my-company.com # zOSMF_port # Label: z/OSMF port @@ -416,6 +425,30 @@ components_metrics_service_port=7551 # Check this value to get additional debugging components_metrics_service_debug=false +# components_cloud_gateway_enabled +# Label: Enable cloud gateway +# Abstract: Use this option to enable the cloud gateway +# Category: components +# Description: +# Use this option to enable the cloud gateway +components_cloud_gateway_enabled=false + +# components_cloud_gateway_port +# Label: Cloud gateway port +# Abstract: Port for the cloud gateway +# Category: components +# Description: +# Port for the cloud gateway +components_cloud_gateway_port=7563 + +# components_cloud_gatewaye_debug +# Label: Cloud gateway debug +# Abstract: Check this value to get additional debugging +# Category: components +# Description: +# Check this value to get additional debugging +components_cloud_gatewaye_debug=false + # components_api_catalog_enabled # Label: Enable API catalog # Abstract: Use this option to enable the API catalog @@ -503,7 +536,7 @@ components_caching_service_storage_evictionStrategy=reject # Category: components # Description: # Specifies the components caching service storage mode -# Choices: inMemory,VSAM +# Choices: inMemory,redis,infinispan,VSAM components_caching_service_storage_mode=VSAM # components_caching_service_storage_size @@ -522,6 +555,14 @@ components_caching_service_storage_size=10000 # VSAM name of the storage components_caching_service_storage_vsam_name= +# components_caching_service_storage_infinispan_jgroups_port +# Label: Caching service storage jgroups port +# Abstract: Port for jgroups +# Category: components +# Description: +# Port for jgroups. This is required if storage mode is infinispan. +components_caching_service_storage_infinispan_jgroups_port=7600 + # components_app_server_enabled # Label: Enable app server # Abstract: Check this option to enable the app server @@ -530,6 +571,14 @@ components_caching_service_storage_vsam_name= # Check this option to enable the app server components_app_server_enabled=true +# components_app_server_debug +# Label: App server debug +# Abstract: Check to get extra debug information from the service +# Category: components +# Description: +# Check to get extra debug information from the service +components_app_server_debug=false + # components_app_server_port # Label: App server port # Abstract: Port for the app server @@ -570,6 +619,14 @@ components_zss_crossMemoryServerName=ZWESIS_STD # Check this to enable TLS on ZSS components_zss_tls=true +# components_zss_agent_jwt_fallback +# Label: ZSS JWT fallback +# Abstract: Check this to enable fallback +# Category: components +# Description: +# If fallback is enabled, the agent issues and accepts cookies from itself in the event a JWT cannot be provided. +components_zss_agent_jwt_fallback=true + # components_jobs_api_enabled # Label: Enable jobs API # Abstract: Check this option to enable the jobs API @@ -578,6 +635,14 @@ components_zss_tls=true # Check this option to enable the jobs API components_jobs_api_enabled=false +# components_jobs_api_debug +# Label: Jobs API debug +# Abstract: Check to get extra debug information from the service +# Category: components +# Description: +# Check to get extra debug information from the service +components_jobs_api_debug=false + # components_jobs_api_port # Label: Jobs API port # Abstract: Port for the Jobs API @@ -594,6 +659,14 @@ components_jobs_api_port=7558 # Check this option to enable the files API components_files_api_enabled=false +# components_files_api_debug +# Label: Files API debug +# Abstract: Check to get extra debug information from the service +# Category: components +# Description: +# Check to get extra debug information from the service +components_files_api_debug=false + # components_files_api_port # Label: Files API port # Abstract: Port which will be used by the Files API @@ -625,3 +698,109 @@ components_explorer_mvs_enabled=true # Description: # Check this option to enable USS explorer components_explorer_uss_enabled=true + +# useconfig_manager_enabled +# Label: Enable Zowe configuration manager +# Abstract: Should Zowe configuration manager be enabled? +# Category: configManager +# Description: +# Should Zowe configuration manager be enabled? +useconfig_manager_enabled=true + +# config_manager_validation +# Label: Zowe configuration manager validation type +# Abstract: STRICT or COMPONENT-COMPAT validation type +# Category: configManager +# Description: +# STRICT=quit on any error, COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit +# Choices: COMPONENT-COMPAT,STRICT +config_manager_validation=COMPONENT-COMPAT + +# zowe_rbacProfileId +# Label: Zowe Profile Identifier +# Abstract: ID you use to separate multiple Zowe installs +# Category: zowe +# Description: +# ID when determining resource names used in RBAC authorization checks such as dataservices with RBAC expects this ID in SAF resources +zowe_rbacProfileId=1 + +# zowe_cookieId +# Label: Zowe Cookie Identifier +# Abstract: ID that can be used by servers to distinguish their cookies from unrelated Zowe installs +# Category: zowe +# Description: +# ID which allows multiple copies of Zowe to be used within the same client +zowe_cookieId=1 + +# zowe_setup_security_product +# Label: Security product name +# Abstract: Security product name. Can be RACF, ACF2 or TSS +# Category: security +# Description: +# Security product name. Can be RACF, ACF2 or TSS +# Choices: RACF,TSS,ACF2 +zowe_setup_security_product=RACF + +# zowe_setup_security_groups_admin +# Label: Zowe admin user group +# Abstract: Zowe admin user group +# Category: security +# Description: +# Zowe admin user group +zowe_setup_security_groups_admin=ZWEADMIN + +# zowe_setup_security_groups_stc +# Label: Zowe STC group +# Abstract: Zowe STC group +# Category: security +# Description: +# Zowe STC group +zowe_setup_security_groups_stc=ZWEADMIN + +# zowe_setup_security_groups_sysProg +# Label: Zowe SysProg group +# Abstract: Zowe SysProg group +# Category: security +# Description: +# Zowe SysProg group +zowe_setup_security_groups_sysProg=ZWEADMIN + +# zowe_setup_security_users_zowe +# Label: Zowe runtime user +# Abstract: Zowe runtime user name of main service +# Category: security +# Description: +# Zowe runtime user name of main service +zowe_setup_security_users_zowe=ZWESVUSR + +# zowe_setup_security_users_zis +# Label: Zowe runtime user name of ZIS +# Abstract: Zowe runtime user name of ZIS +# Category: security +# Description: +# Zowe runtime user name of ZIS +zowe_setup_security_users_zis=ZWESIUSR + +# zowe_setup_security_stcs_zowe +# Label: STC name +# Abstract: STC name of main service +# Category: security +# Description: +# STC name of main service +zowe_setup_security_stcs_zowe=ZWESLSTC + +# zowe_setup_security_stcs_zis +# Label: STC name of ZIS +# Abstract: STC name of ZIS +# Category: security +# Description: +# STC name of ZIS +zowe_setup_security_stcs_zis=ZWESISTC + +# zowe_setup_security_stcs_aux +# Label: STC name of Auxiliary Service +# Abstract: STC name of Auxiliary Service +# Category: security +# Description: +# STC name of Auxiliary Service +zowe_setup_security_stcs_aux=ZWESASTC \ No newline at end of file diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index 3f581d300b..95966631b0 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -44,6 +44,17 @@ IBMUSER.ZWEV2.CUST.PARMLIB + + + Zowe ZIS plugins PARMLIB + Holds PARMLIB members for ZIS plugins + zowe + + + + ZWESIP00 + + JCL library where Zowe will store temporary JCLs during initialization @@ -55,14 +66,26 @@ IBMUSER.ZWEV2.CUST.JCLLIB + + + Load library where Zowe stores libraries for Utilities for use by Zowe and extensions + Load library for Utilities for use by Zowe and extensions + zowe + + + + IBMUSER.ZWEV2.SZWELOAD + + APF authorized LOADLIB for Zowe - Optional. If it's empty, <hlq>.SZWEAUTH will be APF authorized + APF authorized LOADLIB for Zowe core zowe + IBMUSER.ZWEV2.SZWEAUTH @@ -76,39 +99,11 @@ IBMUSER.ZWEV2.CUST.ZWESAPL - - - Type of certificate storage. - Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS - zowe - - - - PKCS12 - JCEKS - JCECCAKS - JCERACFKS - JCECCARACFKS - JCEHYBRIDRACFKS - PKCS12 - - - - - Keystore directory - Keystore directory - zowe - - - - /var/zowe/keystore - - VSAM data set with Record-Level-Sharing enabled or not VSAM data set with Record-Level-Sharing enabled or not - zowe + components @@ -121,18 +116,17 @@ Volume name if you are using VSAM in NONRLS mode Volume name if you are using VSAM in NONRLS mode - zowe + components - - VOL123 + Storage class name if you are using VSAM in RLS mode Storage class name if you are using VSAM in RLS mode - zowe + components @@ -237,15 +231,29 @@ some use cases, like containerization, this port could be different.zowe + info debug trace + info + + + + + Set to "exit" or "warn" if any component has an error + Set to "exit" if you want startup to exit if any component has an error in the configuration stage, otherwise zwe will issue a warning but continue running. + zowe + + + warn + exit + warn Certificate keystore type (PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS) Certificate keystore type (PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS) - zowe + certificates @@ -260,9 +268,9 @@ some use cases, like containerization, this port could be different. - Zowe certificate keystore file + Zowe certificate keystore file. In case of keyring the format is "safkeyring://OWNER/KEYRING". Zowe certificate keystore file - zowe + certificates @@ -273,14 +281,17 @@ some use cases, like containerization, this port could be different.Zowe certificate keystore password Certificate keystore password. Certificate keystore password. - zowe - + certificates + + + password + Alias for the certificate keystore Alias for the certificate keystore - zowe + certificates @@ -289,20 +300,26 @@ some use cases, like containerization, this port could be different. - zowe_certificate_truststore_type - zowe_certificate_truststore_type - zowe + Zowe certificate truststore type + Zowe certificate truststore type + certificates + PKCS12 + JCEKS + JCECCAKS + JCERACFKS + JCECCARACFKS + JCEHYBRIDRACFKS PKCS12 - File location for the certificate truststore + File location for the certificate truststore. Keyring is in the format "safkeyring://OWNER/KEYRING". File location for the certificate truststore - zowe + certificates @@ -313,14 +330,18 @@ some use cases, like containerization, this port could be different.Zowe certificate truststore password Password for the certificate truststore Password for the certificate truststore - zowe - + certificates + + + + password + Path to the Zowe certificate PEM key Path to the Zowe certificate PEM key - zowe + certificates @@ -331,7 +352,7 @@ some use cases, like containerization, this port could be different.Zowe certificate PEM certificate Path to the PEM certificate Path to the PEM certificate - zowe + certificates @@ -342,7 +363,7 @@ some use cases, like containerization, this port could be different.Zowe certificate PEM certificate authorities zowe_certificate_pem_certificateAuthorities zowe_certificate_pem_certificateAuthorities - zowe + certificates @@ -363,7 +384,7 @@ How we want to verify SSL certificates of services. Valid values are: - DISABLED: disable certificate validation. This is NOT recommended for security ]]> - zowe + certificates @@ -401,7 +422,7 @@ How we want to verify SSL certificates of services. Valid values are: - example-domain.com + dvipa.my-company.com @@ -590,6 +611,39 @@ How we want to verify SSL certificates of services. Valid values are: false + + + Use this option to enable the cloud gateway + Use this option to enable the cloud gateway + components + + + + false + + + + + Port for the cloud gateway + Port for the cloud gateway + components + + + + 7563 + + + + + Check this value to get additional debugging + Check this value to get additional debugging + components + + + + false + + Use this option to enable the API catalog @@ -711,6 +765,8 @@ How we want to verify SSL certificates of services. Valid values are: inMemory + redis + infinispan VSAM VSAM @@ -736,6 +792,17 @@ How we want to verify SSL certificates of services. Valid values are: + + + Port for jgroups + Port for jgroups. This is required if storage mode is infinispan. + components + + + + 7600 + + Check this option to enable the app server @@ -747,6 +814,17 @@ How we want to verify SSL certificates of services. Valid values are: true + + + Check to get extra debug information from the service + Check to get extra debug information from the service + components + + + + false + + Port for the app server @@ -802,6 +880,17 @@ How we want to verify SSL certificates of services. Valid values are: true + + + Check this to enable fallback + If fallback is enabled, the agent issues and accepts cookies from itself in the event a JWT cannot be provided. + components + + + + true + + Check this option to enable the jobs API @@ -813,6 +902,17 @@ How we want to verify SSL certificates of services. Valid values are: false + + + Check to get extra debug information from the service + Check to get extra debug information from the service + components + + + + false + + Port for the Jobs API @@ -835,6 +935,17 @@ How we want to verify SSL certificates of services. Valid values are: false + + + Check to get extra debug information from the service + Check to get extra debug information from the service + components + + + + false + + Port which will be used by the Files API @@ -879,6 +990,163 @@ How we want to verify SSL certificates of services. Valid values are: true + + + Should Zowe configuration manager be enabled? + Should Zowe configuration manager be enabled? + configManager + + + + true + + + + + STRICT or COMPONENT-COMPAT validation type + STRICT=quit on any error, COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit + configManager + + + + COMPONENT-COMPAT + STRICT + COMPONENT-COMPAT + + + + + ID you use to separate multiple Zowe installs + ID when determining resource names used in RBAC authorization checks such as dataservices with RBAC expects this ID in SAF resources + zowe + + + + 1 + + + + + ID that can be used by servers to distinguish their cookies from unrelated Zowe installs + ID which allows multiple copies of Zowe to be used within the same client + zowe + + + + 1 + + + + + Security product name. Can be RACF, ACF2 or TSS + Security product name. Can be RACF, ACF2 or TSS + security + + + + + RACF + TSS + ACF2 + RACF + + + + + Zowe admin user group + Zowe admin user group + security + + + + ZWEADMIN + + + + + + Zowe STC group + Zowe STC group + security + + + + + ZWEADMIN + + + + + Zowe SysProg group + Zowe SysProg group + security + + + + + ZWEADMIN + + + + + Zowe runtime user name of main service + Zowe runtime user name of main service + security + + + + + ZWESVUSR + + + + + Zowe runtime user name of ZIS + Zowe runtime user name of ZIS + security + + + + + ZWESIUSR + + + + + STC name of main service + STC name of main service + security + + + + + ZWESLSTC + + + + + STC name of ZIS + STC name of ZIS + security + + + + + ZWESISTC + + + + + STC name of Auxiliary Service + STC name of Auxiliary Service + security + + + + + ZWESASTC + + @@ -894,14 +1162,11 @@ How we want to verify SSL certificates of services. Valid values are: + + - - - - - @@ -911,6 +1176,7 @@ How we want to verify SSL certificates of services. Valid values are: + @@ -922,13 +1188,18 @@ How we want to verify SSL certificates of services. Valid values are: + + + + + @@ -939,6 +1210,15 @@ How we want to verify SSL certificates of services. Valid values are: + + + + + + + + + Run this step to fill base variables. 1 z/OS System Programmer @@ -967,7 +1247,7 @@ How we want to verify SSL certificates of services. Valid values are: - + @@ -1003,6 +1283,30 @@ How we want to verify SSL certificates of services. Valid values are: false + + Cloud gateway variables + Specify the variables for the cloud gateway component + + + 1 == 1 + Always true + + + Skipped if the cloud gateway was not selected + !${instance-components_cloud_gateway_enabled} + skipped + + + + + + Run this step to specify the cloud gateway variables + 1 + z/OS System Programmer + false + false + + API Catalog Variables Variables for the API catalog @@ -1051,9 +1355,12 @@ How we want to verify SSL certificates of services. Valid values are: false + + Chaching Service variables + Specify the variables for the Caching Service - Variables for Caching Service - Specify the variables for the Caching Service + Main variables for Caching Service + Specify the main variables for the Caching Service 1==1 @@ -1071,7 +1378,6 @@ How we want to verify SSL certificates of services. Valid values are: - Run this step to specify the variables for the Caching Service 1 z/OS System Programmer @@ -1079,6 +1385,67 @@ How we want to verify SSL certificates of services. Valid values are: false + + Variables for Caching Service - VSAM mode + Specify the variables for the VSAM mode of Caching Service + + + 1==1 + Always true + + + Skipped if Caching Service was not selected + !${instance-components_caching_service_enabled} + skipped + + + Skipped if VSAM was not selected + !(${instance-components_caching_service_storage_mode} == "VSAM") + skipped + + + + + + + + Run this step to specify the variables for the Caching Service + 1 + z/OS System Programmer + false + false + + + + Variables for Caching Service - infinispan mode + Specify the variables for the infinispan mode of Caching Service + + + + 1==1 + Always true + + + Skipped if Caching Service was not selected + !${instance-components_caching_service_enabled} + skipped + + + Skipped if infinispan was not selected + !(${instance-components_caching_service_storage_mode} == "infinispan") + skipped + + + + + Run this step to specify the variables for the Caching Service + 1 + z/OS System Programmer + false + false + + + App Server variables Specify the variables for the App Server @@ -1095,6 +1462,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to specify the variables for the App Server. 1 z/OS System Programmer @@ -1120,6 +1488,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to specify the values for the ZSS variables 1 z/OS System Programmer @@ -1143,6 +1512,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to define the variables for the Jobs API 1 z/OS System Programmer @@ -1166,6 +1536,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to specify the variables for the Files API 1 z/OS System Programmer @@ -1213,18 +1584,19 @@ echo '# Copyright Contributors to the Zowe Project.' >> "${instance-zowe_runtime echo '#[[################################################################################]]#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#===============================================================================' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# This is a YAML configuration file for Zowe instance.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# This is a YAML configuration file for a Zowe instance.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# YAML is a human-friendly data serialization language for all programming languages.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# To learn more about YAML specifications, please check https://yaml.org/.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# To learn more details about the entries, please check https://docs.zowe.org/.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# To learn more details about the content of this file, please check https://docs.zowe.org/.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# For first time users, or for the most common use cases, please pay more' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# attention on the entries marked with "**COMMONLY_CUSTOMIZED**".' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# attention to the entries marked with "**COMMONLY_CUSTOMIZED**". A "directory" refers' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# to a directory in z/OS Unix.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# If you modify any settings listed in "zwe init --help" command, you may need to' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# re-run "zwe init" command to make them take effect.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# re-run the "zwe init" command to make them take effect.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#===============================================================================' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1242,51 +1614,56 @@ echo ' setup:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # MVS data set related configurations' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' dataset:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # Where Zowe MVS data sets will be installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' prefix: "$!{instance-zowe_setup_dataset_prefix}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # where Zowe MVS data sets will be installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' prefix: $!{instance-zowe_setup_dataset_prefix}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # PROCLIB where Zowe STCs will be copied over' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' proclib: "$!{instance-zowe_setup_dataset_proclib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' proclib: $!{instance-zowe_setup_dataset_proclib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Zowe PARMLIB' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' parmlib: "$!{instance-zowe_setup_dataset_parmlib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' parmlib: $!{instance-zowe_setup_dataset_parmlib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Holds Zowe PARMLIB members for plugins' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' parmlibMembers:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # For ZIS plugins' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zis: $!{instance-zowe_setup_dataset_libzis}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # JCL library where Zowe will store temporary JCLs during initialization' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' jcllib: "$!{instance-zowe_setup_dataset_jcllib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jcllib: $!{instance-zowe_setup_dataset_jcllib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Utilities for use by Zowe and extensions' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' loadlib: $!{instance-zowe_setup_dataset_loadlibPlugin}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # APF authorized LOADLIB for Zowe' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # Optional. If it'\''s empty, .SZWEAUTH will be APF authorized.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' authLoadlib: "$!{instance-zowe_setup_dataset_authLoadlib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' authLoadlib: $!{instance-zowe_setup_dataset_authLoadlib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # APF authorized LOADLIB for Zowe ZIS Plugins' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' authPluginLib: "$!{instance-zowe_setup_dataset_authPluginLib}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' authPluginLib: $!{instance-zowe_setup_dataset_authPluginLib}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Security related configurations. This setup is optional.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # security:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # security product name. Can be RACF, ACF2 or TSS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # product: RACF' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # security group name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # groups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe admin user group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # admin: ZWEADMIN' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe STC group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # stc: ZWEADMIN' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe SysProg group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # sysProg: ZWEADMIN' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # security user name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # users:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe runtime user name of main service' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # zowe: ZWESVUSR' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # Zowe runtime user name of ZIS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # zis: ZWESIUSR' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # STC names' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # stcs:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # STC name of Zowe main service' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # zowe: ZWESLSTC' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # STC name of Zowe ZIS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # zis: ZWESISTC' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # STC name of Zowe ZIS Auxiliary Server' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # aux: ZWESASTC' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Security related configurations. This setup is optional.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' security:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # security product name. Can be RACF, ACF2 or TSS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' product: $!{instance-zowe_setup_security_product}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # security group name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' groups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe admin user group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' admin: $!{instance-zowe_setup_security_groups_admin}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe STC group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' stc: $!{instance-zowe_setup_security_groups_stc}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe SysProg group' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' sysProg: $!{instance-zowe_setup_security_groups_sysProg}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # security user name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' users:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe runtime user name of main service' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zowe: $!{instance-zowe_setup_security_users_zowe}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Zowe runtime user name of ZIS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zis: $!{instance-zowe_setup_security_users_zis}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STC names' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' stcs:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STC name of Zowe main service' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zowe: $!{instance-zowe_setup_security_stcs_zowe}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STC name of Zowe ZIS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' zis: $!{instance-zowe_setup_security_stcs_zis}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STC name of Zowe ZIS Auxiliary Server' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' aux: $!{instance-zowe_setup_security_stcs_aux}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Certificate related configurations' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1295,13 +1672,13 @@ echo ' # There are 5 configurations cases. Please choose one from below.' >> echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>> Certificate setup scenario 1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # PKCS12 (keystore) with Zowe generate certificates.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' type: "$!{instance-zowe_setup_certificate_type}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' pkcs12:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # type: $!{instance-zowe_setup_certificate_type}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # pkcs12:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Keystore directory' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' directory: "$!{instance-zowe_setup_certificate_pkcs12_directory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # directory: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # Lock the keystore directory to only accessible by Zowe runtime user and group.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # lock: true' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1372,10 +1749,11 @@ echo ' # # Path to the certificate authority signed the certificate will echo ' # - ""' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # >>>> Certificate setup scenario 3' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # z/OS Keyring with Zowe generated certificates.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe generated z/OS Keyring with Zowe generated certificates.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # type: JCERACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # createZosmfTrust: true' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # keyring:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # keyring name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1407,7 +1785,7 @@ echo ' # # - dvipa.my-company.com' >> "${instance-zowe_runtimeDirectory}/ echo ' # # - 12.34.56.78' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # >>>> Certificate setup scenario 4' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # z/OS Keyring and connect to existing certificate' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe generated z/OS Keyring and connect to existing certificate' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # type: JCERACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1431,7 +1809,7 @@ echo ' # importCertificateAuthorities:' >> "${instance-zowe_runtimeDirector echo ' # - ""' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # >>>> Certificate setup scenario 5' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # # z/OS Keyring with importing certificate stored in data set' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe generated z/OS Keyring with importing certificate stored in data set' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # type: JCERACFKS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1456,7 +1834,7 @@ echo ' # VSAM configurations if you are using VSAM as Caching Service storage echo ' vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # VSAM data set with Record-Level-Sharing enabled or not' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Valid values could be: NONRLS or RLS.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' mode: "$!{instance-zowe_setup_vsam_mode}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' mode: $!{instance-zowe_setup_vsam_mode}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Volume name if you are using VSAM in NONRLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' volume: "$!{instance-zowe_setup_vsam_volume}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Storage class name if you are using VSAM in RLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1466,42 +1844,82 @@ echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDire echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Zowe runtime (root) directory' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' #' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # **NOTE**: if it'\''s not specified and you passed "--update-config" argument' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # when you run "zwe init" command, this value will be updated with the Zowe' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # **NOTE**: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # 1. if it is not specified and you passed "--update-config" argument' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # when you ran "zwe init" command, this value will be updated with the Zowe' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # runtime where the "zwe" command is located.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' #' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # 2. the runtime directory is designed to be "read only". This is different from the' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # log, workspace, and extension directories. Setting those three to the same parent folder' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # as the runtime directory is unsupported & may cause issues' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' #' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # This value is required by ZWESLSTC to know where is Zowe runtime.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' runtimeDirectory: "$!{instance-zowe_runtimeDirectory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Where to store runtime logs' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' logDirectory: "$!{instance-zowe_logDirectory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' logDirectory: $!{instance-zowe_logDirectory}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Zowe runtime workspace directory' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' workspaceDirectory: "$!{instance-zowe_workspaceDirectory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' workspaceDirectory: $!{instance-zowe_workspaceDirectory}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Where extensions are installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' extensionDirectory: "$!{instance-zowe_extensionDirectory}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' extensionDirectory: $!{instance-zowe_extensionDirectory}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' useConfigmgr: $!{instance-useconfig_manager_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Setting to true will enable:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # * schema-backed validation of zowe.yaml' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # * should greatly improve startup time.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # * can supply multiple zowe.yaml as defaults & overrides in the format of' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # FILE(/my/customizations.yaml):PARMLIB(MYORG.ZOWE(YAML)):FILE(/zowe/defaults.yaml)' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # * allows templating in zowe.yaml by putting references within ${{ }} blocks such as' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # rewriting the job section below as' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # job:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # name: ${{ zowe.job.prefix }}SV' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # prefix: ZWE1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' configmgr:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # STRICT=quit on any error, including missing schema' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' validation: "$!{instance-config_manager_validation}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # runtime z/OS job name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' job:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Zowe JES job name' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' name: "$!{instance-zowe_job_name}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' name: $!{instance-zowe_job_name}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Prefix of component address space' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' prefix: "$!{instance-zowe_job_prefix}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' prefix: $!{instance-zowe_job_prefix}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # This is an ID you use to separate multiple Zowe installs when determining' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # resource names used in RBAC authorization checks such as dataservices with RBAC' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # expects this ID in SAF resources' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' rbacProfileIdentifier: "$!{instance-zowe_rbacProfileId}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # This is an ID that can be used by servers that distinguish their cookies from unrelated Zowe installs, ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # for purposes such as to allow multiple copies of Zowe to be used within the same client' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' cookieIdentifier: "$!{instance-zowe_cookieId}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # You can list your external domains how you want to access Zowe.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # This should be the domain list you would like to put into your web browser' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # You can list your external domains on how you want to access Zowe.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # This should be the domain list you would like to put into your web browser'\''s' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # address bar.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' externalDomains:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # this should be the domain name to access Zowe APIML Gateway' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #foreach($externalDomain in ${instance-zowe_externalDomains.split("\n")}) echo ' - ${externalDomain}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # This is the port you use to access Zowe Gateway from your web browser.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' #' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # In many use cases, this should be same as `components.gateway.port`. But in' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # some use cases, like containerization, this port could be different.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' externalPort: ${instance-zowe_externalPort}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1516,10 +1934,41 @@ echo ' # ZWED_SSH_PORT: 22' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # ZWED_TN3270_PORT: 23' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # Enable debug mode for zowe launch scripts' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # You can define any Zowe message portions to be checked for and the message added to the' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # system log upon its logging, truncated to 126 characters.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' sysMessages:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe starting' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0021I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe started' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0018I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0006I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe ready to use' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWES1601I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe stopping' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0008I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe stopped' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0022I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe components starting' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0001I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Zowe components stopped' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEL0002I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # API ML components ready' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWEAM000I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # App server ready' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWED0031I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # ZSS ready' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' - "ZWES1013I"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # # Not limited to Zowe message ID'\''s, you can specify your own string for example:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # - "ERROR"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Enable debug mode for Zowe launch scripts' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' launchScript:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Set to "debug" or "trace" to display extra debug information' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' logLevel: "$!{instance-zowe_launchScript_logLevel}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Set to "exit" if you'\''d like startup to exit if any component has an error in the configure stage, otherwise zwe will warn but continue.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' onComponentConfigureFail: "$!{instance-zowe_launchScript_CompConf}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Default Zowe certificate' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1529,18 +1978,23 @@ echo ' # `--update-config` to `zwe init` command. The generated value will base echo ' # your setup in `zowe.setup.certificate` section.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' certificate:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' keystore:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' type: "$!{instance-zowe_certificate_keystore_type}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' file: "$!{instance-zowe_certificate_keystore_file}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' password: "$!{instance-zowe_certificate_keystore_password}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' alias: "$!{instance-zowe_certificate_keystore_alias}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' type: $!{instance-zowe_certificate_keystore_type}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # if keyrings, the format is safkeyring:////stcusername/KeyName' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' file: $!{instance-zowe_certificate_keystore_file}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # "password" should either be the value you set when PKCS12, or literally "password" for keyrings.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' password: $!{instance-zowe_certificate_keystore_password}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # alias is the name of your key/cert. When using keyrings, get the Case Sensitive, Space Sensitive value in a TSO list ring.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' alias: $!{instance-zowe_certificate_keystore_alias}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' truststore:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' type: "$!{instance-zowe_certificate_truststore_type}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' file: "$!{instance-zowe_certificate_truststore_file}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' password: "$!{instance-zowe_certificate_truststore_password}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # truststore usually has same values as keystore (minus alias), but can be different if desired.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' type: $!{instance-zowe_certificate_truststore_type}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' file: $!{instance-zowe_certificate_truststore_file}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' password: $!{instance-zowe_certificate_truststore_password}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' pem:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' key: "$!{instance-zowe_certificate_pem_key}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' certificate: "$!{instance-zowe_certificate_pem_certificate}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' certificateAuthorities: "$!{instance-zowe_certificate_pem_certificateAuthorities}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' key: $!{instance-zowe_certificate_pem_key}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' certificate: $!{instance-zowe_certificate_pem_certificate}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # if keyrings, the format is "safkeyring:////stcusername/KeyName&ca name"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' certificateAuthorities: $!{instance-zowe_certificate_pem_certificateAuthorities}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # How we want to verify SSL certificates of services. Valid values are:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1551,8 +2005,8 @@ echo ' # - NONSTRICT: will validate if the certificate is trusted in our trust echo ' # This mode does not validate certificate Common Name and Subject' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Alternative Name (SAN).' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # - DISABLED: disable certificate validation. This is NOT recommended for' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # security ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' verifyCertificates: "$!{instance-zowe_verifyCertificates}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # security.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' verifyCertificates: $!{instance-zowe_verifyCertificates}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1593,11 +2047,11 @@ echo '# features. You need to define how to access your z/OSMF instance.' >> "${ echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo 'zOSMF:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # host name of your z/OSMF instance' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' host: "$!{instance-zOSMF_host}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # Host name of your z/OSMF instance' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' host: $!{instance-zOSMF_host}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-zOSMF_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' applId: "$!{instance-zOSMF_applId}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' applId: $!{instance-zOSMF_applId}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '#-------------------------------------------------------------------------------' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1700,6 +2154,20 @@ echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#if (${instance-components_cloud_gateway_enabled} == "true" ) +echo ' cloud-gateway:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' enabled: ${instance-components_cloud_gateway_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: ${instance-components_cloud_gateway_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: ${instance-components_cloud_gatewaye_debug}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#end +#if (${instance-components_cloud_gateway_enabled} == "false" ) +echo ' cloud-gateway:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' enabled: ${instance-components_cloud_gateway_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: 7563' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#end +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #if (${instance-components_api_catalog_enabled} == "true" ) echo ' api-catalog:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_api_catalog_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1738,13 +2206,17 @@ echo ' debug: ${instance-components_caching_service_debug}' >> "${instance-zo echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' storage:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' evictionStrategy: "$!{instance-components_caching_service_storage_evictionStrategy}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # can be inMemory, VSAM' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # can be inMemory, VSAM, redis or infinispan' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' mode: "$!{instance-components_caching_service_storage_mode}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' size: ${instance-components_caching_service_storage_size}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # your VSAM data set created by ZWECSVSM job' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # your VSAM data set created by "zwe init vsam" command or ZWECSVSM JCL' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # this is required if storage mode is VSAM' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' name: "$!{instance-components_caching_service_storage_vsam_name}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' infinispan:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # this is required if storage mode is infinispan' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jgroups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: ${instance-components_caching_service_storage_infinispan_jgroups_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_caching_service_enabled} == "false" ) echo ' caching-service:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1754,13 +2226,17 @@ echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' storage:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' evictionStrategy: "reject"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # can be inMemory, VSAM' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # can be inMemory, VSAM, redis or infinispan' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' mode: "VSAM"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' size: 10000' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # your VSAM data set created by ZWECSVSM job' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # your VSAM data set created by "zwe init vsam" command or ZWECSVSM JCL' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # this is required if storage mode is VSAM' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' name: ""' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' infinispan:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # this is required if storage mode is infinispan' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jgroups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: 7600' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1768,11 +2244,13 @@ echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDire echo ' app-server:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_app_server_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-components_app_server_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: ${instance-components_app_server_debug}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_app_server_enabled} == "false" ) echo ' app-server:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_app_server_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7556' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo ' # we can customize any component with custom certificate' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # the missing definitions will be picked from "zowe.certificate"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1790,23 +2268,31 @@ echo ' enabled: ${instance-components_zss_enabled}' >> "${instance-zowe_runti echo ' port: ${instance-components_zss_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' crossMemoryServerName: "$!{instance-components_zss_crossMemoryServerName}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' tls: ${instance-components_zss_tls}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' agent:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jwt:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' fallback: ${instance-components_zss_agent_jwt_fallback}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_zss_enabled} == "false" ) echo ' enabled: ${instance-components_zss_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7557' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' crossMemoryServerName: "ZWESIS_STD"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' tls: true' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' agent:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' jwt:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' fallback: true' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #if (${instance-components_jobs_api_enabled} == "true" ) echo ' jobs-api:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_jobs_api_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: ${instance-components_jobs_api_debug}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-components_jobs_api_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_jobs_api_enabled} == "false" ) echo ' jobs-api:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_jobs_api_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7558' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1814,11 +2300,13 @@ echo ' # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' >> "${instance-zowe_runtimeDire #if (${instance-components_files_api_enabled} == "true" ) echo ' files-api:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_files_api_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: ${instance-components_files_api_debug}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-components_files_api_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #if (${instance-components_files_api_enabled} == "false" ) echo ' files-api:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' enabled: ${instance-components_files_api_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' debug: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7559' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1856,7 +2344,8 @@ echo '# hostname: lpar1.my-company.com' >> "${instance-zowe_runtimeDirectory echo '# # Your &SYSNAME for this LPAR' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# # This sysname will be used to route your JES command to target system.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# sysname: LPR1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo '# # for this HA instance, we didn'\''t customize "components", so it will use default value.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '# # for this HA instance, we did not customize "components", so it will use default value.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# # HA instance ID, we will start 2 instances on LPAR2' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# # **NOTE**, we can only start one gateway in same LPAR.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo '# lpar2a:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1943,7 +2432,7 @@ export NODE_HOME='${instance-node_home}' export PATH=$PATH:'${instance-zowe_runtimeDirectory}/bin' -zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' +zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' --allow-overwrite shell-JCL 1024 @@ -1956,9 +2445,59 @@ zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' zwe init -c ${instance-zowe_runtimeDirectory}/zowe.yml

- NOTE: The zwe init command is a combination of the following sub-commands.
- Each sub-command defines a configuration. + This step runs the commands:
+ zwe init mvs -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite
+ zwe init stc -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite
+#if (${instance-components_caching_service_storage_mode} == "VSAM" && ${instance-components_caching_service_enabled}) + zwe init vsam -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite
+#end +
+ NOTE: + Each zwe init sub-command defines a configuration. +
    +
  • mvs: Copy the data sets provided with Zowe to custom data sets.
    • +
  • security: Create the user IDs and security manager settings.
    • +
  • apfauth: APF authorize the LOADLIB containing the modules that need to perform z/OS priviledged security calls.
    • +
  • certificate: Configure Zowe to use TLS certificates.
    • +
  • vsam: Configure the VSAM files needed to run the Zowe caching service used for high availability (HA).
    • +
  • stc: Configure the system to launch the Zowe started task.
    • +
+ ]]> + 1 + z/OS System Programmer + false + false + + + + Run the Zowe init security + Executes the Zowe initialization for security setup + + + + zwe init apfauth -c ${instance-zowe_runtimeDirectory}/zowe.yml
+ zwe init security -c ${instance-zowe_runtimeDirectory}/zowe.yml --allow-overwrite
+
+ NOTE: + Each zwe init sub-command defines a configuration.
  • mvs: Copy the data sets provided with Zowe to custom data sets.
  • security: Create the user IDs and security manager settings.
    • @@ -1981,7 +2520,8 @@ export NODE_HOME='${instance-node_home}' export PATH=$PATH:'${instance-zowe_runtimeDirectory}/bin' -zwe init -c '${instance-zowe_runtimeDirectory}/zowe.yaml' +zwe init security -c '${instance-zowe_runtimeDirectory}/zowe.yaml' --allow-overwrite +zwe init apfauth -c '${instance-zowe_runtimeDirectory}/zowe.yaml' shell-JCL 1024 diff --git a/workflows/files/ZWEWRF02.xml b/workflows/files/ZWEWRF02.xml index 7fea70c2ac..5fb653e1e6 100644 --- a/workflows/files/ZWEWRF02.xml +++ b/workflows/files/ZWEWRF02.xml @@ -48,8 +48,8 @@ Mount ZOWE zFS This step mounts ZOWE zFS on the mount point that was selected during the deployment. - Make sure you have correct SYSAFF in the following JCL so the filesystem is - mounted correctly. + Make sure you have the correct SYSAFF in the following JCL so the filesystem is +mounted correctly. 1 z/OS system programmer @@ -79,6 +79,36 @@ MOUNT FILESYSTEM('${zfsdsn}') + TYPE(ZFS) MODE(RDWR) + PARM('AGGRGROW') + MOUNTPOINT('${zfsmount}') +/* + JCL + 80 + + + + Change ownership + This step changes the ownership and mode of the ZOWE USS directory so the zwe command can be called. + Make sure you have the correct SYSAFF in the following JCL so the filesystem is +mounted correctly. + + 1 + z/OS system programmer + true + false +