saas-1216 -- per request retry config + whoami disable retries (#258)

* per request retry config + whoami disable retries

* add request options defaults

* add statusCode to simulate StatusCodeError

* update version

Author: yaroslav-codefresh

lib/logic/api/helper.js

@@ -18,10 +18,13 @@ const retryOptions = {
 };
 
 function _makeResponseError(response) {
-    return new Error(JSON.stringify(response.body || response));
+    return new CFError({
+        statusCode: response.statusCode,
+        message: JSON.stringify(response.body || response)
+    });
 }
 
-const sendHttpRequest = async (httpOptions, authContext, throwOnUnauthorized, timeout = 30000) => {
+const sendHttpRequest = async (httpOptions, { authContext, throwOnUnauthorized, timeout = 30000, maxRetries, retryDelay, retryStrategy } = {}) => {
     let finalAuthContext;
     if (!authContext) {
         const authManager = require('../auth').manager; // eslint-disable-line
@@ -30,6 +33,16 @@ const sendHttpRequest = async (httpOptions, authContext, throwOnUnauthorized, ti
         finalAuthContext = authContext;
     }
 
+    if (maxRetries) {
+        retryOptions.maxAttempts = maxRetries;
+    }
+    if (retryDelay) {
+        retryOptions.retryDelay = retryDelay;
+    }
+    if (retryStrategy) {
+        retryOptions.retryStrategy = retryStrategy;
+    }
+
     const finalOptions = _.merge(
         httpOptions,
         finalAuthContext.prepareHttpOptions(),

lib/logic/api/user.js

@@ -6,7 +6,7 @@ const getByAuthContext = async (authContext) => {
         method: 'GET',
     };
 
-    return sendHttpRequest(options, authContext);
+    return sendHttpRequest(options, { authContext });
 };
 
 

lib/logic/auth/contexts/whoami.js

@@ -8,7 +8,12 @@ const whoami = async (context) => {
         url: '/api/user/',
         method: 'GET',
     };
-    const user = await sendHttpRequest(userOptions, context, true, 2000);
+    const user = await sendHttpRequest(userOptions, {
+        authContext: context,
+        throwOnUnauthorized: true,
+        timeout: 2000,
+        retryStrategy: () => false,
+    });
     const accounts = _.get(user, 'account', {});
     const accountInfo = _.chain(accounts)
         .filter(account => account.name === user.activeAccountName)

lib/logic/auth/contexts/whoami.spec.js

@@ -31,7 +31,7 @@ jest.mock('../../api/helper', () => { // eslint-disable-line
         if (response) {
             return response();
         } else { // eslint-disable-line
-            return apiHelper.sendHttpRequest(userOptions, context, flag);
+            return apiHelper.sendHttpRequest(userOptions, {authContext: context, throwOnUnauthorized: flag});
         }
     };
 
@@ -62,13 +62,13 @@ describe('whoami tests', () => {
                     token: 'test-token',
                 });
 
-                apiHelper.__setValidateParams((userOptions, context, flag) => {
+                apiHelper.__setValidateParams((userOptions, requestOptions) => {
                     expect(userOptions)
                         .toEqual({
                             'method': 'GET',
                             'url': '/api/user/',
                         });
-                    expect(flag)
+                    expect(requestOptions.throwOnUnauthorized)
                         .toEqual(true);
                 });
 

package.json

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