Merge branch 'v3.x/staging' into v3.x/feature/diagnose

Signed-off-by: Mark Ackert <[email protected]>

.github/workflows/build-packaging.yml

@@ -374,7 +374,7 @@ jobs:
         with:
           name: pswi-folder
           path: |
-            pswi/**
+            pswi/logs/**
 
       - name: '[K8S] Build Kubernetes'
         timeout-minutes: 10

.github/workflows/pswi-zowe-config-test.yml

@@ -58,3 +58,4 @@ jobs:
             pswi/**.txt
             pswi/zowe_.yaml
             pswi/ZWECONF1/**
+            pswi/logs/**

CHANGELOG.md

@@ -3,8 +3,10 @@
 All notable changes to the Zowe Installer will be documented in this file.
 
 ## `3.0.1`
+- Bugfix: When `--log-dir` parameter for `zwe` command is a file, there might be an error "InternalError: stack overflow". [#40nn](https://github.com/zowe/zowe-install-packaging/pull/40nn)
 - Enhancement: new javascript funtion `getStatvfs()` to obtain information about the file sysytem [#3994](https://github.com/zowe/zowe-install-packaging/pull/3994)
 - Enhancement: command `zwe diagnose` in javascript only [#4061](https://github.com/zowe/zowe-install-packaging/pull/4061)
+- Enhancement: schema validation update for `zowe.job.name` and `zowe.job.prefix` [#4060](https://github.com/zowe/zowe-install-packaging/pull/4060)
 
 ## `3.0.0`
 

bin/libs/common.ts

@@ -345,7 +345,7 @@ export function getZoweRuntimeManifest(): any|undefined {
   if (!runtimeManifest) {
     const manifestFileName = `${std.getenv('ZWE_zowe_runtimeDirectory')}/manifest.json`;
     const result = xplatform.loadFileUTF8(manifestFileName,xplatform.AUTO_DETECT);
-    if (result){
+    if (!result) {
       printError('Could not read runtime manifest in '+manifestFileName);
     } else {
       runtimeManifest=JSON.parse(result);

bin/libs/logging.sh

@@ -14,6 +14,9 @@
 export ZWE_PRIVATE_LOG_FILE=
 
 prepare_log_file() {
+  if [ -f "${1}" ]; then
+    print_error_and_exit "Error ZWEL0102E: Invalid parameter --log-dir=${1} (not a directory)" "" 102
+  fi
   # use absolute path to make sure we can always write to correct location even
   # if other scripts changed current working directory
   log_dir=$(convert_to_absolute_path "${1}" | remove_trailing_slash)

pswi/.gitignore

@@ -0,0 +1,4 @@
+logs/
+EXP*
+report.txt
+unzipped/

pswi/01_smpe.sh

@@ -18,7 +18,7 @@ echo "SMPE workflow name          :" $SMPE_WF_NAME
 CREATE_SMPE_WF_URL="${BASE_URL}/zosmf/workflow/rest/1.0/workflows"
 SMPE_WF_LIST_URL="${BASE_URL}/zosmf/workflow/rest/1.0/workflows?owner=${ZOSMF_USER}&workflowName=${SMPE_WF_NAME}"
 
-# JSONs 
+# JSONs
 
 ADD_WORKFLOW_JSON='{"workflowName":"'$SMPE_WF_NAME'",
 "workflowDefinitionFile":"'${DIR}'/SMPE20",
@@ -43,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 ${ZZOW_SSH_PORT} ${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
@@ -52,52 +52,46 @@ cd ..
 # Get workflowKey for SMPE workflow owned by user
 echo "Get workflowKey for SMPE workflow if it exists."
 
-RESP=`curl -s $SMPE_WF_LIST_URL -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
-WFKEY=`echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\"`
-if [ -n "$WFKEY" ]
-then
-SMPE_WORKFLOW_URL="${CREATE_SMPE_WF_URL}/${WFKEY}"
+RESP=$(curl -s $SMPE_WF_LIST_URL -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
+WFKEY=$(echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\")
+if [ -n "$WFKEY" ]; then
+  SMPE_WORKFLOW_URL="${CREATE_SMPE_WF_URL}/${WFKEY}"
 
-echo "Deleting an SMPE workflow."
-RESP=`curl -s $SMPE_WORKFLOW_URL -k -X "DELETE" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
-sh scripts/check_response.sh "${RESP}" $?
+  echo "Deleting an SMPE workflow."
+  RESP=$(curl -s $SMPE_WORKFLOW_URL -k -X "DELETE" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
+  sh scripts/check_response.sh "${RESP}" $?
 fi
 
 # Create workflow with REST API
 echo 'Invoking REST API to create SMPE workflow.'
 
-RESP=`curl -s $CREATE_SMPE_WF_URL -k -X "POST" -d "$ADD_WORKFLOW_JSON" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
+RESP=$(curl -s $CREATE_SMPE_WF_URL -k -X "POST" -d "$ADD_WORKFLOW_JSON" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
 sh scripts/check_response.sh "${RESP}" $?
-if [ $? -gt 0 ];then exit -1;fi
-WFKEY=`echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\"`
+if [ $? -gt 0 ]; then exit -1; fi
+WFKEY=$(echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\")
 WORKFLOW_URL="${CREATE_SMPE_WF_URL}/${WFKEY}"
 
 # Run workflow
 echo "Invoking REST API to start a SMPE workflow."
 
-RESP=`curl -s ${WORKFLOW_URL}/operations/start -k -X "PUT" -d "{}" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
+RESP=$(curl -s ${WORKFLOW_URL}/operations/start -k -X "PUT" -d "{}" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
 sh scripts/check_response.sh "${RESP}" $?
-if [ $? -gt 0 ];then exit -1;fi
+if [ $? -gt 0 ]; then exit -1; fi
 STATUS=""
-until [ "$STATUS" = "FINISHED" ]
-do
-sleep 20
-
-
-# Get the result of the workflow
-RESP=`curl -s ${WORKFLOW_URL} -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
-if [ $? -gt 0 ];then exit -1;fi
-STATUS_NAME=`echo $RESP | grep -o '"statusName":".*"' | cut -f4 -d\"`
-
-if [ "$STATUS_NAME" = "in-progress" ]
-then
-  echo "Workflow with SMP/E ended with an error." >> report.txt
-  echo $RESP >> report.txt
-  exit -1
-elif [ "$STATUS_NAME" = "complete" ]
-then
-  echo "Workflow finished successfully."
-  STATUS="FINISHED"
-fi
+until [ "$STATUS" = "FINISHED" ]; do
+  sleep 20
+
+  # Get the result of the workflow
+  RESP=$(curl -s ${WORKFLOW_URL} -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
+  if [ $? -gt 0 ]; then exit -1; fi
+  STATUS_NAME=$(echo $RESP | grep -o '"statusName":".*"' | cut -f4 -d\")
+
+  if [ "$STATUS_NAME" = "in-progress" ]; then
+    echo "Workflow with SMP/E ended with an error." >>$LOG_DIR/report.txt
+    echo $RESP >>$LOG_DIR/report.txt
+    exit -1
+  elif [ "$STATUS_NAME" = "complete" ]; then
+    echo "Workflow finished successfully."
+    STATUS="FINISHED"
+  fi
 done
-

pswi/02_ptf.sh

@@ -22,7 +22,7 @@ echo "PTF workflow name           :" $PTF_WF_NAME
 CREATE_PTF_WF_URL="${BASE_URL}/zosmf/workflow/rest/1.0/workflows"
 PTF_WF_LIST_URL="${BASE_URL}/zosmf/workflow/rest/1.0/workflows?owner=${ZOSMF_USER}&workflowName=${PTF_WF_NAME}"
 
-# JSONs 
+# JSONs
 ADD_WORKFLOW_JSON='{"workflowName":"'$PTF_WF_NAME'",
 "workflowDefinitionFile":"'${DIR}'/WFPTF",
 "system":"'$ZOSMF_SYSTEM'",
@@ -38,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 ${ZZOW_SSH_PORT} ${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
@@ -47,52 +47,48 @@ cd ..
 # Get workflowKey for PTF workflow owned by user
 echo "Get workflowKey for PTF workflow if it exists."
 
-RESP=`curl -s $PTF_WF_LIST_URL -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
-WFKEY=`echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\"`
+RESP=$(curl -s $PTF_WF_LIST_URL -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
+WFKEY=$(echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\")
 
-if [ -n "$WFKEY" ]
-then
-PTF_WORKFLOW_URL="${CREATE_PTF_WF_URL}/${WFKEY}"
+if [ -n "$WFKEY" ]; then
+  PTF_WORKFLOW_URL="${CREATE_PTF_WF_URL}/${WFKEY}"
 
-echo "Deleting a PTF workflow."
-RESP=`curl -s $PTF_WORKFLOW_URL -k -X "DELETE" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
-sh scripts/check_response.sh "${RESP}" $?
+  echo "Deleting a PTF workflow."
+  RESP=$(curl -s $PTF_WORKFLOW_URL -k -X "DELETE" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
+  sh scripts/check_response.sh "${RESP}" $?
 fi
 
 # Create workflow with REST API
 echo 'Invoking REST API to create ptf workflow.'
 
-RESP=`curl -s $CREATE_PTF_WF_URL -k -X "POST" -d "$ADD_WORKFLOW_JSON" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
+RESP=$(curl -s $CREATE_PTF_WF_URL -k -X "POST" -d "$ADD_WORKFLOW_JSON" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
 sh scripts/check_response.sh "${RESP}" $?
-if [ $? -gt 0 ];then exit -1;fi
-WFKEY=`echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\"`
+if [ $? -gt 0 ]; then exit -1; fi
+WFKEY=$(echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\")
 WORKFLOW_URL="${CREATE_PTF_WF_URL}/${WFKEY}"
 
 # Run workflow
 echo "Invoking REST API to start a PTF apply workflow."
 
-RESP=`curl -s ${WORKFLOW_URL}/operations/start -k -X "PUT" -d "{}" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
+RESP=$(curl -s ${WORKFLOW_URL}/operations/start -k -X "PUT" -d "{}" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
 sh scripts/check_response.sh "${RESP}" $?
-if [ $? -gt 0 ];then exit -1;fi
+if [ $? -gt 0 ]; then exit -1; fi
 STATUS=""
-until [ "$STATUS" = "FINISHED" ]
-do
-sleep 20
-
-# Get the result of the workflow
-RESP=`curl -s ${WORKFLOW_URL} -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
-if [ $? -gt 0 ];then exit -1;fi
-
-STATUS_NAME=`echo $RESP | grep -o '"statusName":".*"' | cut -f4 -d\"`
-
-if [ "$STATUS_NAME" = "in-progress" ]
-then
-  echo "Workflow with PTFs ended with an error." >> report.txt
-  echo $RESP >> report.txt
-  exit -1
-elif [ "$STATUS_NAME" = "complete" ]
-then
-  echo "Workflow finished successfully."
-  STATUS="FINISHED"
-fi
+until [ "$STATUS" = "FINISHED" ]; do
+  sleep 20
+
+  # Get the result of the workflow
+  RESP=$(curl -s ${WORKFLOW_URL} -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS)
+  if [ $? -gt 0 ]; then exit -1; fi
+
+  STATUS_NAME=$(echo $RESP | grep -o '"statusName":".*"' | cut -f4 -d\")
+
+  if [ "$STATUS_NAME" = "in-progress" ]; then
+    echo "Workflow with PTFs ended with an error." >>$LOG_DIR/report.txt
+    echo $RESP >>$LOG_DIR/report.txt
+    exit -1
+  elif [ "$STATUS_NAME" = "complete" ]; then
+    echo "Workflow finished successfully."
+    STATUS="FINISHED"
+  fi
 done