print workflow id + helper renamed (#316)

yaroslav-codefresh · web-flow · commit b962c77f5128 · 2019-03-29T11:23:23.000+02:00
diff --git a/lib/interface/cli/commands/helm/chart/helm-charts.sdk.spec.js b/lib/interface/cli/commands/helm/chart/helm-charts.sdk.spec.js
@@ -8,7 +8,7 @@ installCmd = installCmd.toCommand();
 promoteCmd = promoteCmd.toCommand();
 
 jest.mock('../../../helpers/helm');
-jest.mock('../../../helpers/workflow');
+jest.mock('../../../helpers/logs');
 jest.spyOn(process, 'exit').mockImplementation();
 
 const request = require('requestretry');
diff --git a/lib/interface/cli/commands/helm/chart/install-chart.cmd.js b/lib/interface/cli/commands/helm/chart/install-chart.cmd.js
@@ -1,5 +1,5 @@
 const Command = require('../../../Command');
-const { followLogs } = require('../../../helpers/workflow');
+const { followLogs } = require('../../../helpers/logs');
 const { sdk } = require('../../../../../logic');
 const { normalizeValues, normalizeSetValues } = require('../../../helpers/helm');
 const Output = require('../../../../../output/Output');
diff --git a/lib/interface/cli/commands/helm/chart/promote-chart.cmd.js b/lib/interface/cli/commands/helm/chart/promote-chart.cmd.js
@@ -1,5 +1,5 @@
 const Command = require('../../../Command');
-const { followLogs } = require('../../../helpers/workflow');
+const { followLogs } = require('../../../helpers/logs');
 const { sdk } = require('../../../../../logic');
 const { normalizeValues, normalizeSetValues } = require('../../../helpers/helm');
 const Output = require('../../../../../output/Output');
diff --git a/lib/interface/cli/commands/helm/release/delete-release.cmd.js b/lib/interface/cli/commands/helm/release/delete-release.cmd.js
@@ -1,6 +1,6 @@
 const Command = require('../../../Command');
 const { sdk } = require('../../../../../logic');
-const { followLogs } = require('../../../helpers/workflow');
+const { followLogs } = require('../../../helpers/logs');
 const Output = require('../../../../../output/Output');
 
 const install = new Command({
diff --git a/lib/interface/cli/commands/helm/release/helm-releases.sdk.spec.js b/lib/interface/cli/commands/helm/release/helm-releases.sdk.spec.js
@@ -8,7 +8,7 @@ deleteCmd = deleteCmd.toCommand();
 testCmd = testCmd.toCommand();
 
 jest.mock('../../../helpers/helm');
-jest.mock('../../../helpers/workflow');
+jest.mock('../../../helpers/logs');
 jest.spyOn(process, 'exit').mockImplementation();
 
 const request = require('requestretry');
diff --git a/lib/interface/cli/commands/helm/release/test-release.cmd.js b/lib/interface/cli/commands/helm/release/test-release.cmd.js
@@ -1,5 +1,5 @@
 const Command = require('../../../Command');
-const { followLogs } = require('../../../helpers/workflow');
+const { followLogs } = require('../../../helpers/logs');
 const { sdk } = require('../../../../../logic');
 const Output = require('../../../../../output/Output');
 
diff --git a/lib/interface/cli/commands/pipeline/run.cf.js b/lib/interface/cli/commands/pipeline/run.cf.js
@@ -1,6 +1,6 @@
 const RunBaseCommand = require('./run.base');
 const { sdk } = require('../../../../logic');
-const { followLogs } = require('../../helpers/workflow');
+const { followLogs } = require('../../helpers/logs');
 
 function _buildBody(data) {
     const body = {
diff --git a/lib/interface/cli/commands/pipeline/run.local.js b/lib/interface/cli/commands/pipeline/run.local.js
@@ -5,7 +5,7 @@ const path = require('path');
 const DEFAULTS = require('../../defaults');
 const _ = require('lodash');
 const { sdk } = require('../../../../logic');
-const { followLogs } = require('../../helpers/workflow');
+const { followLogs } = require('../../helpers/logs');
 const chalk = require('chalk');
 
 const regex = /##[0-9a-f]{24}##/i;
diff --git a/lib/interface/cli/commands/workflow/restart.cmd.js b/lib/interface/cli/commands/workflow/restart.cmd.js
@@ -1,5 +1,5 @@
 const Command = require('../../Command');
-const { followLogs } = require('../../helpers/workflow');
+const { followLogs } = require('../../helpers/logs');
 const { sdk } = require('../../../../logic');
 
 const restart = new Command({
diff --git a/lib/interface/cli/commands/workflow/workflow.sdk.spec.js b/lib/interface/cli/commands/workflow/workflow.sdk.spec.js
@@ -21,7 +21,7 @@ jest.mock('../../../../logic/entities/Workflow', () => {
         fromResponse: res => res,
     };
 });
-jest.mock('../../helpers/workflow');
+jest.mock('../../helpers/logs');
 
 const request = require('requestretry');
 
diff --git a/lib/interface/cli/helpers/helpers.sdk.spec.js b/lib/interface/cli/helpers/helpers.sdk.spec.js
@@ -6,7 +6,7 @@ const { Config } = require('codefresh-sdk');
 
 const { normalizeValues } = require('./helm');
 const { validatePipelineSpec, validatePipelineYaml } = require('./validation');
-const { followLogs } = require('./workflow');
+const { followLogs } = require('./logs');
 const { printTableForAuthContexts } = require('./auth');
 const { sdk } = require('../../../logic');
 
@@ -56,7 +56,7 @@ describe('helpers using sdk', () => {
         });
     });
 
-    describe('workflow', () => {
+    describe('logs', () => {
         it('should handle showing logs', async () => {
             const workflowId = 'id';
             jest.spyOn(process, 'exit').mockImplementation();
diff --git a/lib/interface/cli/helpers/logs.js b/lib/interface/cli/helpers/logs.js
@@ -1,9 +1,11 @@
 const Promise = require('bluebird');
 const _ = require('lodash');
 const request = require('requestretry');
+const CFError = require('cf-errors');
 
 const { sdk } = require('../../../logic');
 const Workflow = require('../../../logic/entities/Workflow');
+const Output = require('../../../output/Output');
 
 const END_STATUSES = ['error', 'success', 'terminated'];
 
@@ -15,7 +17,10 @@ async function _fallbackLogs(workflowId, interval, retriesLeft) {
         await sdk.logs.showWorkflowLogs(workflowId, true);
         return;
     } catch (e) {
-        console.log(`Could not retrieve logs due to error: ${e.message}`);
+        Output.printError(new CFError({
+            message: `Could not retrieve logs for workflow: ${workflowId}`,
+            cause: e,
+        }));
     }
 
     let failedToGetStatus = false;
@@ -51,10 +56,15 @@ const followLogs = async (workflowId) => {
     try {
         await sdk.logs.showWorkflowLogs(workflowId, true);
     } catch (e) {
+        const error = new CFError({
+            message: `Could not retrieve logs for workflow: ${workflowId}`,
+            cause: e,
+        });
         if (!process.env.CF_CLI_RUN_WAIT_FALLBACK) {
-            throw e;
+            throw error;
+        } else {
+            Output.printError(error);
         }
-        console.log(`Could not retrieve logs due to error: ${e.message}`);
         await _fallbackLogs(workflowId, config.logs.fallback.interval, config.logs.fallback.maxAttempts);
     }
     const json = await sdk.workflows.get({ id: workflowId });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.17.10",
+  "version": "0.17.11",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
