Merge pull request #139 from codefresh-io/CR-13431-cf-api-retries

CR-13431 add CF_API_RETRIES

Author: vadim-kharin-codefresh

config/index.js

@@ -109,6 +109,7 @@ class Config {
                 branchNormalized: process.env.CF_BRANCH_TAG_NORMALIZED,
                 storageIntegration: process.env.CF_STORAGE_INTEGRATION,
                 logLevel: logLevelsMap[process.env.REPORT_LOGGING_LEVEL] || INFO,
+                retriesForCodefreshAPI: Number(process.env.CF_API_RETRIES) || 0,
                 sourceReportFolderName: (allureDir || 'allure-results').trim(),
                 reportDir: ((reportDir || '').trim()) || undefined,
                 reportPath: ((reportPath || '').trim()).replace(/\/$/, ''),

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cf-docker-test-reporting",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"description": "Generate test report",
 	"repository": {
 		"type": "git",
@@ -37,6 +37,7 @@
 		"recursive-readdir-sync": "^1.0.6",
 		"request": "^2.88.0",
 		"request-promise": "^4.2.2",
+		"retry-request" : "5.0.2",
 		"rimraf": "^2.7.1"
 	},
 	"devDependencies": {

src/api/index.js

@@ -1,6 +1,23 @@
+const _ = require('lodash');
 const rp = require('request-promise');
+const Promise = require('bluebird');
+const retryRequest = require('retry-request');
 
 class CodefreshAPI {
+
+    static async sendRequest(config, opts) {
+        if (config.env.retriesForCodefreshAPI) {
+            opts.retries = config.env.retriesForCodefreshAPI;
+            const response = await Promise.fromCallback(cb => retryRequest(opts, cb));
+            const body = _.get(response, 'body');
+            if (response.statusCode !== 200) {
+                throw new Error(body);
+            }
+            return body;
+        }
+        return rp(opts);
+    }
+
     static async createAnnotation({ config, value }) {
         // this query use proxy ability to replace :account_id to currentAccountID
         // this ability use because we don`t know accountId
@@ -19,7 +36,7 @@ class CodefreshAPI {
             json: true,
         };
 
-        return rp(createAnnotationOpts);
+        return this.sendRequest(config, createAnnotationOpts);
     }
 
     static async getProcessById({ id, config }) {
@@ -33,7 +50,7 @@ class CodefreshAPI {
         let process;
 
         try {
-            const processRes = await rp(opts);
+            const processRes = await this.sendRequest(config, opts);
             process = JSON.parse(processRes);
         } catch (e) {
             throw new Error('Error during getting process info');

src/storageConfig/StorageConfigProvider.js

@@ -1,9 +1,9 @@
 const _ = require('lodash');
-const rp = require('request-promise');
 const VariableResolver = require('../ variableResolver/VariableResolver');
 const storageTypesMap = require('./types');
 const storageTypes = require('./storageTypes');
 const fs = require('fs');
+const CodefreshAPI = require('../api');
 
 class StorageConfigProvider {
     constructor({ config }) {
@@ -29,7 +29,7 @@ class StorageConfigProvider {
         };
 
         try {
-            return await rp(opts);
+            return await CodefreshAPI.sendRequest(config, opts);
         } catch (e) {
             const infoErrMsg = `Can't get storage integration: ${this.integrationName}`;
             if (config.env.logLevel === config.logLevels.DEBUG) {

yarn.lock

@@ -4152,6 +4152,14 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
+[email protected]:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da"
+  integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==
+  dependencies:
+    debug "^4.1.1"
+    extend "^3.0.2"
+
 retry-request@^4.0.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-4.1.3.tgz#d5f74daf261372cff58d08b0a1979b4d7cab0fde"