Saas 6077 (#416)

* support progress (un)install/install agent/runtime

Author: oren-codefresh

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

@@ -4,6 +4,8 @@ const installRoot = require('../root/install.cmd');
 const { sdk } = require('../../../../logic');
 const installRuntimeCmd = require('../runtimeEnvironments/install.cmd');
 const { getKubeContext } = require('../../helpers/kubernetes');
+const ProgressEvents = require('../../helpers/progressEvents');
+const cliProgress = require('cli-progress');
 
 const installAgentCmd = new Command({
     root: false,
@@ -107,6 +109,20 @@ const installAgentCmd = new Command({
             name = data.name;
         }
         const apiHost = sdk.config.context.url;
+        const events = new ProgressEvents();
+        const format = 'downloading [{bar}] {percentage}% | {value}/{total}'; 
+        const progressBar = new cliProgress.SingleBar({ stopOnComplete: true, format }, cliProgress.Presets.shades_classic);
+        let totalSize;
+        events.onStart((size) => {
+            progressBar.start(size, 0);
+            totalSize = size;
+        });
+        events.onProgress((progress) => {
+            progressBar.update(progress);
+            if (progress >= totalSize) {
+                console.log('\n');
+            }
+        });
         const agentInstallStatusCode = await sdk.agents.install({
             apiHost,
             kubeContextName,
@@ -123,6 +139,7 @@ const installAgentCmd = new Command({
             verbose,
             agentId: name,
             terminateProcess: !installRuntime,
+            events,
         });
         if (agentInstallStatusCode !== 0) {
             throw new Error(`\nAgent installation failed with code ${agentInstallStatusCode}`);

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

@@ -4,6 +4,8 @@ const deleteAgent = require('../agent/delete.cmd');
 const unInstallRoot = require('../root/uninstall.cmd');
 const { sdk } = require('../../../../logic');
 const { getKubeContext } = require('../../helpers/kubernetes');
+const ProgressEvents = require('../../helpers/progressEvents');
+const cliProgress = require('cli-progress');
 
 
 const unInstallAgentCmd = new Command({
@@ -51,12 +53,28 @@ const unInstallAgentCmd = new Command({
             throw new Error('Name is a mandatory parameter');
         }
 
+        const events = new ProgressEvents();
+        const format = 'downloading [{bar}] {percentage}% | {value}/{total}';
+        const progressBar = new cliProgress.SingleBar({ stopOnComplete: true, format }, cliProgress.Presets.shades_classic);
+        let totalSize;
+        events.onStart((size) => {
+            progressBar.start(size, 0);
+            totalSize = size;
+        });
+        events.onProgress((progress) => {
+            progressBar.update(progress);
+            if (progress >= totalSize) {
+                console.log('\n');
+            }
+        });
+
 
         const exitCode = await sdk.agents.unInstall({
             kubeContextName,
             kubeNamespace,
             kubeConfigPath,
             terminateProcess: false,
+            events,
         });
         if (exitCode === 0) {
             await deleteAgent.handler({ name, id: name });

lib/interface/cli/commands/runtimeEnvironments/attach.cmd.js

@@ -2,6 +2,8 @@
 const _ = require('lodash');
 const Command = require('../../Command');
 const { sdk } = require('../../../../logic');
+const ProgressEvents = require('../../helpers/progressEvents');
+const cliProgress = require('cli-progress');
 
 
 const attachAgentToRuntime = async (agent, runtime) => {
@@ -93,6 +95,20 @@ const attachRuntimeCmd = new Command({
 
         // call venonactl to attach
 
+        const events = new ProgressEvents();
+        const format = 'downloading [{bar}] {percentage}% | {value}/{total}';
+        const progressBar = new cliProgress.SingleBar({ stopOnComplete: true, format }, cliProgress.Presets.shades_classic);
+        let totalSize;
+        events.onStart((size) => {
+            progressBar.start(size, 0);
+            totalSize = size;
+        });
+        events.onProgress((progress) => {
+            progressBar.update(progress);
+            if (progress >= totalSize) {
+                console.log('\n');
+            }
+        });
         await sdk.runtime.attach({
             kubeContextName,
             kubeNamespace,
@@ -104,6 +120,7 @@ const attachRuntimeCmd = new Command({
             verbose,
             restartAgent,
             terminateProcess: false,
+            events,
         });
         if (!restartAgent) {
             console.log('Please restart agent\'s pod in order that changes will take effect');

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

@@ -4,6 +4,8 @@ const { sdk } = require('../../../../logic');
 const attachRuntimeCmd = require('./attach.cmd');
 const installRoot = require('../root/install.cmd');
 const { getKubeContext } = require('../../helpers/kubernetes');
+const ProgressEvents = require('../../helpers/progressEvents');
+const cliProgress = require('cli-progress');
 
 
 const _getAgentData = async (token) => {
@@ -137,6 +139,21 @@ const installRuntimeCmd = new Command({
         console.log(`Runtime envrionment ${runtimeName} was created`);
         // install RE on cluster
 
+        const events = new ProgressEvents();
+        const format = 'downloading [{bar}] {percentage}% | {value}/{total}';
+        const progressBar = new cliProgress.SingleBar({ stopOnComplete: true, format }, cliProgress.Presets.shades_classic);
+        let totalSize;
+        events.onStart((size) => {
+            progressBar.start(size, 0);
+            totalSize = size;
+        });
+        events.onProgress((progress) => {
+            progressBar.update(progress);
+            if (progress >= totalSize) {
+                console.log('\n');
+            }
+        });
+
         const installRuntimeExitCode = await sdk.runtime.install({
             apiHost,
             name: runtimeName,
@@ -149,6 +166,7 @@ const installRuntimeCmd = new Command({
             kubeConfigPath,
             verbose,
             terminateProcess: !attachRuntime,
+            events,
         });
         // attach RE to agent in codefresh
 

lib/interface/cli/commands/runtimeEnvironments/uninstall.cmd.js

@@ -4,6 +4,8 @@ const unInstallRoot = require('../root/uninstall.cmd');
 const { sdk } = require('../../../../logic');
 const { getKubeContext } = require('../../helpers/kubernetes');
 const _ = require('lodash');
+const ProgressEvents = require('../../helpers/progressEvents');
+const cliProgress = require('cli-progress');
 
 
 const detachRuntimeFromAgent = async (agent, runtimeName) => {
@@ -106,6 +108,21 @@ const unInstallRuntimeCmd = new Command({
 
         // Get agent
 
+        const events = new ProgressEvents();
+        const format = 'downloading [{bar}] {percentage}% | {value}/{total}';
+        const progressBar = new cliProgress.SingleBar({ stopOnComplete: true, format }, cliProgress.Presets.shades_classic);
+        let totalSize;
+        events.onStart((size) => {
+            progressBar.start(size, 0);
+            totalSize = size;
+        });
+        events.onProgress((progress) => {
+            progressBar.update(progress);
+            if (progress >= totalSize) {
+                console.log('\n');
+            }
+        });
+
         await sdk.runtime.unInstall({
             runtimeName,
             kubeContextName,
@@ -118,6 +135,7 @@ const unInstallRuntimeCmd = new Command({
             storageClassName,
             verbose,
             terminateProcess: true,
+            events,
         });
     },
 });

lib/interface/cli/helpers/progressEvents.js

@@ -0,0 +1,25 @@
+const EventEmitter = require('events');
+
+class ProgressEvents {
+    constructor() {
+        this.emitter = new EventEmitter();
+    }
+    onStart(handler) {
+        this.emitter.addListener('start', (args) => {
+            handler(args);
+        });
+    }
+    onProgress(handler) {
+        this.emitter.addListener('progress', (args) => {
+            handler(args);
+        });
+    }
+    reportStart(args) {
+        this.emitter.emit('start', args);
+    }
+    reportProgress(args) {
+        this.emitter.emit('progress', args);
+    }
+}
+
+module.exports = ProgressEvents;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.43.8",
+  "version": "0.43.9",
 
   "description": "Codefresh command line utility",
   "main": "index.js",
@@ -37,8 +37,8 @@
     "bluebird": "^3.5.1",
     "cf-errors": "^0.1.12",
     "chalk": "^1.1.3",
-    "cli-progress": "^1.6.1",
-    "codefresh-sdk": "1.5.1",
+    "cli-progress": "3.6.0",
+    "codefresh-sdk": "1.5.2",
     "colors": "^1.1.2",
     "columnify": "^1.5.4",
     "compare-versions": "^3.4.0",

yarn.lock

@@ -1111,12 +1111,13 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-progress@^1.6.1:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-1.8.0.tgz#5e8afc310f2058fbe33e9006e31c71c1c3b5da7f"
-  integrity sha1-Xor8MQ8gWPvjPpAG4xxxwcO12n8=
+cli-progress@3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.6.0.tgz#20317e6a653c3e5636fb5f03a7d67cd48ebc215a"
+  integrity sha512-elg6jkiDedYrvwqWSae2FGvtbMo37Lo04oI9jJ5cI43Ge3jrDPWzeL3axv7MgBLYHDY/kGio/CXa49m4MWMrNw==
   dependencies:
     colors "^1.1.2"
+    string-width "^2.1.1"
 
 cli-spinners@^2.0.0:
   version "2.2.0"
@@ -1186,10 +1187,10 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-[email protected].1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.5.1.tgz#7719e9d2ef9afd9472155493ba469632519b8cac"
-  integrity sha512-q3u/b7Q85TPc5RYs5TBzrkcmOu3U3Yc+D5ZrBT5viTNQEV4xiTUCPDKrEA+v9W4fJPFf00sMnYwB6IMAHiEicw==
+[email protected].2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.5.2.tgz#0b0515ecb46a0ccc2ea4859670b6816d8e8c527f"
+  integrity sha512-WZY/ziw/ksrbpQKcrI6OIjC+pNeSbDSrvU/ky5qiRGvYfu4AHZNUn5pqki4Tn9YvAYVZ3ZL1wuGqbYhqtm8wBw==
   dependencies:
     bluebird "^3.5.3"
     cf-errors "^0.1.12"