added --force flag to runner delete flow (#491)

* added --force flag to runner delete flow

Author: roi-codefresh

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

@@ -11,12 +11,41 @@ const DEFAULTS = require('../../defaults');
 const sdk = require('../../../../logic/sdk');
 const _ = require('lodash');
 const { to } = require('./../../../../logic/cli-config/errors/awaitTo');
-const { createErrorHandler, getRelatedAgents, getRelatedNamespaces } = require('./helper');
+const {
+    createErrorHandler,
+    getRelatedAgents,
+    getRelatedNamespaces,
+    drawCodefreshFiglet,
+} = require('./helper');
 
 const defaultNamespace = 'codefresh';
 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);
 
+async function promptConfirmationMessage({
+    agentName,
+    kubeNamespace,
+    attachedRuntimes,
+}) {
+    // 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);
+    }
+} 
+
 const deleteCmd = new Command({
     root: false,
     parent: runnerRoot,
@@ -38,6 +67,11 @@ const deleteCmd = new Command({
             describe: 'Codefresh system custom url',
             default: DEFAULTS.URL,
         })
+        .option('force', {
+            describe: 'Run the delete operation without asking to confirm (use with caution!)',
+            alias: 'f',
+            type: Boolean,
+        })
         .option('kube-context-name', {
             describe: 'Name of the kubernetes context from which the Codefresh Agent and Runtime should be removed',
         })
@@ -53,6 +87,7 @@ const deleteCmd = new Command({
     handler: async (argv) => {
         const {
             'kube-config-path': kubeConfigPath,
+            force,
         } = argv;
         let {
             'kube-context-name': kubeContextName,
@@ -146,22 +181,8 @@ const deleteCmd = new Command({
 
         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);
+        if (!force) {
+            await promptConfirmationMessage({ agentName, kubeNamespace, attachedRuntimes });
         }
 
         attachedRuntimes.forEach(async (reName) => {
@@ -197,6 +218,7 @@ const deleteCmd = new Command({
 
         console.log('Successfully uninstalled Codefresh Runner');
         console.log(colors.green(`\nIf you had any issues with the uninstallation process please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`));
+        await drawCodefreshFiglet();
         process.exit(); // TODO : This is not needed - needed to be fixed
     },
 });

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

@@ -10,6 +10,7 @@ const { getAllNamespaces } = require('../../helpers/kubernetes');
 const { followLogs } = require('../../helpers/logs');
 const ProgressEvents = require('../../helpers/progressEvents');
 const cliProgress = require('cli-progress');
+const figlet = require('figlet');
 
 const INSTALLATION_DEFAULTS = {
     NAMESPACE: 'codefresh',
@@ -256,6 +257,18 @@ function createProgressBar() {
     return runtimeEvents;
 }
 
+function drawCodefreshFiglet() {
+    return new Promise((resolve) => {
+        figlet('CODEFRESH', (err, data) => {
+            if (err) {
+                return;
+            }
+            console.log(data);
+            resolve();
+        });
+    });
+}
+
 module.exports = {
     getRelatedAgents,
     createErrorHandler,
@@ -268,6 +281,7 @@ module.exports = {
     executeTestPipeline,
     createProgressBar,
     getTestPipelineLink,
+    drawCodefreshFiglet,
     INSTALLATION_DEFAULTS,
     DefaultLogFormatter,
 };

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

@@ -3,7 +3,6 @@ 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');
@@ -22,6 +21,7 @@ const {
     createTestPipeline,
     executeTestPipeline,
     updateTestPipelineRuntime,
+    drawCodefreshFiglet,
     INSTALLATION_DEFAULTS,
 } = require('./helper');
 const {
@@ -367,15 +367,7 @@ const initCmd = new Command({
         console.log(colors.green(`\nDocumenation link: ${colors.blue('https://codefresh.io/docs/docs/enterprise/codefresh-runner/#codefresh-runner-preview-release')}`));
         console.log(colors.green(`If you had any issues with the installation please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`));
         await to(progressReporter.report(installationProgress.events.FINISHED, installationProgress.status.SUCCESS));
-        await new Promise((resolve) => {
-            figlet('CODEFRESH', (err, data) => {
-                if (err) {
-                    return;
-                }
-                console.log(data);
-                resolve();
-            });
-        });
+        await drawCodefreshFiglet();
         process.exit(); // TODO : This is not needed - needed to be fixed
     },
 });

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

@@ -14,6 +14,7 @@ const {
     createErrorHandler,
     getRuntimesWithVersions,
     getRuntimeVersion,
+    drawCodefreshFiglet,
 } = require('./helper');
 const { migrate, upgrade } = require('./migration');
 
@@ -168,6 +169,7 @@ const upgradeCmd = new Command({
 
         console.log(colors.green(`\nSuccessfully ${shouldDoMigration ? 'migrated' : 'upgraded'} your Codefresh Runner to the latest version`));
         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')}`));
+        await drawCodefreshFiglet();
         process.exit(); // TODO : This is not needed - needed to be fixed
     },
 });

package.json

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