app-proxy-fixes (#702)

Author: roi-codefresh

lib/interface/cli/commands/hybrid/init.cmd.js

@@ -63,6 +63,7 @@ function printInstallationOptionsSummary({
     noProxy,
     appProxy,
     appProxyHost,
+    appProxyPathPrefix,
     dryRun,
     shouldUseHelm,
 }) {
@@ -77,7 +78,7 @@ function printInstallationOptionsSummary({
     `;
 
     if (appProxy) {
-        summary += `7. App-Proxy hostname: ${colors.cyan(appProxyHost)}\n`;
+        summary += `7. App-Proxy address: ${colors.cyan(`https://${appProxyHost}${appProxyPathPrefix || ''}`)}\n`;
     }
     if (dryRun) {
         summary += '**** running in dry-run mode ****';
@@ -425,10 +426,11 @@ const initCmd = new Command({
             const answers = await inquirer.prompt(questions);
             kubeContextName = kubeContextName || answers.context;
             kubeNamespace = kubeNamespace || answers.namespace;
+            appProxyHost = appProxyHost || answers.appProxyHost;
             shouldMakeDefaultRe = _.isUndefined(shouldMakeDefaultRe) ? answers.shouldMakeDefaultRe : shouldMakeDefaultRe;
             shouldExecutePipeline = _.isUndefined(shouldExecutePipeline) ? answers.shouldExecutePipeline : shouldExecutePipeline;
             // eslint-disable-next-line object-curly-newline
-            ({ httpProxy, httpsProxy, noProxy, appProxyHost } = answers);
+            ({ httpProxy, httpsProxy, noProxy } = answers);
         }
 
         printInstallationOptionsSummary({
@@ -441,6 +443,7 @@ const initCmd = new Command({
             noProxy,
             appProxy,
             appProxyHost,
+            appProxyPathPrefix,
             dryRun,
             shouldUseHelm,
         });
@@ -736,6 +739,7 @@ const initCmd = new Command({
             condition: !shouldUseHelm,
         });
 
+        // install app-proxy
         installationPlan.addStep({
             name: 'install app-proxy',
             func: async () => {
@@ -755,8 +759,6 @@ const initCmd = new Command({
                     appProxyIngressClass,
                     dryRun,
                 });
-                const appProxyUrl = `https://${appProxyHost}${appProxyPathPrefix || ''}`;
-                installationPlan.addContext('appProxyIP', `${appProxyUrl}`);
             },
             installationEvent: installationProgress.events.APP_PROXY_INSTALLED,
             condition: !!appProxy && !shouldUseHelm,
@@ -771,19 +773,13 @@ const initCmd = new Command({
                 const re = await sdk.runtimeEnvs.get({ name: reName });
                 const body = {
                     appProxy: {
-                        externalIP: installationPlan.getContext('appProxyIP'),
+                        externalIP: `https://${appProxyHost}${appProxyPathPrefix || ''}`,
                     },
                 };
                 await sdk.runtimeEnvs.update({ name: reName }, _.merge(re, body));
                 console.log(`Runtime environment "${colors.cyan(reName)}" has been updated with the app proxy`);
             },
-            condition: async () => {
-                if (shouldUseHelm) {
-                    return false;
-                }
-
-                return installationPlan.getContext('appProxyIP');
-            },
+            condition: !!appProxy && !!appProxyHost,
         });
 
         // update agent with new runtime

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.75.32",
+  "version": "0.75.34",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,