fix: upgrade runner module to support upgrade octokit auth-app

philips-labs · May 21, 2021 · 6b4d94f · 6b4d94f
1 parent 6d31735
commit 6b4d94f
Show file tree

Hide file tree

Showing 3 changed files with 684 additions and 522 deletions.
diff --git a/modules/runners/lambdas/runners/src/scale-runners/gh-auth.ts b/modules/runners/lambdas/runners/src/scale-runners/gh-auth.ts
@@ -1,7 +1,12 @@
 import { Octokit } from '@octokit/rest';
 import { request } from '@octokit/request';
 import { createAppAuth } from '@octokit/auth-app';
-import { Authentication, StrategyOptions } from '@octokit/auth-app/dist-types/types';
+import {
+  Authentication,
+  StrategyOptions,
+  AppAuthentication,
+  InstallationAccessTokenAuthentication,
+} from '@octokit/auth-app/dist-types/types';
 import { OctokitOptions } from '@octokit/core/dist-types/types';
 import { decrypt } from './kms';
 
@@ -20,7 +25,7 @@ export async function createGithubAuth(
   installationId: number | undefined,
   authType: 'app' | 'installation',
   ghesApiUrl = '',
-): Promise<Authentication> {
+): Promise<AppAuthentication> {
   const clientSecret = await decrypt(
     process.env.GITHUB_APP_CLIENT_SECRET as string,
     process.env.KMS_KEY_ID as string,
@@ -54,5 +59,11 @@ export async function createGithubAuth(
       baseUrl: ghesApiUrl,
     });
   }
-  return await createAppAuth(authOptions)({ type: authType });
+  const result = (await createAppAuth(authOptions)({ type: authType })) as AppAuthentication;
+  return result;
+  // if (result.type == 'oauth-app') {
+  //   return result;
+  // } else {
+  //   throw Error(`Authentication type ${authType} is not`);
+  // }
 }
diff --git a/modules/runners/lambdas/runners/src/scale-runners/scale-up.ts b/modules/runners/lambdas/runners/src/scale-runners/scale-up.ts
@@ -42,8 +42,8 @@ export const scaleUp = async (eventSource: string, payload: ActionRequestMessage
         ).data.id;
   }
 
-
   const ghAuth = await createGithubAuth(installationId, 'installation', ghesApiUrl);
+
   const githubInstallationClient = await createOctoClient(ghAuth.token, ghesApiUrl);
   const checkRun = await githubInstallationClient.checks.get({
     check_run_id: payload.id,
@@ -60,9 +60,10 @@ export const scaleUp = async (eventSource: string, payload: ActionRequestMessage
       repoName: repoName,
     });
     console.info(
-      `${enableOrgLevel
-        ? `Organization ${payload.repositoryOwner}`
-        : `Repo ${payload.repositoryOwner}/${payload.repositoryName}`
+      `${
+        enableOrgLevel
+          ? `Organization ${payload.repositoryOwner}`
+          : `Repo ${payload.repositoryOwner}/${payload.repositoryName}`
       } has ${currentRunners.length}/${maximumRunners} runners`,
     );
 
@@ -71,9 +72,9 @@ export const scaleUp = async (eventSource: string, payload: ActionRequestMessage
       const registrationToken = enableOrgLevel
         ? await githubInstallationClient.actions.createRegistrationTokenForOrg({ org: payload.repositoryOwner })
         : await githubInstallationClient.actions.createRegistrationTokenForRepo({
-          owner: payload.repositoryOwner,
-          repo: payload.repositoryName,
-        });
+            owner: payload.repositoryOwner,
+            repo: payload.repositoryName,
+          });
       const token = registrationToken.data.token;
 
       const labelsArgument = runnerExtraLabels !== undefined ? `--labels ${runnerExtraLabels}` : '';
@@ -84,7 +85,7 @@ export const scaleUp = async (eventSource: string, payload: ActionRequestMessage
         runnerConfig: enableOrgLevel
           ? `--url ${configBaseUrl}/${payload.repositoryOwner} --token ${token} ${labelsArgument}${runnerGroupArgument}`
           : `--url ${configBaseUrl}/${payload.repositoryOwner}/${payload.repositoryName} ` +
-          `--token ${token} ${labelsArgument}`,
+            `--token ${token} ${labelsArgument}`,
         orgName: orgName,
         repoName: repoName,
       });