fix: change module exports and upgrade vercel to latest release (#1005)

* bugfix: change module exports and upgrade vercel to latest release

* bugfix: webhook.verify is now asynchronous

Author: PatrickMennen

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/package.json

@@ -21,7 +21,7 @@
     "@types/request": "^2.48.4",
     "@typescript-eslint/eslint-plugin": "^4.28.0",
     "@typescript-eslint/parser": "^4.17.0",
-    "@vercel/ncc": "0.27.0",
+    "@vercel/ncc": "^0.29.0",
     "aws-sdk": "^2.888.0",
     "eslint": "^7.24.0",
     "jest": "^26.6.3",
@@ -33,4 +33,4 @@
     "request": "^2.88.2",
     "yn": "^4.0.0"
   }
-}
+}

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/lambda.ts

@@ -1,7 +1,7 @@
 import { handle } from './syncer/handler';
 
 // eslint-disable-next-line
-module.exports.handler = async (event: any, context: any, callback: any): Promise<any> => {
+export const handler = async (event: any, context: any, callback: any): Promise<void> => {
   await handle();
-  return callback();
+  callback();
 };

modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/yarn.lock

@@ -890,10 +890,10 @@
     "@typescript-eslint/types" "4.28.0"
     eslint-visitor-keys "^2.0.0"
 
-"@vercel/ncc@0.27.0":
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.27.0.tgz#c0cfeebb0bebb56052719efa4a0ecc090a932c76"
-  integrity sha512-DllIJQapnU2YwewIhh/4dYesmMQw3h2cFtabECc/zSJHqUbNa0eJuEkRa6DXbZvh1YPWBtYQoPV17NlDpBw1Vw==
+"@vercel/ncc@^0.29.0":
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.29.0.tgz#ac23fc23f1593b05c72360108bcf6d849d2f317a"
+  integrity sha512-p+sB835wOSDdgm2mgFgSOcXJF84AqZ+vBEnnGS0sm8veA92Hia7sqH0qEnqeFilPl+cXtxbdh2er+WdlfbVCZA==
 
 abab@^2.0.3, abab@^2.0.5:
   version "2.0.5"

modules/runners/lambdas/runners/package.json

@@ -20,7 +20,7 @@
     "@types/jest": "^26.0.20",
     "@typescript-eslint/eslint-plugin": "^4.17.0",
     "@typescript-eslint/parser": "^4.22.0",
-    "@vercel/ncc": "0.27.0",
+    "@vercel/ncc": "^0.29.0",
     "eslint": "^7.22.0",
     "jest": "^26.6.3",
     "jest-mock-extended": "^1.0.13",
@@ -41,4 +41,4 @@
     "typescript": "^4.2.3",
     "yn": "^4.0.0"
   }
-}
+}

modules/runners/lambdas/runners/src/lambda.ts

@@ -1,26 +1,27 @@
-import { scaleUp } from './scale-runners/scale-up';
-import { scaleDown } from './scale-runners/scale-down';
+import { scaleUp as scaleUpAction } from './scale-runners/scale-up';
+import { scaleDown as scaleDownAction } from './scale-runners/scale-down';
 import { SQSEvent, ScheduledEvent, Context } from 'aws-lambda';
 
-module.exports.scaleUp = async (event: SQSEvent, context: Context, callback: any) => {
+export const scaleUp = async (event: SQSEvent, context: Context, callback: any): Promise<void> => {
   console.dir(event, { depth: 5 });
   try {
     for (const e of event.Records) {
-      await scaleUp(e.eventSource, JSON.parse(e.body));
+      await scaleUpAction(e.eventSource, JSON.parse(e.body));
     }
-    return callback(null);
+
+    callback(null);
   } catch (e) {
     console.error(e);
-    return callback('Failed handling SQS event');
+    callback('Failed handling SQS event');
   }
 };
 
-module.exports.scaleDown = async (event: ScheduledEvent, context: Context, callback: any) => {
+export const scaleDown = async (event: ScheduledEvent, context: Context, callback: any): Promise<void> => {
   try {
-    scaleDown();
-    return callback(null);
+    scaleDownAction();
+    callback(null);
   } catch (e) {
     console.error(e);
-    return callback('Failed');
+    callback('Failed');
   }
 };

modules/runners/lambdas/runners/yarn.lock

@@ -983,10 +983,10 @@
     "@typescript-eslint/types" "4.27.0"
     eslint-visitor-keys "^2.0.0"
 
-"@vercel/ncc@0.27.0":
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.27.0.tgz#c0cfeebb0bebb56052719efa4a0ecc090a932c76"
-  integrity sha512-DllIJQapnU2YwewIhh/4dYesmMQw3h2cFtabECc/zSJHqUbNa0eJuEkRa6DXbZvh1YPWBtYQoPV17NlDpBw1Vw==
+"@vercel/ncc@^0.29.0":
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.29.0.tgz#ac23fc23f1593b05c72360108bcf6d849d2f317a"
+  integrity sha512-p+sB835wOSDdgm2mgFgSOcXJF84AqZ+vBEnnGS0sm8veA92Hia7sqH0qEnqeFilPl+cXtxbdh2er+WdlfbVCZA==
 
 abab@^2.0.3, abab@^2.0.5:
   version "2.0.5"

modules/webhook/lambdas/webhook/package.json

@@ -21,7 +21,7 @@
     "@types/node": "^15.12.2",
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
-    "@vercel/ncc": "0.27.0",
+    "@vercel/ncc": "0.29.0",
     "aws-sdk": "^2.888.0",
     "body-parser": "^1.19.0",
     "eslint": "^7.29.0",
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.3.5",
-    "@octokit/webhooks": "^8.5.4"
+    "@octokit/webhooks": "^9.10.0"
   }
-}
+}

modules/webhook/lambdas/webhook/src/lambda.ts

@@ -1,8 +1,8 @@
-import { handle as githubWebhook } from './webhook/handler';
+import { handle } from './webhook/handler';
 
-module.exports.githubWebhook = async (event: any, context: any, callback: any) => {
-  const statusCode = await githubWebhook(event.headers, event.body);
-  return callback(null, {
+export const githubWebhook = async (event: any, context: any, callback: any): Promise<void> => {
+  const statusCode = await handle(event.headers, event.body);
+  callback(null, {
     statusCode: statusCode,
   });
 };

modules/webhook/lambdas/webhook/src/webhook/handler.test.ts

@@ -92,5 +92,4 @@ describe('handler', () => {
     expect(resp).toBe(200);
     expect(sendActionRequest).toBeCalled();
   });
-
 });

modules/webhook/lambdas/webhook/src/webhook/handler.ts

@@ -1,7 +1,7 @@
 import { IncomingHttpHeaders } from 'http';
 import { Webhooks } from '@octokit/webhooks';
 import { sendActionRequest } from '../sqs';
-import { CheckRunEvent } from '@octokit/webhooks-definitions/schema';
+import { CheckRunEvent } from '@octokit/webhooks-types';
 import { decrypt } from '../kms';
 
 export const handle = async (headers: IncomingHttpHeaders, payload: any): Promise<number> => {
@@ -29,7 +29,7 @@ export const handle = async (headers: IncomingHttpHeaders, payload: any): Promis
   const webhooks = new Webhooks({
     secret: secret,
   });
-  if (!webhooks.verify(payload, signature)) {
+  if (!(await webhooks.verify(payload, signature))) {
     console.error('Unable to verify signature!');
     return 401;
   }
@@ -41,7 +41,7 @@ export const handle = async (headers: IncomingHttpHeaders, payload: any): Promis
   if (githubEvent === 'check_run') {
     const body = JSON.parse(payload) as CheckRunEvent;
 
-    const repositoryWhiteListEnv = process.env.REPOSITORY_WHITE_LIST as string || "[]";
+    const repositoryWhiteListEnv = (process.env.REPOSITORY_WHITE_LIST as string) || '[]';
     const repositoryWhiteList = JSON.parse(repositoryWhiteListEnv) as Array<string>;
 
     if (repositoryWhiteList.length > 0) {