Node Removal Tasks - v3.x

.github/workflows/build-packaging.yml

@@ -276,7 +276,7 @@ jobs:
         with:
           manifest-file-path: ${{ github.workspace }}/manifest.json
           default-target-path: .pax/binaryDependencies/
-          expected-count: 32
+          expected-count: 33
 
       # 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

.pax/pre-packaging.sh

@@ -228,6 +228,22 @@ chmod +x "${ZOWE_ROOT_DIR}"/bin/zwe
 chmod +x "${ZOWE_ROOT_DIR}"/bin/utils/*.sh
 chmod +x "${ZOWE_ROOT_DIR}"/bin/utils/*.rex
 
+echo "[$SCRIPT_NAME] extract curl ..."
+curl_pax=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "curl-*.pax.Z" \) | head -n 1)
+cd "${ZOWE_ROOT_DIR}/bin/utils"
+pax -ppx -rf "${curl_pax}"
+mv "${ZOWE_ROOT_DIR}"/bin/utils/curl-*/bin/curl ./curl
+rm -rf "${ZOWE_ROOT_DIR}"/bin/utils/curl-*
+
+echo "[$SCRIPT_NAME] change curl to be executable ..."
+chmod +x "${ZOWE_ROOT_DIR}"/bin/utils/curl
+
+echo "[$SCRIPT_NAME] extract keyring-util ..."
+keyring_util=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "keyring-util*.pax" \) | head -n 1)
+mkdir -p "${ZOWE_ROOT_DIR}/bin/utils/keyring-util"
+cd "${ZOWE_ROOT_DIR}/bin/utils/keyring-util"
+pax -ppx -rf "${keyring_util}"
+rm "${keyring_util}"
 echo "[$SCRIPT_NAME] extract zowex ..."
 zowex_components=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "zowe-server-*.pax.Z" \) | head -n 1)
 mkdir -p "${ZOWE_ROOT_DIR}/bin/utils/zowe-server"
@@ -245,12 +261,6 @@ rm -rf "${zowex_components}"
 echo "[$SCRIPT_NAME] change keyring-util to be executable ..."
 chmod +x "${ZOWE_ROOT_DIR}"/bin/utils/keyring-util/keyring-util
 
-echo "[$SCRIPT_NAME] extract zowe-ncert ..."
-cd "${ZOWE_ROOT_DIR}/bin/utils"
-mkdir -p ncert
-cd ncert
-pax -ppx -rf ../zowe-ncert-*.pax
-rm -f ../zowe-ncert-*.pax
 cd "${BASE_DIR}"
 
 # prepare for SMPE

.pax/prepare-workspace.sh

@@ -38,34 +38,33 @@
 # $wf_from: input location (raw workfiles)
 # $wf_to: target location (customized workfiles)
 # ---------------------------------------------------------------------
-_customizeWorkflow () {
+_customizeWorkflow() {
   echo "[${SCRIPT_NAME}] creating workflows in $wf_to ..."
   mkdir -p "$wf_to"
 
-  wf_files=$(ls "$wf_from")  # processes all files (.xml, .vtl & .properties)
-  for wf_file in $wf_files
-  do
+  wf_files=$(ls "$wf_from") # processes all files (.xml, .vtl & .properties)
+  for wf_file in $wf_files; do
     # skip if directory
     test -d "$wf_from/$wf_file" && continue
     # fill in Zowe version in the workflow file
     sed -e "s/###ZOWE_VERSION###/${ZOWE_VERSION}/g" \
-        -e "s/encoding=\"utf-8\"/encoding=\"ibm-1047\"/g" \
-        "$wf_from/$wf_file" \
-        > "$wf_to/$wf_file"
+      -e "s/encoding=\"utf-8\"/encoding=\"ibm-1047\"/g" \
+      "$wf_from/$wf_file" \
+      >"$wf_to/$wf_file"
     # remove raw workflow file if requested
     test -n "$1" && rm "$wf_from/$wf_file"
   done
 
   return 0
-}    # _customizeWorkflow
+} # _customizeWorkflow
 
 # ---------------------------------------------------------------------
 # --- do sed substitutions to template workflow files
 # $wf_from: input location (raw workfiles)
 # $wf_to: target location (customized workfiles)
 # ---------------------------------------------------------------------
-_templateWorkflow () {
-  wf_temp="${PAX_WORKSPACE_DIR}/ascii/wf_temp"  # temp dir for sed
+_templateWorkflow() {
+  wf_temp="${PAX_WORKSPACE_DIR}/ascii/wf_temp" # temp dir for sed
   mkdir -p "$wf_temp"
   mkdir -p "$wf_to"
 
@@ -81,15 +80,21 @@ _templateWorkflow () {
   rm -rf $wf_temp
 
   return 0
-}    # _templateWorkflow
+} # _templateWorkflow
 
 # ---------------------------------------------------------------------
 # --- main --- main --- main --- main --- main --- main --- main ---
 # ---------------------------------------------------------------------
-SCRIPT_NAME=$(basename "$0")  # $0=./.pax/prepare-workspace.sh
-PAX_WORKSPACE_DIR=$(cd "$(dirname "$0")";pwd)      # <something>/.pax
+SCRIPT_NAME=$(basename "$0") # $0=./.pax/prepare-workspace.sh
+PAX_WORKSPACE_DIR=$(
+  cd "$(dirname "$0")"
+  pwd
+) # <something>/.pax
 PAX_BINARY_DEPENDENCIES="${PAX_WORKSPACE_DIR}/binaryDependencies"
-ROOT_DIR=$(cd "${PAX_WORKSPACE_DIR}/../";pwd)
+ROOT_DIR=$(
+  cd "${PAX_WORKSPACE_DIR}/../"
+  pwd
+)
 
 echo "[${SCRIPT_NAME}] extracting ZOWE_VERSION ..."
 ZOWE_VERSION=$(cat ${ROOT_DIR}/manifest.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[",]//g' | tr -d '[[:space:]]')
@@ -126,14 +131,13 @@ find "${ROOT_DIR}/bin" -type f -name '*.ts' -delete
 # copy from current github source
 echo "[${SCRIPT_NAME}] copying files ..."
 cd "${ROOT_DIR}"
-cp manifest.json       "${CONTENT_DIR}"
-cp example-zowe.yaml   "${CONTENT_DIR}"
-cp ZOWE.md             "${CONTENT_DIR}/README.md"
-cp DEVELOPERS.md       "${CONTENT_DIR}/DEVELOPERS.md"
-cp -R bin/*            "${CONTENT_DIR}/bin"
-cp -R files/*          "${CONTENT_DIR}/files"
-cp -R schemas/*        "${CONTENT_DIR}/schemas"
-
+cp manifest.json "${CONTENT_DIR}"
+cp example-zowe.yaml "${CONTENT_DIR}"
+cp ZOWE.md "${CONTENT_DIR}/README.md"
+cp DEVELOPERS.md "${CONTENT_DIR}/DEVELOPERS.md"
+cp -R bin/* "${CONTENT_DIR}/bin"
+cp -R files/* "${CONTENT_DIR}/files"
+cp -R schemas/* "${CONTENT_DIR}/schemas"
 
 # build dir should not end up in release, will be removed after build in pre-packaging phase
 #cp -R build            "${CONTENT_DIR}/"
@@ -143,28 +147,6 @@ mkdir -p "${CONTENT_DIR}/licenses"
 echo "[${SCRIPT_NAME}] copy license file ..."
 mv "${PAX_BINARY_DEPENDENCIES}/zowe_licenses_full.zip" "${CONTENT_DIR}/licenses"
 
-# extract packaging utility tools to bin/utils
-echo "[${SCRIPT_NAME}] prepare utility tools ..."
-cd "${ROOT_DIR}" && cd "${CONTENT_DIR}/bin/utils"
-echo "[${SCRIPT_NAME}] extract zowe-utility-tools.zip ..."
-jar -xf "${PAX_BINARY_DEPENDENCIES}"/zowe-utility-tools*.zip
-# we should get 2 tgz files as npm packages
-echo "[${SCRIPT_NAME}] extract zowe-fconv ..."
-tar zxf zowe-fconv-*.tgz
-mv package fconv
-rm zowe-fconv-*.tgz
-echo "[${SCRIPT_NAME}] extract zowe-njq ..."
-tar zxf zowe-njq-*.tgz
-mv package njq
-rm zowe-njq-*.tgz
-echo "[${SCRIPT_NAME}] extract zowe-config-converter ..."
-tar zxf zowe-config-converter-*.tgz
-mv package config-converter
-rm zowe-config-converter-*.tgz
-# zowe-ncert.pax will be extracted on z/OS side
-cd "${ROOT_DIR}"
-rm -f "${PAX_BINARY_DEPENDENCIES}"/zowe-utility-tools*.zip
-
 # put text files into ascii folder (recursive & verbose)
 echo "[${SCRIPT_NAME}] move ASCII files out of CONTENT directory for encoding conversion ..."
 rsync -rv \
@@ -174,23 +156,19 @@ rsync -rv \
   --exclude '*.tar.gz' \
   --exclude '*.pax.Z' \
   --exclude '*.pax' \
+  --exclude '*.pax.Z' \
   --exclude '*.jar' \
   --exclude '*.class' \
   --prune-empty-dirs --remove-source-files \
   "${CONTENT_DIR}/" \
   "${ASCII_DIR}"
 
-echo "[${SCRIPT_NAME}] copy keyring_utils"
-cd "${ROOT_DIR}" && cd "${CONTENT_DIR}/bin/utils"
-mkdir -p keyring-util
-mv "${PAX_BINARY_DEPENDENCIES}"/keyring-util-* keyring-util/keyring-util
-
 # move binary dependencies and prepare to extract on z/OS
 echo "[${SCRIPT_NAME}] move binary dependencies ..."
 mkdir -p "${CONTENT_DIR}/files/zlux"
 cd "${PAX_BINARY_DEPENDENCIES}"
-for zlux_dep in zlux-editor tn3270-ng2 vt-ng2 sample-react-app sample-iframe-app sample-angular-app explorer-ip ; do
-  mv ${zlux_dep}-*.pax        "${CONTENT_DIR}/files/zlux/${zlux_dep}.pax"
+for zlux_dep in zlux-editor tn3270-ng2 vt-ng2 sample-react-app sample-iframe-app sample-angular-app explorer-ip; do
+  mv ${zlux_dep}-*.pax "${CONTENT_DIR}/files/zlux/${zlux_dep}.pax"
 done
 mv *.pax.Z "${CONTENT_DIR}/files/"
 mv *.pax "${CONTENT_DIR}/files/"
@@ -214,7 +192,7 @@ _customizeWorkflow
 wf_from="workflows/templates"
 wf_to="${PAX_WORKSPACE_DIR}/ascii/templates"
 _templateWorkflow
-cp workflows/*.rex "$wf_to"                               # add tooling
+cp workflows/*.rex "$wf_to" # add tooling
 
 echo "[${SCRIPT_NAME}] copy smpe scripts ..."
 # copy smpe scripts -- build usage only

CHANGELOG.md

@@ -9,6 +9,7 @@ All notable changes to the Zowe Installer will be documented in this file.
 - Enhancement: `ZWEGEN00` supports long path by continuation character, which can be used in JCL `ZWEGENER` [#4459](https://github.com/zowe/zowe-install-packaging/pull/4459)
 - Bugfix: Zowe startup now removes outdated static definition files from workspace/api-mediation/api-defs, which previously caused wrong or duplicate registrations of servers to APIML. [#4526](https://github.com/zowe/zowe-install-packaging/pull/4526)
 - Bugfix: `--update-config` might fail if the specified config file is a symbolic link. [#4492](https://github.com/zowe/zowe-install-packaging/pull/4492)
+- Enhancement: Node.JS is no longer required to run `zwe migrate for kubernetes`, or any other `zwe` command. [#4393](https://github.com/zowe/zowe-install-packaging/pull/4393)
 
 ## `3.3.1`
 

bin/README.md

@@ -55,7 +55,6 @@ Please be aware of using functions marked as `@experimental`. These functions ma
 `bin/utils` directory holds several utility tools used by Zowe, and you can take advantage of them too.
 
 - `bin/utils/opercmd.rex`: To issue operator command on z/OS. This script can only run on z/OS and requires SDSF.
-- `bin/utils/curl.js`: This 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.
 - `bin/utils/certificate-analyser.jar`: Java based tool to verify the certificates. See [README](https://github.com/zowe/api-layer/blob/v3.x.x/certificate-analyser/README.md) for more information.
 - `@experimental`: `bin/utils/zowex`: Zowe Native Protocol CLI for various tasks (console, jobs, datasets, ...), use `zowex --help` for more information.

bin/commands/.errors

@@ -51,5 +51,4 @@ ZWEL0300W||%s already exists. This %s will be overwritten.
 ZWEL0301W||%s already exists and will not be overwritten. For upgrades, you must use --allow-overwrite.
 ZWEL0316E|316|Invalid PARMLIB format %s.
 ZWEL0322E|322|%s is not a valid directory.
-ZWEL0323E||NodeJS required but not found. Errors such as ZWEL0157E may occur as a result. The value 'node.home' in the Zowe YAML is not correct.
 ZWEL0326E|326|An error occurred while processing Zowe YAML config %s:

bin/commands/init/apfauth/index.sh

@@ -41,7 +41,7 @@ if [ -n "${ZWE_CLI_PARAMETER_DRY_RUN}" ] || [ -n "${ZWE_CLI_PARAMETER_SECURITY_D
 fi
 
 # read prefix and validate
-prefix=$(read_yaml_configmgr "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.prefix")
+prefix=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.prefix")
 if [ -z "${prefix}" ]; then
   print_error_and_exit "Error ZWEL0157E: Zowe dataset prefix (zowe.setup.dataset.prefix) is not defined in Zowe YAML configuration file." "" 157
 fi
@@ -51,7 +51,7 @@ fi
 job_has_failures=
 for key in ${auth_libs}; do
   # read def and validate
-  ds=$(read_yaml_configmgr "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.${key}")
+  ds=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.${key}")
   if [ -z "${ds}" ]; then
     # authLoadlib can be empty
     if [ "${key}" = "authLoadlib" ]; then