Merge branch 'v2.x/staging' into v3.x/staging

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to the Zlux App Server package will be documented in this file.
 
+## v2.17.0
+- Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) (#303)
+- Enhancement: The app-server configure stage performance increased due to combining two seperate processes in this stage (plugins-init.js and initInstance.js) into one. (#304)
+- Enhancement: Remove dns check specific to node 14 and below to reduce startup time. Node 14 has not been supported since september 2023. (#304)
+
+## v2.16.0
+- Bugfix: Removed message saying node not found prior to discovery of node. Now, you will only get an error message if node is not found after lookup in NODE_HOME.
+
 ## v2.14.0
 - Enhancement: Updated schema to specify multiple discovery servers.
 

README.md

@@ -49,6 +49,8 @@ To build the App Server and Apps, the following is required:
 
 * **NodeJS** - v14.x minimum (except v14.17.2) up to v16.x
 
+Note & TODO: Node 17+ will fail on Windows when running full zlux build, [more information in this thread.](https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported). An upgrade solution needs to be applied across multiple failing components
+
 * **npm** - v6.4 minimum
 
 * **jdk** - v8 minimum
@@ -79,7 +81,7 @@ On z/OS, git 2.14.4 is the minimum needed.
 ### Runtime
 To use the App Server, the following is required:
 
-* **NodeJS** - v14.x (except v14.17.2) up to v16.x is officially supported by the Zowe community.
+* **NodeJS** - v16.x up to v18.x is officially supported by the Zowe community.
 
 Plugins may depend upon other technologies, such as Java or ZSS. A plugin's [pluginDefinition](https://docs.zowe.org/stable/extend/extend-desktop/mvd-plugindefandstruct) or README will help you to understand if additional prerequisites are needed for that plugin.
 
@@ -143,7 +145,7 @@ When the App Server has started, one of the messages you will see as bootstrappi
 ### Troubleshooting
 If you encounter an error message saying `No config file found, initializing`, it means that the App Server could not find a configuration file in the expected location.
 
-To fix this issue, you need to create a zowe.yaml file in the following directory: `%USERPROFILE%\.zowe\workspace\app-server\serverConfig`. You can use [this](https://github.com/zowe/zlux-app-server/blob/v2.x/staging/defaults/serverConfig/zowe.yaml) template as a starting point.
+To fix this issue, you need to create a zowe.yaml file in the following directory: `%USERPROFILE%\.zowe\workspace\app-server\serverConfig`. You can use [this](https://github.com/zowe/zlux-app-server/blob/v2.x/staging/defaults/serverConfig/defaults.yaml) template as a starting point.
 
 ### Server Logs
 When the server starts, it writes logs to a text file. On z/OS, Unix, and Linux, the server also logs to the terminal via stdout.

bin/configure.sh

@@ -28,11 +28,6 @@ if [ "$ZWE_components_gateway_enabled" = "true" ]; then
     if [ "${ZWE_RUN_ON_ZOS}" != "true" ]; then
       zss_def_template="zss.apiml_static_reg.yaml.template"
       export ZSS_PORT="${ZWE_components_zss_port}"
-      if [ "${ZWE_components_zss_tls}" != "false" ]; then
-        export ZSS_PROTOCOL=https
-      else
-        export ZSS_PROTOCOL=http
-      fi
 
       if [ -n "${ZWE_STATIC_DEFINITIONS_DIR}" ]; then
         zss_registration_yaml=${ZWE_STATIC_DEFINITIONS_DIR}/zss.apiml_static_reg_yaml_template.${ZWE_CLI_PARAMETER_HA_INSTANCE}.yml
@@ -43,7 +38,6 @@ if [ "$ZWE_components_gateway_enabled" = "true" ]; then
       fi
 
       unset ZSS_PORT
-      unset ZSS_PROTOCOL
     fi
   fi
 fi
@@ -52,12 +46,3 @@ fi
 . ./init/node-init.sh
 cd ../lib
 CONFIG_FILE=$ZWE_CLI_PARAMETER_CONFIG $NODE_BIN initInstance.js
-
-cd ${COMPONENT_HOME}/share/zlux-app-server/bin/init
-if [ "${ZWE_components_app_server_zowe_useConfigmgr}" = "false" ]; then
-  . ./plugins-init.sh  
-elif [ "${ZWE_zowe_useConfigmgr}" = "true" ]; then
-  _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/components/app-server/share/zlux-app-server/bin/init/plugins-init.js"
-else
-  . ./plugins-init.sh
-fi

bin/start.sh

@@ -95,12 +95,6 @@ if [ "$ZWE_components_app_server_dns_lookupOrder" = "ipv6" ]; then
   ZLUX_DNS_ORDER="--dns-result-order=verbatim"
 fi
 
-# not all versions of node support the above (14.18+ generally) so we can just try it to see what happens.
-v4_check=$(${NODE_BIN} ${ZLUX_DNS_ORDER} -e "console.log('success');")
-if [ "${v4_check}" != "success" ]; then
-  ZLUX_DNS_ORDER=
-fi
-
 if [ -z "${ZWED_FLAGS}" ]; then
   ZWED_FLAGS="${ZLUX_DNS_ORDER} --harmony "
 fi

bin/validate.sh

@@ -7,7 +7,7 @@
 # 
 # Copyright Contributors to the Zowe Project.
 
-type node
+result=$(type node)
 if [ "$?" -ne "0" ]; then
   if [ -e "${NODE_HOME}/bin/node" ]; then
     echo "Node found in NODE_HOME"