Merge pull request #303 from zowe/chore/v2/attls-https-zss

FIx zss static registration for containers

CHANGELOG.md

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

zss.apiml_static_reg.yaml.template

@@ -4,7 +4,7 @@ services:
     description: 'Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs. It contains services for essential z/OS abilities such as working with files, datasets, and ESMs, but is also extensible by REST and Websocket "Dataservices" which are optionally present in App Framework "Plugins".'
     catalogUiTileId: zss
     instanceBaseUrls:
-      - ${ZSS_PROTOCOL}://${ZWED_agent_host}:${ZSS_PORT}/
+      - https://${ZWED_agent_host}:${ZSS_PORT}/
     homePageRelativeUrl:
     routedServices:
       - gatewayUrl: api/v1
@@ -17,4 +17,4 @@ services:
 catalogUiTiles:
   zss:
     title: Zowe System Services (ZSS)
-    description:  Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs.
+    description:  Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs.