Cr 1539 add http proxy acceptance test to runner init (#586)

Author: roi-codefresh

lib/interface/cli/commands/hybrid/helper.js

@@ -417,10 +417,24 @@ async function downloadHybridComponents(location) {
     console.log(`Kubernetes registrator installer downloaded successfully ${location}`);
 }
 
-async function runClusterAcceptanceTests({ kubeNamespace, kubeContextName, kubeConfigPath }) {
+async function runClusterAcceptanceTests({
+    apiHost,
+    kubeNamespace,
+    kubeConfigPath,
+    kubeContextName,
+    dockerRegistry,
+    envVars,
+    verbose,
+    valuesFile, // --values
+    setValue, // --set-value
+    setFile, // --set-file
+}) {
     const binLocation = await downloadVeonona();
     const componentRunner = new Runner(binLocation);
     const cmd = ['test', '--log-formtter', DefaultLogFormatter];
+    if (apiHost) {
+        cmd.push(`--api-host=${apiHost}`);
+    }
     if (kubeNamespace) {
         cmd.push('--kube-namespace');
         cmd.push(kubeNamespace);
@@ -433,6 +447,30 @@ async function runClusterAcceptanceTests({ kubeNamespace, kubeContextName, kubeC
         cmd.push('--kube-config-path');
         cmd.push(kubeConfigPath);
     }
+    if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
+        cmd.push('--insecure');
+    }
+    if (dockerRegistry) {
+        cmd.push(`--set-value=DockerRegistry=${dockerRegistry}`);
+    }
+    if (verbose) {
+        cmd.push(`--verbose=${verbose}`);
+    }
+    if (envVars) {
+        envVars.forEach((item) => {
+            const parts = item.split('=');
+            cmd.push(`--set-value=EnvVars.${parts[0]}=${parts[1]}`);
+        });
+    }
+    if (valuesFile) {
+        cmd.push(`--values=${valuesFile}`);
+    }
+    if (setValue) {
+        cmd.push(`--set-value=${setValue}`);
+    }
+    if (setFile) {
+        cmd.push(`--set-file=${setFile}`);
+    }
     await componentRunner.run(components.venona, cmd);
 }
 

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

@@ -232,12 +232,12 @@ const initCmd = new Command({
             values: valuesFile,
             'set-value': setValue,
             'set-file': setFile,
-            'skip-cluster-test': skipClusterTest,
             'app-proxy-ingress-class': appProxyIngressClass,
             'env-vars': envVars,
         } = _argv;
         let {
             yes: noQuestions,
+            'skip-cluster-test': skipClusterTest,
             'kube-context-name': kubeContextName,
             'kube-namespace': kubeNamespace,
             'set-default-runtime': shouldMakeDefaultRe,
@@ -262,19 +262,19 @@ const initCmd = new Command({
             valuesObj = YAML.parse(valuesFileStr);
             noQuestions = true;
 
-            if (!kubeNamespace && valuesObj.Namespace) {
+            if (!kubeNamespace && _.has(valuesObj, 'Namespace')) {
                 kubeNamespace = valuesObj.Namespace;
             }
-            if (!kubeContextName && valuesObj.Context) {
+            if (!kubeContextName && _.has(valuesObj, 'Context')) {
                 kubeContextName = valuesObj.Context;
             }
-            if (!url && valuesObj.CodefreshHost) {
+            if (!url && _.has(valuesObj, 'CodefreshHost')) {
                 url = valuesObj.CodefreshHost;
             }
-            if (!token && valuesObj.Token) {
+            if (!token && _.has(valuesObj, 'Token')) {
                 token = valuesObj.Token;
             }
-            if (!name && valuesObj.AgentId) {
+            if (!name && _.has(valuesObj, 'AgentId')) {
                 name = valuesObj.AgentId;
             }
             if (typeof _.get(valuesObj, 'Monitor.Enabled') !== 'undefined') {
@@ -301,6 +301,9 @@ const initCmd = new Command({
             if (_.has(valuesObj, 'DockerRegistry') && !dockerRegistry) {
                 dockerRegistry = _.get(valuesObj, 'DockerRegistry');
             }
+            if (_.has(valuesObj, 'SkipClusterTest') && _.isUndefined(skipClusterTest)) {
+                skipClusterTest = _.get(valuesObj, 'SkipClusterTest');
+            }
         }
         if (!url) {
             url = DEFAULTS.URL;
@@ -480,15 +483,25 @@ const initCmd = new Command({
         installationPlan.addContext('argv', _argv);
 
         // run cluster acceptance tests
-        if (!_.get(valuesObj, 'SkipClusterTest')) {
-            installationPlan.addStep({
-                name: 'run cluster acceptance tests',
-                func: runClusterAcceptanceTests,
-                arg: { kubeNamespace, kubeConfigPath, kubeContextName },
-                installationEvent: installationProgress.events.ACCEPTANCE_TESTS_RAN,
-                condition: !skipClusterTest,
-            });
-        }
+        installationPlan.addStep({
+            name: 'run cluster acceptance tests',
+            func: runClusterAcceptanceTests,
+            arg: {
+                apiHost: sdk.config.context.url,
+                kubeNamespace,
+                kubeConfigPath,
+                kubeContextName,
+                dockerRegistry,
+                envVars,
+                verbose,
+                valuesFile,
+                setValue,
+                setFile,
+            },
+            installationEvent: installationProgress.events.ACCEPTANCE_TESTS_RAN,
+            condition: !skipClusterTest,
+        });
+
         // generate new agent name
         installationPlan.addContext('agentName', name ? name.trim() : name);
         installationPlan.addStep({

package.json

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