From 7a6a4b84636b080e31ae5ff0821514a6e269d38f Mon Sep 17 00:00:00 2001 From: David Byrne Date: Mon, 26 Jun 2023 17:26:33 +0100 Subject: [PATCH] Retry requests if configured regardless of HTTP Verb --- dist/util.js | 4 +++- dist/util.js.map | 2 +- src/util.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dist/util.js b/dist/util.js index 754b765..df3e035 100644 --- a/dist/util.js +++ b/dist/util.js @@ -109,7 +109,8 @@ exports.tryToParseJson = function (data) { }; exports.sendRequestWithRetry = function (config) { return __awaiter(void 0, void 0, void 0, function () { var client; - return __generator(this, function (_a) { + var _a; + return __generator(this, function (_b) { client = axios_1.default.create(); if (requestconf_1.INPUT_RETRIES) { if (isNaN(Number(requestconf_1.INPUT_RETRIES))) { @@ -118,6 +119,7 @@ exports.sendRequestWithRetry = function (config) { return __awaiter(void 0, void client.defaults.raxConfig = { instance: client, retry: Number(requestconf_1.INPUT_RETRIES), + httpMethodsToRetry: [(_a = config.method) !== null && _a !== void 0 ? _a : ''], onRetryAttempt: function (err) { var cfg = rax.getConfig(err); core.info("Retry attempt #" + (cfg === null || cfg === void 0 ? void 0 : cfg.currentRetryAttempt)); diff --git a/dist/util.js.map b/dist/util.js.map index 43cb0a9..983598e 100644 --- a/dist/util.js.map +++ b/dist/util.js.map @@ -1 +1 @@ -{"version":3,"file":"util.js","sourceRoot":"./src/","sources":["util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA4D;AAC5D,kDAAsC;AACtC,gDAAiE;AACjE,oDAAiC;AACjC,+CAAmC;AACnC,4CAAgC;AAEnB,QAAA,sBAAsB,GAAG;IACpC,IAAM,mBAAmB,GAAc,0BAAuB;SAC3D,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,KAAK,EAAE,EAAR,CAAQ,CAAC;SACvB,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,EAAE,EAAR,CAAQ,CAAC,CAAC;IACxB,IAAI,MAAM,GAAa,EAAE,CAAC;IAC1B,KAA+B,UAAmB,EAAnB,2CAAmB,EAAnB,iCAAmB,EAAnB,IAAmB,EAAE;QAA/C,IAAI,kBAAkB,4BAAA;QACzB,IAAI,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CAAC,mBAAiB,kBAAkB,gBAAa,CAAC,CAAC;SACnE;QACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC;KACzC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEW,QAAA,WAAW,GAAG,UAAC,GAAuB;IACjD,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,WAAW,EAAE,GAAG,CAAC,MAAM;QACvB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC,CAAC;AACL,CAAC,CAAC;AAEW,QAAA,cAAc,GAAG,UAAC,IAAY;IACzC,IAAI,MAAM,GAAqB,IAAI,CAAC;IAEpC,6BAA6B;IAC7B,IAAI;QACF,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,OAAO,MAAM,CAAC;KACf;IAAC,WAAM;QACN,aAAa;KACd;IAED,8BAA8B;IAC9B,IAAI;QACF,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,OAAO,MAAM,CAAC;KACf;IAAC,WAAM;QACN,aAAa;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEW,QAAA,oBAAoB,GAAG,UAAO,MAA0B;;;QAC7D,MAAM,GAAG,eAAK,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,2BAAa,EAAE;YACjB,IAAI,KAAK,CAAC,MAAM,CAAC,2BAAa,CAAC,CAAC,EAAE;gBAChC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;aAC7C;YACD,MAAM,CAAC,QAAQ,CAAC,SAAS,GAAG;gBAC1B,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,MAAM,CAAC,2BAAa,CAAC;gBAC5B,cAAc,EAAE,UAAC,GAAG;oBAClB,IAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBAC/B,IAAI,CAAC,IAAI,CAAC,qBAAkB,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,mBAAmB,CAAE,CAAC,CAAC;gBAC1D,CAAC;aACF,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACpB;QACD,MAAM;aACH,OAAO,CAAC,MAAM,CAAC;aACf,IAAI,CAAC,UAAC,IAAI,IAAK,OAAA,gBAAS,CAAC,IAAI,CAAC,EAAf,CAAe,CAAC;aAC/B,KAAK,CAAC,UAAC,GAAG,IAAK,OAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAnB,CAAmB,CAAC,CAAC;;;KACxC,CAAC"} \ No newline at end of file +{"version":3,"file":"util.js","sourceRoot":"./src/","sources":["util.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/util.ts b/src/util.ts index f1ff572..023545b 100644 --- a/src/util.ts +++ b/src/util.ts @@ -58,6 +58,7 @@ export const sendRequestWithRetry = async (config: AxiosRequestConfig) => { client.defaults.raxConfig = { instance: client, retry: Number(INPUT_RETRIES), + httpMethodsToRetry: [config.method ?? ''], onRetryAttempt: (err) => { const cfg = rax.getConfig(err); core.info(`Retry attempt #${cfg?.currentRetryAttempt}`);