Skip to content

Commit

Permalink
Zowe Suite v2.17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zowe-robot authored Jul 2, 2024
2 parents 0a5b69a + 267b7bd commit 62e47a6
Show file tree
Hide file tree
Showing 12 changed files with 354 additions and 413 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

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.

Expand Down
15 changes: 0 additions & 15 deletions bin/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,7 +38,6 @@ if [ "$ZWE_components_gateway_enabled" = "true" ]; then
fi

unset ZSS_PORT
unset ZSS_PROTOCOL
fi
fi
fi
Expand All @@ -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
221 changes: 0 additions & 221 deletions bin/init/plugins-init.js

This file was deleted.

51 changes: 0 additions & 51 deletions bin/init/plugins-init.sh

This file was deleted.

6 changes: 0 additions & 6 deletions bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 14 additions & 1 deletion defaults/serverConfig/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ components:
debug: false
node:
hostname: "${{ function a(){ if (process.env.ZWE_INTERNAL_HOST) { return process.env.ZWE_INTERNAL_HOST; } else if (process.env.ZWE_haInstance_hostname) { return process.env.ZWE_haInstance_hostname; } else { return undefined; } }; a() }}"
http: "${{ function a() {
if (components['app-server'].zowe?.network?.server?.tls?.attls === true) {
return { 'port': components['app-server'].port || Number(7556)};
} else if (zowe.network?.server?.tls?.attls === true) {
return { 'port': components['app-server'].port || Number(7556)};
} else {
return undefined;
} };
a() }}"
https:
ipAddresses: "${{ function a(){
let addresses;
Expand All @@ -33,7 +42,11 @@ components:
} else { return addresses } };
a() }}"
port: "${{ function a(){
if (process.env.ZWED_SERVER_HTTPS_PORT) {
if (components['app-server'].zowe?.network?.server?.tls?.attls === true) {
return undefined;
} else if (zowe?.network?.server?.tls?.attls === true) {
return undefined;
} else if (process.env.ZWED_SERVER_HTTPS_PORT) {
return Number(process.env.ZWED_SERVER_HTTPS_PORT);
} else if (components['app-server'].port) {
return components['app-server'].port;
Expand Down
Loading

0 comments on commit 62e47a6

Please sign in to comment.