Revert "Saas 7290 (#484)" (#488)

This reverts commit 19f0a56.

Author: Oleg Sucharevich

lib/binary/components.js

@@ -69,6 +69,9 @@ const installAgentCmd = new Command({
         .option('storage-class-name', {
             describe: 'Set a name of your custom storage class, note: this will not install volume provisioning components',
         })
+        .option('skip-cluster-test', {
+            describe: 'Do not run cluster acceptance test',
+        })
         .option('agent-kube-context-name', {
             describe: 'Agent kubernetes context (on attach)',
         })
@@ -93,6 +96,7 @@ const installAgentCmd = new Command({
             'skip-version-check': skipVersionCheck,
             'install-runtime': installRuntime,
             'make-default-runtime': shouldMakeDefaultRe,
+            'skip-cluster-test': skipClusterTest,
             'storage-class-name': storageClassName,
             verbose,
             terminateProcess,
@@ -169,6 +173,7 @@ const installAgentCmd = new Command({
             venonaVersion,
             kubeConfigPath,
             skipVersionCheck,
+            skipClusterTest,
             verbose,
             agentId: name,
             terminateProcess,
@@ -187,6 +192,7 @@ const installAgentCmd = new Command({
                 'attach-runtime': true,
                 'restart-agent': true,
                 'make-default-runtime': shouldMakeDefaultRe,
+                'skip-cluster-test': skipClusterTest,
                 'storage-class-name': storageClassName,
                 'set-value': setValue,
                 'set-file': setFile,

lib/binary/downloader.js

@@ -2,30 +2,26 @@
 const Command = require('../../Command');
 const runnerRoot = require('../root/runner.cmd');
 const inquirer = require('inquirer');
-const colors = require('colors');
-const figlet = require('figlet');
-const _ = require('lodash');
-const cliProgress = require('cli-progress');
 const { getAllKubeContexts, getKubeContext, getAllNamespaces } = require('../../helpers/kubernetes');
 const installAgent = require('../agent/install.cmd');
 const installMonitoring = require('../monitor/install.cmd');
 const createContext = require('../auth/create-context.cmd');
 const getAgents = require('../agent/get.cmd');
 const { getConfigForSdk } = require('../../commad-line-interface');
+const colors = require('colors');
 const DEFAULTS = require('../../defaults');
 const sdk = require('../../../../logic/sdk');
+const _ = require('lodash');
 const installationProgress = require('./installation-process');
 const { to } = require('./../../../../logic/cli-config/errors/awaitTo');
-const { createErrorHandler, DefaultLogFormatter } = require('./helper');
+const { createErrorHandler } = require('./helper');
 const {
     getTestPipeline,
     createTestPipeline,
     executeTestPipeline,
     INSTALLATION_DEFAULTS,
 } = require('./helper');
-const {
-    components, Runner, Downloader, CommonProgressFormat,
-} = require('./../../../../binary');
+const figlet = require('figlet');
 
 const handleError = createErrorHandler(`\nIf you had any issues with the installation please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`);
 
@@ -117,10 +113,6 @@ const initCmd = new Command({
             alias: 'y',
             type: 'boolean',
         })
-        .option('skip-cluster-test', {
-            describe: 'Do not test given kubeconfig context to have all the required permission',
-            type: 'boolean',
-        })
         .option('set-default-runtime', {
             describe: 'Set this as the default runtime environment for your Codefresh account',
             type: 'boolean',
@@ -162,7 +154,6 @@ const initCmd = new Command({
             token,
             'set-value': setValue,
             'set-file': setFile,
-            'skip-cluster-test': skipClusterTest,
         } = argv;
         let {
             'kube-context-name': kubeContextName,
@@ -271,33 +262,6 @@ const initCmd = new Command({
 
         const progressReporter = installationProgress.buildReporter(sdk['runner-installation'], progress);
 
-        const downloader = new Downloader({
-            progress: new cliProgress.SingleBar(
-                {
-                    stopOnComplete: true,
-                    format: CommonProgressFormat,
-                },
-                cliProgress.Presets.shades_classic,
-            ),
-        });
-        await downloader.download(components.venona);
-        const componentRunner = new Runner();
-
-        if (skipClusterTest) {
-            console.log('Skipping cluster requirements tests.');
-        } else {
-            const cmd = ['test', '--log-formtter', DefaultLogFormatter];
-            if (kubeNamespace) {
-                cmd.push('--kube-namespace');
-                cmd.push(kubeNamespace);
-            }
-            if (kubeConfigPath) {
-                cmd.push('--kube-config-path');
-                cmd.push(kubeConfigPath);
-            }
-            const [err] = await to(componentRunner.run(components.venona, cmd));
-            await handleError(err, 'Failed to run cluster test');
-        }
 
         if (token) {
             // Create a new context and switch to that context

lib/binary/index.js

@@ -110,6 +110,9 @@ const installRuntimeCmd = new Command({
         .option('make-default-runtime', {
             describe: 'should all pipelines run on the this runtime (default is false)',
         })
+        .option('skip-cluster-test', {
+            describe: 'Do not run cluster acceptance test',
+        })
         .option('verbose', {
             describe: 'Print logs',
         }),
@@ -130,6 +133,7 @@ const installRuntimeCmd = new Command({
             'cluster-service-account': clusterServiceAccount,
             'make-default-runtime': shouldMakeDefaultRe,
             terminateProcess,
+            'skip-cluster-test': skipClusterTest,
         } = argv;
 
         let {
@@ -254,6 +258,7 @@ const installRuntimeCmd = new Command({
             setFile,
             terminateProcess: !attachRuntime,
             events: runtimeEvents,
+            skipClusterTest,
             storageClassName,
             logFormatting: DefaultLogFormatter,
         });