Merge pull request #547 from github/retrying-fix

Add back retrying.
github · Jun 7, 2021 · 242fd82 · 242fd82
2 parents 1644ade + 48efe6e
commit 242fd82
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/lib/api-client.js b/lib/api-client.js
diff --git a/lib/api-client.js.map b/lib/api-client.js.map
diff --git a/lib/api-client.test.js b/lib/api-client.test.js
diff --git a/lib/api-client.test.js.map b/lib/api-client.test.js.map
diff --git a/src/api-client.test.ts b/src/api-client.test.ts
@@ -11,10 +11,13 @@ const pkg = require("../package.json");
 
 setupTests(test);
 
+let pluginStub: sinon.SinonStub;
 let githubStub: sinon.SinonStub;
 
 test.beforeEach(() => {
-  githubStub = sinon.stub(githubUtils, "GitHub");
+  pluginStub = sinon.stub(githubUtils.GitHub, "plugin");
+  githubStub = sinon.stub();
+  pluginStub.returns(githubStub);
   initializeEnvironment(Mode.actions, pkg.version);
 });
 

diff --git a/src/api-client.ts b/src/api-client.ts
@@ -1,6 +1,7 @@
 import * as path from "path";
 
 import * as githubUtils from "@actions/github/lib/utils";
+import * as retry from "@octokit/plugin-retry";
 import consoleLogLevel from "console-log-level";
 
 import { getRequiredInput } from "./actions-util";
@@ -33,7 +34,8 @@ export const getApiClient = function (
 ) {
   const auth =
     (allowExternal && apiDetails.externalRepoAuth) || apiDetails.auth;
-  return new githubUtils.GitHub(
+  const retryingOctokit = githubUtils.GitHub.plugin(retry.retry);
+  return new retryingOctokit(
     githubUtils.getOctokitOptions(auth, {
       baseUrl: getApiUrl(apiDetails.url),
       userAgent: `CodeQL-${getMode()}/${pkg.version}`,