fix runner init with proxy (#528)

Author: oren-codefresh

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

@@ -134,6 +134,12 @@ const initCmd = new Command({
         .option('set-file', {
             describe: 'Set values for templates from file, example: --set-file Storage.GoogleServiceAccount=/path/to/service-account.json',
         })
+        .option('http-proxy', {
+            describe: 'http proxy to be used in the runner',
+        })
+        .option('https-proxy', {
+            describe: 'https proxy to be used in the runner',
+        })
         .option('verbose', {
             describe: 'Print logs',
         })
@@ -184,6 +190,8 @@ const initCmd = new Command({
             'set-default-runtime': shouldMakeDefaultRe,
             'exec-demo-pipeline': shouldExecutePipeline,
             'env-vars': envVars,
+            'http-proxy': httpProxy,
+            'https-proxy': httpsProxy,
         } = _argv;
 
         if (envVars) {
@@ -197,7 +205,9 @@ const initCmd = new Command({
                 '\nAfter getting the token you may run this command again with the [--token] option or use the \'codefresh auth\' command to create an authenticated context.');
             process.exit(1);
         }
-        let { httpProxy, httpsProxy } = detectProxy();
+        const detectedProxyVars = detectProxy();
+        httpProxy = httpProxy || detectedProxyVars.httpProxy;
+        httpsProxy = httpsProxy || detectedProxyVars.httpsProxy;
         if (noQuestions) {
             // use defaults
             kubeContextName = getKubeContext(kubeConfigPath);
@@ -230,20 +240,24 @@ const initCmd = new Command({
                     validate: value => (value !== undefined && value !== '') || 'Please enter namespace\'s name',
                 });
             }
-            questions.push({
-                type: 'input',
-                name: 'httpProxy',
-                default: httpProxy,
-                message: 'HTTP proxy to be used by runner inside Kubernetes ?',
+            if (httpProxy) {
+                questions.push({
+                    type: 'input',
+                    name: 'httpProxy',
+                    default: httpProxy,
+                    message: 'HTTP proxy to be used by runner inside Kubernetes ?',
+                });
+            }
 
-            });
-            questions.push({
-                type: 'input',
-                name: 'httpsProxy',
-                default: httpsProxy,
-                message: 'HTTPS proxy to be used by runner inside Kubernetes ?',
+            if (httpsProxy) {
+                questions.push({
+                    type: 'input',
+                    name: 'httpsProxy',
+                    default: httpsProxy,
+                    message: 'HTTPS proxy to be used by runner inside Kubernetes ?',
 
-            });
+                });
+            }
 
             if (_.isUndefined(shouldMakeDefaultRe)) {
                 if (!_.get(sdk, 'config.context.isNoAuth') && await isNewAccount()) {

package.json

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