diff --git a/dist/query.js b/dist/query.js index bb246372..bbf02f93 100644 --- a/dist/query.js +++ b/dist/query.js @@ -83852,8 +83852,11 @@ function getApiBaseUrl() { // node_modules/@octokit/plugin-retry/dist-bundle/index.js var import_light = __toESM(require_light(), 1); var VERSION8 = "0.0.0-development"; +function isRequestError(error2) { + return error2.request !== void 0; +} async function errorRequest(state, octokit, error2, options) { - if (!error2.request || !error2.request.request) { + if (!isRequestError(error2) || !error2?.request.request) { throw error2; } if (error2.status >= 400 && !state.doNotRetry.includes(error2.status)) { @@ -83866,8 +83869,8 @@ async function errorRequest(state, octokit, error2, options) { async function wrapRequest(state, octokit, request2, options) { const limiter = new import_light.default(); limiter.on("failed", function(error2, info2) { - const maxRetries = ~~error2.request.request.retries; - const after = ~~error2.request.request.retryAfter; + const maxRetries = ~~error2.request.request?.retries; + const after = ~~error2.request.request?.retryAfter; options.request.retryCount = info2.retryCount + 1; if (maxRetries > info2.retryCount) { return after * state.retryAfterBaseValue; @@ -83879,7 +83882,7 @@ async function wrapRequest(state, octokit, request2, options) { ); } async function requestWithGraphqlErrorHandling(state, octokit, request2, options) { - const response = await request2(request2, options); + const response = await request2(options); if (response.data && response.data.errors && response.data.errors.length > 0 && /Something went wrong while executing your query/.test( response.data.errors[0].message )) { @@ -83901,11 +83904,7 @@ function retry(octokit, octokitOptions) { }, octokitOptions.retry ); - if (state.enabled) { - octokit.hook.error("request", errorRequest.bind(null, state, octokit)); - octokit.hook.wrap("request", wrapRequest.bind(null, state, octokit)); - } - return { + const retryPlugin = { retry: { retryRequest: (error2, retries, retryAfter) => { error2.request.request = Object.assign({}, error2.request.request, { @@ -83916,6 +83915,11 @@ function retry(octokit, octokitOptions) { } } }; + if (state.enabled) { + octokit.hook.error("request", errorRequest.bind(null, state, retryPlugin)); + octokit.hook.wrap("request", wrapRequest.bind(null, state, retryPlugin)); + } + return retryPlugin; } retry.VERSION = VERSION8; @@ -84535,7 +84539,7 @@ async function setVariantAnalysisFailed(controllerRepoId, variantAnalysisId, rep } ); } -function isRequestError(obj) { +function isRequestError2(obj) { return typeof obj?.["status"] === "number"; } async function updateVariantAnalysisStatus(controllerRepoId, variantAnalysisId, repoId, data) { @@ -84544,7 +84548,7 @@ async function updateVariantAnalysisStatus(controllerRepoId, variantAnalysisId, try { await octokit.request(url, { data }); } catch (e) { - if (isRequestError(e)) { + if (isRequestError2(e)) { console.error(`Request to ${url} failed with status code ${e.status}`); } throw e; @@ -84562,7 +84566,7 @@ async function getPolicyForRepoArtifact(controllerRepoId, variantAnalysisId, rep const response = await octokit.request(url, { data }); return validateObject(response.data, "policy"); } catch (e) { - if (isRequestError(e)) { + if (isRequestError2(e)) { console.error(`Request to ${url} failed with status code ${e.status}`); } throw e; diff --git a/dist/update-repo-task-status.js b/dist/update-repo-task-status.js index 16b2a120..e545bdcc 100644 --- a/dist/update-repo-task-status.js +++ b/dist/update-repo-task-status.js @@ -53014,8 +53014,11 @@ function getApiBaseUrl() { // node_modules/@octokit/plugin-retry/dist-bundle/index.js var import_light = __toESM(require_light(), 1); var VERSION8 = "0.0.0-development"; +function isRequestError(error) { + return error.request !== void 0; +} async function errorRequest(state, octokit, error, options) { - if (!error.request || !error.request.request) { + if (!isRequestError(error) || !error?.request.request) { throw error; } if (error.status >= 400 && !state.doNotRetry.includes(error.status)) { @@ -53028,8 +53031,8 @@ async function errorRequest(state, octokit, error, options) { async function wrapRequest(state, octokit, request2, options) { const limiter = new import_light.default(); limiter.on("failed", function(error, info) { - const maxRetries = ~~error.request.request.retries; - const after = ~~error.request.request.retryAfter; + const maxRetries = ~~error.request.request?.retries; + const after = ~~error.request.request?.retryAfter; options.request.retryCount = info.retryCount + 1; if (maxRetries > info.retryCount) { return after * state.retryAfterBaseValue; @@ -53041,7 +53044,7 @@ async function wrapRequest(state, octokit, request2, options) { ); } async function requestWithGraphqlErrorHandling(state, octokit, request2, options) { - const response = await request2(request2, options); + const response = await request2(options); if (response.data && response.data.errors && response.data.errors.length > 0 && /Something went wrong while executing your query/.test( response.data.errors[0].message )) { @@ -53063,11 +53066,7 @@ function retry(octokit, octokitOptions) { }, octokitOptions.retry ); - if (state.enabled) { - octokit.hook.error("request", errorRequest.bind(null, state, octokit)); - octokit.hook.wrap("request", wrapRequest.bind(null, state, octokit)); - } - return { + const retryPlugin = { retry: { retryRequest: (error, retries, retryAfter) => { error.request.request = Object.assign({}, error.request.request, { @@ -53078,6 +53077,11 @@ function retry(octokit, octokitOptions) { } } }; + if (state.enabled) { + octokit.hook.error("request", errorRequest.bind(null, state, retryPlugin)); + octokit.hook.wrap("request", wrapRequest.bind(null, state, retryPlugin)); + } + return retryPlugin; } retry.VERSION = VERSION8; @@ -53345,7 +53349,7 @@ async function setVariantAnalysesCanceled(controllerRepoId, variantAnalysisId, r status: "canceled" }); } -function isRequestError(obj) { +function isRequestError2(obj) { return typeof obj?.["status"] === "number"; } async function updateVariantAnalysisStatuses(controllerRepoId, variantAnalysisId, data) { @@ -53354,7 +53358,7 @@ async function updateVariantAnalysisStatuses(controllerRepoId, variantAnalysisId try { await octokit.request(url, { data }); } catch (e) { - if (isRequestError(e)) { + if (isRequestError2(e)) { console.error(`Request to ${url} failed with status code ${e.status}`); } throw e; diff --git a/dist/update-repo-task-statuses.js b/dist/update-repo-task-statuses.js index a0b8c2be..b3f02ff8 100644 --- a/dist/update-repo-task-statuses.js +++ b/dist/update-repo-task-statuses.js @@ -53018,8 +53018,11 @@ function getApiBaseUrl() { // node_modules/@octokit/plugin-retry/dist-bundle/index.js var import_light = __toESM(require_light(), 1); var VERSION8 = "0.0.0-development"; +function isRequestError(error) { + return error.request !== void 0; +} async function errorRequest(state, octokit, error, options) { - if (!error.request || !error.request.request) { + if (!isRequestError(error) || !error?.request.request) { throw error; } if (error.status >= 400 && !state.doNotRetry.includes(error.status)) { @@ -53032,8 +53035,8 @@ async function errorRequest(state, octokit, error, options) { async function wrapRequest(state, octokit, request2, options) { const limiter = new import_light.default(); limiter.on("failed", function(error, info) { - const maxRetries = ~~error.request.request.retries; - const after = ~~error.request.request.retryAfter; + const maxRetries = ~~error.request.request?.retries; + const after = ~~error.request.request?.retryAfter; options.request.retryCount = info.retryCount + 1; if (maxRetries > info.retryCount) { return after * state.retryAfterBaseValue; @@ -53045,7 +53048,7 @@ async function wrapRequest(state, octokit, request2, options) { ); } async function requestWithGraphqlErrorHandling(state, octokit, request2, options) { - const response = await request2(request2, options); + const response = await request2(options); if (response.data && response.data.errors && response.data.errors.length > 0 && /Something went wrong while executing your query/.test( response.data.errors[0].message )) { @@ -53067,11 +53070,7 @@ function retry(octokit, octokitOptions) { }, octokitOptions.retry ); - if (state.enabled) { - octokit.hook.error("request", errorRequest.bind(null, state, octokit)); - octokit.hook.wrap("request", wrapRequest.bind(null, state, octokit)); - } - return { + const retryPlugin = { retry: { retryRequest: (error, retries, retryAfter) => { error.request.request = Object.assign({}, error.request.request, { @@ -53082,6 +53081,11 @@ function retry(octokit, octokitOptions) { } } }; + if (state.enabled) { + octokit.hook.error("request", errorRequest.bind(null, state, retryPlugin)); + octokit.hook.wrap("request", wrapRequest.bind(null, state, retryPlugin)); + } + return retryPlugin; } retry.VERSION = VERSION8; @@ -53349,7 +53353,7 @@ async function setVariantAnalysesCanceled(controllerRepoId, variantAnalysisId, r status: "canceled" }); } -function isRequestError(obj) { +function isRequestError2(obj) { return typeof obj?.["status"] === "number"; } async function updateVariantAnalysisStatuses(controllerRepoId, variantAnalysisId, data) { @@ -53358,7 +53362,7 @@ async function updateVariantAnalysisStatuses(controllerRepoId, variantAnalysisId try { await octokit.request(url, { data }); } catch (e) { - if (isRequestError(e)) { + if (isRequestError2(e)) { console.error(`Request to ${url} failed with status code ${e.status}`); } throw e; diff --git a/package-lock.json b/package-lock.json index 2412ac67..13073962 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@actions/io": "^3.0.2", "@actions/tool-cache": "^4.0.0", "@octokit/action": "^8.0.4", - "@octokit/plugin-retry": "^8.0.3", + "@octokit/plugin-retry": "^8.1.0", "@octokit/plugin-throttling": "^11.0.3", "ajv": "8.18.0", "form-data": "^4.0.5", @@ -2894,9 +2894,9 @@ } }, "node_modules/@octokit/plugin-retry": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-8.0.3.tgz", - "integrity": "sha512-vKGx1i3MC0za53IzYBSBXcrhmd+daQDzuZfYDd52X5S0M2otf3kVZTVP8bLA3EkU0lTvd1WEC2OlNNa4G+dohA==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-8.1.0.tgz", + "integrity": "sha512-O1FZgXeiGb2sowEr/hYTr6YunGdSAFWnr2fyW39Ah85H8O33ELASQxcvOFF5LE6Tjekcyu2ms4qAzJVhSaJxTw==", "license": "MIT", "dependencies": { "@octokit/request-error": "^7.0.2", diff --git a/package.json b/package.json index f8a4a8a9..14dfa827 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@actions/io": "^3.0.2", "@actions/tool-cache": "^4.0.0", "@octokit/action": "^8.0.4", - "@octokit/plugin-retry": "^8.0.3", + "@octokit/plugin-retry": "^8.1.0", "@octokit/plugin-throttling": "^11.0.3", "ajv": "8.18.0", "form-data": "^4.0.5",