fix: remove fetch override for octokit and versions

Author: npalm

lambdas/functions/control-plane/jest.config.ts

@@ -6,10 +6,10 @@ const config: Config = {
   ...defaultConfig,
   coverageThreshold: {
     global: {
-      statements: 98.01,
-      branches: 97.28,
-      functions: 95.6,
-      lines: 97.94,
+      statements: 97.99,
+      branches: 97.26,
+      functions: 95.45,
+      lines: 97.92,
     },
   },
 };

lambdas/functions/control-plane/package.json

@@ -44,11 +44,10 @@
     "@octokit/auth-app": "6.1.1",
     "@octokit/core": "5.2.0",
     "@octokit/plugin-throttling": "8.2.0",
-    "@octokit/rest": "20.0.2",
+    "@octokit/rest": "20.1.1",
     "@octokit/types": "^13.5.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
     "@terraform-aws-github-runner/aws-ssm-util": "*",
-    "axios": "^1.7.2",
     "cron-parser": "^4.9.0",
     "typescript": "^5.5.4"
   },

lambdas/functions/control-plane/src/axios/fetch-override.test.ts

@@ -95,7 +95,7 @@ ${decryptedValue}`,
 
     // Assert
     expect(mockedCreatAppAuth).toBeCalledTimes(1);
-    expect(mockedCreatAppAuth).toBeCalledWith({ ...authOptions, request: expect.anything() });
+    expect(mockedCreatAppAuth).toBeCalledWith({ ...authOptions });
   });
 
   test('Creates auth object for public GitHub', async () => {
@@ -121,7 +121,7 @@ ${decryptedValue}`,
     expect(getParameter).toBeCalledWith(PARAMETER_GITHUB_APP_KEY_BASE64_NAME);
 
     expect(mockedCreatAppAuth).toBeCalledTimes(1);
-    expect(mockedCreatAppAuth).toBeCalledWith({ ...authOptions, request: expect.anything() });
+    expect(mockedCreatAppAuth).toBeCalledWith({ ...authOptions });
     expect(mockedAuth).toBeCalledWith({ type: authType });
     expect(result.token).toBe(token);
   });

lambdas/functions/control-plane/src/axios/fetch-override.ts

@@ -13,16 +13,14 @@ import { Octokit } from '@octokit/rest';
 import { throttling } from '@octokit/plugin-throttling';
 import { createChildLogger } from '@terraform-aws-github-runner/aws-powertools-util';
 import { getParameter } from '@terraform-aws-github-runner/aws-ssm-util';
-
-import { axiosFetch } from '../axios/fetch-override';
+import { EndpointDefaults } from '@octokit/types';
 
 const logger = createChildLogger('gh-auth');
 
 export async function createOctoClient(token: string, ghesApiUrl = ''): Promise<Octokit> {
   const CustomOctokit = Octokit.plugin(throttling);
   const ocktokitOptions: OctokitOptions = {
     auth: token,
-    request: { fetch: axiosFetch },
   };
   if (ghesApiUrl) {
     ocktokitOptions.baseUrl = ghesApiUrl;
@@ -32,12 +30,12 @@ export async function createOctoClient(token: string, ghesApiUrl = ''): Promise<
   return new CustomOctokit({
     ...ocktokitOptions,
     throttle: {
-      onRateLimit: (options: { method: string; url: string }) => {
+      onRateLimit: (retryAfter: number, options: Required<EndpointDefaults>) => {
         logger.warn(
           `GitHub rate limit: Request quota exhausted for request ${options.method} ${options.url}. Requested `,
         );
       },
-      onSecondaryRateLimit: (options: { method: string; url: string }) => {
+      onSecondaryRateLimit: (retryAfter: number, options: Required<EndpointDefaults>) => {
         logger.warn(`GitHub rate limit: SecondaryRateLimit detected for request ${options.method} ${options.url}`);
       },
     },
@@ -82,12 +80,7 @@ async function createAuth(installationId: number | undefined, ghesApiUrl: string
   if (ghesApiUrl) {
     authOptions.request = request.defaults({
       baseUrl: ghesApiUrl,
-      request: {
-        fetch: axiosFetch,
-      },
     });
-  } else {
-    authOptions.request = request.defaults({ request: { fetch: axiosFetch } });
   }
   return createAppAuth(authOptions);
 }

lambdas/functions/control-plane/src/gh-auth/gh-auth.test.ts

@@ -40,7 +40,7 @@
     "@aws-sdk/lib-storage": "^3.623.0",
     "@aws-sdk/types": "^3.609.0",
     "@middy/core": "^4.7.0",
-    "@octokit/rest": "20.0.2",
+    "@octokit/rest": "20.1.1",
     "@terraform-aws-github-runner/aws-powertools-util": "*",
     "axios": "^1.7.2"
   },

lambdas/functions/control-plane/src/gh-auth/gh-auth.ts

@@ -39,7 +39,7 @@
   "dependencies": {
     "@aws-sdk/client-sqs": "^3.623.0",
     "@middy/core": "^4.7.0",
-    "@octokit/rest": "20.0.2",
+    "@octokit/rest": "20.1.1",
     "@octokit/types": "^13.5.0",
     "@octokit/webhooks": "^12.2.0",
     "@terraform-aws-github-runner/aws-powertools-util": "*",