Saas 7146 - runner upgrade (#475)

* improved runner delete cmd
* improved runner init cmd
* added runner upgrade cmd

Author: roi-codefresh

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

@@ -0,0 +1,28 @@
+const sdk = require('../../../../logic/sdk');
+const _ = require('lodash');
+
+async function getNewAgentName(kubeContextName, kubeNamespace, agents) {
+    const defaultName = `${kubeContextName}_${kubeNamespace}`;
+    if (!agents) {
+        // eslint-disable-next-line no-param-reassign
+        agents = await sdk.agents.list({ });
+    }
+    let name;
+
+    if (!_.isArray(agents) || !_.find(agents, a => a.name === defaultName)) {
+        name = defaultName; // use the default name if there are no collisions
+    } else {
+        const agentsNames = new Set(_.map(agents, a => a.name)); // for fast lookup
+        let i = 1;
+        while (agentsNames.has(`${defaultName}_${i}`)) {
+            i += 1;
+        }
+        name = `${defaultName}_${i}`;
+    }
+
+    return name;
+}
+
+module.exports = {
+    getNewAgentName,
+};

lib/interface/cli/commands/agent/install.cmd.js

@@ -7,29 +7,10 @@ const { getKubeContext } = require('../../helpers/kubernetes');
 const ProgressEvents = require('../../helpers/progressEvents');
 const cliProgress = require('cli-progress');
 const colors = require('colors');
-const _ = require('lodash');
+const { getNewAgentName } = require('./helper');
 
 const defaultNamespace = 'codefresh';
 
-async function newAgentName(kubeContextName, kubeNamespace) {
-    const defaultName = `${kubeContextName}_${kubeNamespace}`;
-    const agents = await sdk.agents.list({ });
-    let name;
-
-    if (!_.isArray(agents) || !_.find(agents, a => a.name === defaultName)) {
-        name = defaultName; // use the default name if there are no collisions
-    } else {
-        const agentsNames = new Set(_.map(agents, a => a.name)); // for fast lookup
-        let i = 1;
-        while (agentsNames.has(`${defaultName}_${i}`)) {
-            i += 1;
-        }
-        name = `${defaultName}_${i}`;
-    }
-
-    return name;
-}
-
 const installAgentCmd = new Command({
     root: false,
     parent: installRoot,
@@ -139,7 +120,7 @@ const installAgentCmd = new Command({
         }
 
         if (!token) { // Create an agent if not provided
-            name = name || await newAgentName(kubeContextName, kubeNamespace);
+            name = name || await getNewAgentName(kubeContextName, kubeNamespace);
             agent = await sdk.agents.create({ name });
             // eslint-disable-next-line prefer-destructuring
             token = agent.token;
@@ -194,7 +175,7 @@ const installAgentCmd = new Command({
             skipClusterTest,
             verbose,
             agentId: name,
-            terminateProcess: !installRuntime,
+            terminateProcess,
             events,
         });
         if (agentInstallStatusCode !== 0) {

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

@@ -2,7 +2,7 @@
 const Command = require('../../Command');
 const runnerRoot = require('../root/runner.cmd');
 const inquirer = require('inquirer');
-const { getAllKubeContexts, getKubeContext, getAllNamespaces } = require('../../helpers/kubernetes');
+const { getAllKubeContexts, getKubeContext } = require('../../helpers/kubernetes');
 const unInstallRuntime = require('../runtimeEnvironments/uninstall.cmd');
 const unInstallAgent = require('../agent/uninstall.cmd');
 const unInstallMonitor = require('../monitor/uninstall.cmd');
@@ -11,54 +11,11 @@ const DEFAULTS = require('../../defaults');
 const sdk = require('../../../../logic/sdk');
 const _ = require('lodash');
 const { to } = require('./../../../../logic/cli-config/errors/awaitTo');
-const { prettyError } = require('../../../../logic/cli-config/errors/helpers');
+const { createErrorHandler, getRelatedAgents, getRelatedNamespaces } = require('./helper');
 
 const defaultNamespace = 'codefresh';
-
-async function handleError(error, message) {
-    if (!error) {
-        return;
-    }
-
-    console.log(`${colors.red('Error:')} ${message}: ${prettyError(error)}`);
-    console.log(colors.green(`If you had any issues with the uninstallation process please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`));
-    process.exit(1);
-}
-
-// Try to get the most relevant namespaces
-async function getRelatedNamespaces(kubeConfigPath, kubeContextName, runtimes) {
-    const [, namespacesOnCluster] = await to(getAllNamespaces(kubeConfigPath, kubeContextName));
-    const nsOnCluster = new Set(namespacesOnCluster || []);
-
-    return _(runtimes)
-        .filter(re => nsOnCluster.has(_.get(re, 'runtimeScheduler.cluster.namespace')))
-        .map(re => _.get(re, 'runtimeScheduler.cluster.namespace'))
-        .uniq()
-        .value();
-}
-
-async function getRelatedAgents(kubeNamespace, runtimes) {
-    const [listAgentsErr, agents] = await to(sdk.agents.list({}));
-    await handleError(listAgentsErr, 'Failed to get agents');
-
-    const relatedREs = new Set();
-    _.forEach(runtimes, (r) => {
-        if (_.get(r, 'runtimeScheduler.cluster.namespace') === kubeNamespace) {
-            relatedREs.add(r.metadata.name);
-        }
-    });
-
-    const relatedAgents = [];
-    _.forEach(agents, (a) => {
-        _.forEach(_.get(a, 'runtimes', []), (r) => {
-            if (relatedREs.has(r)) {
-                relatedAgents.push(a);
-            }
-        });
-    });
-
-    return relatedAgents;
-}
+const openIssueMessage = `If you had any issues with the uninstallation process please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`;
+const handleError = createErrorHandler(openIssueMessage);
 
 const deleteCmd = new Command({
     root: false,
@@ -105,6 +62,8 @@ const deleteCmd = new Command({
 
         const [listReErr, runtimes] = await to(sdk.runtimeEnvs.list({ }));
         await handleError(listReErr, 'Failed to get runtime environments');
+        const [listAgentsErr, agents] = await to(sdk.agents.list({ }));
+        await handleError(listAgentsErr, 'Failed to get agents');
 
         console.log(colors.green('This uninstaller will guide you through the runner uninstallation process'));
 
@@ -124,7 +83,8 @@ const deleteCmd = new Command({
         }
 
         if (!kubeNamespace) {
-            const relatedNamespaces = await getRelatedNamespaces(kubeConfigPath, kubeContextName, runtimes);
+            const [getNamespacesErr, relatedNamespaces] = await to(getRelatedNamespaces(kubeConfigPath, kubeContextName, runtimes));
+            handleError(getNamespacesErr, 'Could not get namespaces in the selected kubernetes cluster');
             let answer;
             if (!relatedNamespaces.length) {
                 answer = await inquirer.prompt({
@@ -147,18 +107,18 @@ const deleteCmd = new Command({
             kubeNamespace = answer.namespace;
         }
 
-        const agents = await getRelatedAgents(kubeNamespace, runtimes);
-        if (!agents.length) {
-            console.log('No agents related to the specified kubernetes cluster and namespace were found');
-            process.exit(1);
-        }
-
         if (!agentName) {
+            const relatedAgents = await getRelatedAgents(kubeNamespace, runtimes, agents, handleError);
+            let agentsChoices = relatedAgents;
+            if (!relatedAgents.length) {
+                console.log(colors.yellow('No agents related to the specified kubernetes cluster and namespace were found, displaying all agents'));
+                agentsChoices = agents;
+            }
             const answer = await inquirer.prompt({
                 type: 'list',
                 name: 'name',
                 message: 'Agent name to uninstall',
-                choices: agents,
+                choices: agentsChoices.map(a => `${a.name}\t${a.runtimes.length ? `(attached runtimes: ${a.runtimes.join(', ')})` : ''}`),
             });
             agentName = answer.name;
         }
@@ -180,19 +140,39 @@ const deleteCmd = new Command({
 3. Agent name: ${colors.cyan(agentName)}
 `);
 
-        if (agent.runtimes.length === 1) {
+        const attachedRuntimes = agent.runtimes || [];
+
+        // prompt confirmation message
+        console.log(`${colors.red('This process will attempt to delete the following:')}`);
+        console.log(`\u2022 Codefresh runner with the name "${colors.cyan(agentName)}"`);
+        attachedRuntimes.forEach((reName) => { console.log(`\u2022 Codefresh runtime with the name "${colors.cyan(reName)}"`); });
+        console.log('\u2022 Codefresh runner monitor component');
+        console.log(`* The kubernetes namespace "${colors.cyan(kubeNamespace)}" will ${colors.underline('not')} be deleted\n`);
+
+        const answer = await inquirer.prompt({
+            type: 'confirm',
+            name: 'deletionConfirmed',
+            default: false,
+            message: 'Are you sure you want to delete all of the above? (default is NO)',
+        });
+        if (!answer.deletionConfirmed) {
+            console.log('Deletion process aborted, exiting...');
+            process.exit(1);
+        }
+
+        attachedRuntimes.forEach(async (reName) => {
             const uninstallRuntimeOptions = {
                 'agent-name': agentName,
                 'runtime-kube-namespace': kubeNamespace,
                 'runtime-kube-context-name': kubeContextName,
                 'agent-kube-context-name': kubeContextName,
                 'agent-kube-namespace': kubeNamespace,
-                name: agent.runtimes[0],
+                name: reName,
                 terminateProcess: false,
             };
             const [uninstallReErr] = await to(unInstallRuntime.handler(uninstallRuntimeOptions));
-            handleError(uninstallReErr, 'Failed to uninstall runtime-environment');
-        }
+            handleError(uninstallReErr, `Failed to uninstall runtime-environment "${colors.cyan(reName)}"`);
+        });
 
         const uninstallAgentOptions = {
             'kube-namespace': kubeNamespace,