timeouts (#317)

* request timeout configurable

* set specific request timeout for teams synchronize

* add spinner

* update sdk dep

*  update version

Author: yaroslav-codefresh

lib/interface/cli/commad-line-interface.js

@@ -22,6 +22,7 @@ async function startCommandLine() {
         configPath: PROCESS_ARGV.cfconfig,
         spec: { json: openapi },
         request: _.defaultsDeep({
+            timeout: PROCESS_ARGV.requestTimeout,
             headers: {
                 'User-Agent': `codefresh-cli-v${version}`,
                 'Codefresh-Agent': 'cli',
@@ -65,6 +66,10 @@ async function startCommandLine() {
             describe: `Custom path for authentication contexts config file (default: ${DEFAULTS.CFCONFIG})`,
             global: false,
         })
+        .option('request-timeout', {
+            describe: `Request timeout (default: ${cliConfig.request.timeout})`,
+            global: false,
+        })
         .demandCommand(1, 'You need at least one command before moving on')
         .wrap(null)
         .version(false)

lib/interface/cli/commands/team/synchronize.cmd.js

@@ -1,6 +1,11 @@
+const _ = require('lodash');
 const Command = require('../../Command');
 const syncRoot = require('../root/synchronize.cmd');
 const { sdk } = require('../../../../logic');
+const cliConfigManager = require('../../../../logic/cli-config/Manager');
+const Spinner = require('ora');
+
+const REQUEST_TIMEOUT = 2 * 60 * 1000;
 
 const command = new Command({
     command: 'teams [client-name]',
@@ -31,11 +36,22 @@ const command = new Command({
             .example('codefresh synchronize teams [client-name] -t [client-type] -tk [accessToken]', 'Synchronize team with group');
     },
     handler: async (argv) => {
-        console.log(JSON.stringify(await sdk.teams.synchronizeClientWithGroup({
-            name: argv['client-name'],
-            type: argv['client-type'],
-            access_token: argv['access-token'],
-        }), null, 2));
+        const config = cliConfigManager.config();
+        if (!_.isInteger(argv.requestTimeout) || config.request.timeout < REQUEST_TIMEOUT) {
+            _.set(sdk, 'config.http.config.timeout', REQUEST_TIMEOUT);
+        }
+        const spinner = Spinner().start('Synchronizing...');
+        let result;
+        try {
+            result = await sdk.teams.synchronizeClientWithGroup({
+                name: argv['client-name'],
+                type: argv['client-type'],
+                access_token: argv['access-token'],
+            });
+        } finally {
+            spinner.clear();
+        }
+        console.log(JSON.stringify(result, null, 2));
     },
 });
 

lib/logic/cli-config/schema.json

@@ -22,6 +22,11 @@
         "request": {
             "type": "object",
             "properties": {
+                "timeout": {
+                    "type": "integer",
+                    "default": 30000,
+                    "description": "Defines request timeout in ms"
+                },
                 "maxAttempts": {
                     "type": "integer",
                     "default": 10,
@@ -30,7 +35,7 @@
                 "retryDelay": {
                     "type": "integer",
                     "default": 500,
-                    "description": "Defines delay between retries"
+                    "description": "Defines delay between retries in ms"
                 }
             }
         },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
@@ -36,8 +36,8 @@
     "bluebird": "^3.5.1",
     "cf-errors": "^0.1.11",
     "chalk": "^1.1.3",
+    "codefresh-sdk": "^1.0.5",
     "cli-progress": "^1.6.1",
-    "codefresh-sdk": "^1.0.2",
     "colors": "^1.1.2",
     "columnify": "^1.5.4",
     "compare-versions": "^3.4.0",

yarn.lock

@@ -916,10 +916,10 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codefresh-sdk@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.0.2.tgz#4d002c08601931b70c2b2695806921f4f7b536c9"
-  integrity sha512-RqpO7t6ccHnPtOSR50ZPV3isnGAK+QsrBW6jIOR2eehtHMFvDJk0SvPXiyHOWEuAuyObfUnkVdgCEWc76IpxUw==
+codefresh-sdk@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.0.5.tgz#7b1449d8ec66bee555115d74ba58cfccf9e8c803"
+  integrity sha512-NAfQIWx0YTv2QZm+2dkubYkNusMacsjsMsdF5AqWw6qVrfcB4t+iBmNuYwv7VsKnS26bopx2TC2kgph0WOinig==
   dependencies:
     bluebird "^3.5.3"
     cf-errors "^0.1.11"