Some fixes

CHANGELOG.md

@@ -3,7 +3,8 @@
 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)
+- 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

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

defaults/serverConfig/defaults.yaml

@@ -123,9 +123,7 @@ components:
                            return zowe.externalDomains[0] } };
                      a() }}'
           discoveryUrls: '${{ function a() {
-                              if (process.env.ZWE_RUN_IN_CONTAINER=="true" && process.env.ZWE_GATEWAY_HOST) {
-                                return ["https://"+process.env.ZWE_GATEWAY_HOST+":"+components.discovery.port+"/eureka/"];
-                              } else if (process.env.ZWE_DISCOVERY_SERVICES_LIST) {
+                              if (process.env.ZWE_DISCOVERY_SERVICES_LIST) {
                                 return process.env.ZWE_DISCOVERY_SERVICES_LIST.split(",");
                               } else {
                                 return ["https://"+zowe.externalDomains[0]+":"+components.discovery.port+"/eureka/"] } };

lib/initInstance.js

@@ -11,6 +11,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const YAML = require('yaml');
 const argParser = require('../../zlux-server-framework/utils/argumentParser');
 const mergeUtils = require('../../zlux-server-framework/utils/mergeUtils');
 const yamlConfig = require('../../zlux-server-framework/utils/yamlConfig');