wip (#512)

Author: roi-codefresh

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

@@ -124,8 +124,7 @@ const installAgentCmd = new Command({
             agent = await sdk.agents.create({ name });
             // eslint-disable-next-line prefer-destructuring
             token = agent.token;
-            console.log(`A Codefresh Runner with the name: ${colors.cyan(name)} has been created.\n${colors.yellow('*IMPORTANT*')} Make sure to copy your access token now and store it in a safe location. You won’t be able to see it again.`);
-            console.log(token);
+            console.log(`A Codefresh Runner with the name: ${colors.cyan(name)} has been created.`);
         } else {
             // take the agent id from the token
             const apiKey = token.split('.')[0];

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

@@ -222,7 +222,7 @@ const deleteCmd = new Command({
         handleError(uninstallMonitorErr, 'Failed to uninstall monitor');
 
         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')}`));
+        console.log(`\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

@@ -75,7 +75,7 @@ async function createTestPipeline(runtimeName, pipelineName, pipelineCommands) {
         stage: 'test',
         title: 'test',
         image: 'alpine:latest',
-        commands: pipelineCommands || ['echo hello codefresh runner!'],
+        commands: pipelineCommands || ['echo hello Codefresh Runner!'],
     };
 
     await sdk.pipelines.replace(

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

@@ -63,7 +63,7 @@ const initCmd = new Command({
     parent: runnerRoot,
     command: 'init',
     requiresAuthentication: false,
-    description: 'Install Codefresh Runner solution\'s components on kubernetes cluster',
+    description: 'Install Codefresh Runner solution\'s components on Kubernetes cluster',
     webDocs: {
         category: 'Runner',
         title: 'Init',
@@ -83,13 +83,13 @@ const initCmd = new Command({
             default: DEFAULTS.URL,
         })
         .option('kube-context-name', {
-            describe: 'Name of the kubernetes context on which venona should be installed [$CF_ARG_KUBE_CONTEXT_NAME]',
+            describe: 'Name of the Kubernetes context on which venona should be installed [$CF_ARG_KUBE_CONTEXT_NAME]',
         })
         .option('kube-node-selector', {
-            describe: 'The kubernetes node selector "key=value" to be used by venona build resources (default is no node selector) (string)',
+            describe: 'The Kubernetes node selector "key=value" to be used by venona build resources (default is no node selector) (string)',
         })
         .option('build-node-selector', {
-            describe: 'The kubernetes node selector "key=value" to be used by the codefresh build resources (default is no node selector)',
+            describe: 'The Kubernetes node selector "key=value" to be used by the Codefresh build resources (default is no node selector)',
         })
         .option('yes', {
             describe: 'Use installation defaults (don\'t ask any questions)',
@@ -117,7 +117,7 @@ const initCmd = new Command({
             describe: 'Name of the namespace on which venona should be installed [$CF_ARG_KUBE_NAMESPACE]',
         })
         .option('tolerations', {
-            describe: 'The kubernetes tolerations as path to a  JSON file to be used by venona resources (default is no tolerations) (string)',
+            describe: 'The Kubernetes tolerations as path to a  JSON file to be used by venona resources (default is no tolerations) (string)',
         })
         .option('storage-class-name', {
             describe: 'Set a name of your custom storage class',
@@ -329,9 +329,7 @@ const initCmd = new Command({
                 const agent = await sdk.agents.create({ name: agentName });
                 installationPlan.addContext('agent', agent);
                 const { token: agentToken } = agent;
-                console.log(`A Codefresh Runner with the name: ${colors.cyan(agentName)} has been created.` +
-                    `\n${colors.yellow('*IMPORTANT*')} Make sure to copy your access token now and st` +
-                    'ore it in a safe location. You won’t be able to see it again.');
+                console.log(`A Codefresh Runner with the name: ${colors.cyan(agentName)} has been created.`);
                 console.log(agentToken);
                 installationPlan.addContext('agentToken', agentToken);
             },
@@ -514,7 +512,7 @@ const initCmd = new Command({
                         await createTestPipeline(
                             installationPlan.getContext('runtimeName'),
                             INSTALLATION_DEFAULTS.DEMO_PIPELINE_NAME,
-                            ['echo hello codefresh runner!'],
+                            ['echo hello Codefresh Runner!'],
                         );
                     },
                     installationEvent: installationProgress.events.PIPELINE_CREATED,
@@ -552,11 +550,13 @@ const initCmd = new Command({
 
         console.log(colors.green('\nRunner Status:'));
         await getAgents.handler({});
+        console.log('');
         if (installMonitor) {
-            console.log(colors.green(`\nGo to ${colors.blue('https://g.codefresh.io/kubernetes/monitor/services')} to view your cluster in codefresh dashbaord`));
+            console.log(`Go to ${colors.blue('https://g.codefresh.io/kubernetes/monitor/services')} to view your cluster in Codefresh dashbaord`);
         }
-        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')}`));
+        console.log(`Link to the new runtime: ${colors.blue(`https://g.codefresh.io/account-admin/account-conf/runtime-environments?runtime=${encodeURI(installationPlan.getContext('runtimeName'))}`)}`);
+        console.log(`\nDocumenation link: ${colors.blue('https://codefresh.io/docs/docs/enterprise/codefresh-runner/#codefresh-runner-preview-release')}`);
+        console.log(`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 drawCodefreshFiglet();
         process.exit(); // TODO : This is not needed - needed to be fixed

lib/logic/entities/Agent.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const Entity = require('./Entity');
-const colors = require('colors');
+const chalk = require('chalk');
 
 class Agent extends Entity {
     constructor(data) {
@@ -9,23 +9,37 @@ class Agent extends Entity {
         this.id = data.id;
         this.name = data.name;
         this.runtimes = data.runtimes;
-        this.status = _.get(data, 'status.message', 'N/A');
+        const status = _.get(data, 'status.healthStatus', 'N/A');
+        this.status = this._pickStatusColor(status)(status);
         const lastReported = _.get(data, 'status.reportedAt', 'N/A');
-        this.reported = this.pickStatusColor(_.get(data, 'status.healthStatus', 'N/A'))(lastReported);
+        this.reported = this._pickLastReportedColor(status)(lastReported);
         this.defaultColumns = ['name', 'runtimes', 'status', 'reported'];
     }
 
     // eslint-disable-next-line class-methods-use-this
-    pickStatusColor(healthStatus) {
+    _pickLastReportedColor(healthStatus) {
         switch (healthStatus) {
             case 'N/A':
-                return colors.red;
+                return chalk.gray;
             case 'unhealthy':
-                return colors.yellow;
+                return chalk.red;
             case 'healthy':
-                return colors.green;
+                return chalk.green;
             default:
-                return colors.red;
+                return chalk.red;
+        }
+    }
+
+    _pickStatusColor(healthStatus) {
+        switch (healthStatus) {
+            case 'N/A':
+                return chalk.white.bgGray;
+            case 'unhealthy':
+                return chalk.white.bgRed;
+            case 'healthy':
+                return chalk.black.bgGreen;
+            default:
+                return chalk.black.bgRed;
         }
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.68.14",
+  "version": "0.68.15",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
@@ -35,7 +35,7 @@
     "ajv": "^6.6.1",
     "bluebird": "^3.5.1",
     "cf-errors": "^0.1.12",
-    "chalk": "^1.1.3",
+    "chalk": "^4.1.0",
     "cli-progress": "3.6.0",
     "codefresh-sdk": "^1.9.13",
     "colors": "^1.1.2",

yarn.lock

@@ -1066,6 +1066,14 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 changed-log@0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/changed-log/-/changed-log-0.11.0.tgz#173d1878bfa28d0c8a4ff91e45545cebc8ed6447"