Improve idiomatic installation (#495)

* improved installationPlan

Author: roi-codefresh

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

@@ -42,7 +42,7 @@ class InstallationPlan {
             finishedSteps: finishedSteps || [],
             context: context || {},
         };
-        this.completedSteps = {};
+        this.completedSteps = {}; // used for fast lookup of completed steps
         this.progressReporter = progressReporter;
         this.errHandler = errHandler;
         _ensureDirectory(RUNNER_INSTALLATIONS_PATH);

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

@@ -136,6 +136,7 @@ const initCmd = new Command({
         if (oldInstallationPlan) {
             console.log(colors.cyan('Previous installation state:'));
             oldInstallationPlan.printState();
+            oldInstallationPlan.reset(); // needs to be called after printState()
             const answer = await inquirer.prompt({
                 type: 'confirm',
                 name: 'resumeInstallation',
@@ -254,19 +255,6 @@ const initCmd = new Command({
             shouldExecutePipeline,
         });
 
-        if (token) {
-            // Create a new context and switch to that context
-            const [err] = await to(createContext.handler({
-                apiKey: token,
-                name: INSTALLATION_DEFAULTS.CF_CONTEXT_NAME,
-                url,
-            }));
-            await handleError(err, 'Failed to use the provided token');
-            const config = await getConfigForSdk();
-            await sdk.configure(config);
-            console.log(`A Codefresh context named '${INSTALLATION_DEFAULTS.CF_CONTEXT_NAME}' was added to your "cfconfig" file.`);
-        }
-
         const [, progress] = await to(async () => installationProgress.create(sdk['runner-installation'], {
             options: {
                 kubeContextName,
@@ -293,17 +281,31 @@ const initCmd = new Command({
         _argv['exec-demo-pipeline'] = shouldExecutePipeline;
         installationPlan.addContext('argv', _argv);
 
-        if (skipClusterTest) {
-            console.log('Skipping cluster requirements tests...');
-        } else {
-            installationPlan.addStep({
-                name: 'run cluster acceptance tests',
-                func: runClusterAcceptanceTests,
-                arg: { kubeNamespace, kubeConfigPath },
-                errMessage: 'Failed to run cluster test',
-                installationEvent: installationProgress.events.ACCEPTANCE_TESTS_RAN,
-            });
-        }
+        // create new codefresh auth context
+        installationPlan.addStep({
+            name: 'create new codefresh auth context',
+            func: async () => {
+                await createContext.handler({
+                    apiKey: token,
+                    name: INSTALLATION_DEFAULTS.CF_CONTEXT_NAME,
+                    url,
+                });
+                const config = await getConfigForSdk();
+                await sdk.configure(config);
+                console.log(`A Codefresh context named '${INSTALLATION_DEFAULTS.CF_CONTEXT_NAME}' was added to your "cfconfig" file.`);
+            },
+            condition: token,
+
+        });
+
+        // run cluster acceptance tests
+        installationPlan.addStep({
+            name: 'run cluster acceptance tests',
+            func: runClusterAcceptanceTests,
+            arg: { kubeNamespace, kubeConfigPath },
+            installationEvent: installationProgress.events.ACCEPTANCE_TESTS_RAN,
+            condition: !skipClusterTest,
+        });
 
         // generate new agent name
         installationPlan.addContext('agentName', name);

package.json

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