Merge pull request #438 from zowe/users/jstruga/merge-staging-to-rc

merge staging to rc
zowe · Jul 14, 2022 · 0e38457 · 0e38457
2 parents 11a3472 + fc73745
commit 0e38457
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml
@@ -64,7 +64,7 @@ jobs:
       - name: '[Prep 2] Setup Node'
         uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 16.15.0
 
       - name: '[Prep 3] Setup jFrog CLI'
         uses: jfrog/setup-jfrog-cli@v2

diff --git a/lib/apiml.js b/lib/apiml.js
@@ -260,7 +260,6 @@ ApimlConnector.prototype = {
 
   registerMainServerInstance() {
     const overrideOptions = Object.assign({},this.tlsOptions);
-    //TODO FIXME We should not be referring to env var this far in the code.
     const zweVerifyCerts = process.env['ZWE_zowe_verifyCertificates'];
     if (!zweVerifyCerts || zweVerifyCerts=='DISABLED') {
       //Keeping these certs causes an openssl error 46, unknown cert error in a dev environment

diff --git a/lib/util.js b/lib/util.js
@@ -422,7 +422,7 @@ module.exports.makeRemoteUrl = function(destination, req, serverConfig) {
   if (destination.includes('ZWE_EXTERNAL_PORT')) {
     if (process.env.ZWE_zowe_externalPort) {
       zoweExternalPort = process.env.ZWE_zowe_externalPort;
-    } if (process.env.ZWE_EXTERNAL_PORT) {
+    } else if (process.env.ZWE_EXTERNAL_PORT) {
       zoweExternalPort = process.env.ZWE_EXTERNAL_PORT;
     } else if (serverConfig.node.mediationLayer && serverConfig.node.mediationLayer.server && serverConfig.node.mediationLayer.server.gatewayPort) {
       zoweExternalPort = serverConfig.node.mediationLayer.server.gatewayPort;