Upgrade webhook lambda for scale up/down to aws sdk v3 (#7077)

Similar to #7061 

Mostly just getting rid of `promise()`

Testing:
just `yarn test` but idk how helpful that is since it mocks everything
Deployed to pytorch-canary and it seems ok?

Author: clee2000

terraform-aws-github-runner/modules/webhook/lambdas/webhook/package.json

@@ -22,7 +22,6 @@
     "@typescript-eslint/eslint-plugin": "^7.10.0",
     "@typescript-eslint/parser": "^7.10.0",
     "@vercel/ncc": "^0.38.1",
-    "aws-sdk": "^2.1627.0",
     "body-parser": "^1.20.3",
     "eslint": "8.56.0",
     "express": "^4.17.1",
@@ -31,13 +30,15 @@
     "prettier": "^3.2.5",
     "ts-jest": "^28.0.8",
     "ts-node-dev": "^2.0.0",
-    "typescript-eslint": "^7.10.0",
-    "typescript": "^4.3.0"
+    "typescript": "^4.3.0",
+    "typescript-eslint": "^7.10.0"
   },
   "dependencies": {
+    "@aws-sdk/client-kms": "^3.879.0",
+    "@aws-sdk/client-sqs": "^3.879.0",
     "@octokit/rest": "^20.1.1",
+    "@octokit/webhooks": "^12.2.0",
     "@octokit/webhooks-methods": "^5.1.0",
-    "@octokit/webhooks-types": "^7.5.1",
-    "@octokit/webhooks": "^12.2.0"
+    "@octokit/webhooks-types": "^7.5.1"
   }
 }

terraform-aws-github-runner/modules/webhook/lambdas/webhook/src/kms/index.ts

@@ -1,24 +1,17 @@
-import { KMS } from 'aws-sdk';
-import AWS from 'aws-sdk';
+import { KMS } from '@aws-sdk/client-kms';
 
-AWS.config.update({
-  region: process.env.AWS_REGION,
-});
-
-const kms = new KMS();
+const kms = new KMS({ region: process.env.AWS_REGION });
 
 export async function decrypt(encrypted: string, key: string, environmentName: string): Promise<string | undefined> {
   let result: string | undefined = encrypted;
   if (key != undefined) {
-    const decrypted = await kms
-      .decrypt({
-        CiphertextBlob: Buffer.from(encrypted, 'base64'),
-        KeyId: key,
-        EncryptionContext: {
-          ['Environment']: environmentName,
-        },
-      })
-      .promise();
+    const decrypted = await kms.decrypt({
+      CiphertextBlob: Buffer.from(encrypted, 'base64') as Uint8Array,
+      KeyId: key,
+      EncryptionContext: {
+        ['Environment']: environmentName,
+      },
+    });
     result = decrypted.Plaintext?.toString();
   }
   return result;

terraform-aws-github-runner/modules/webhook/lambdas/webhook/src/sqs/index.ts

@@ -1,11 +1,6 @@
-import { SQS } from 'aws-sdk';
-import AWS from 'aws-sdk';
+import { SQS } from '@aws-sdk/client-sqs';
 
-AWS.config.update({
-  region: process.env.AWS_REGION,
-});
-
-const sqs = new SQS();
+const sqs = new SQS({ region: process.env.AWS_REGION });
 
 export interface ActionRequestMessage {
   id: number;
@@ -22,10 +17,8 @@ const NUM_MESSAGE_GROUPS = process.env.NUM_MESSAGE_GROUPS !== undefined ? parseI
 
 export const sendActionRequest = async (message: ActionRequestMessage) => {
   console.info(`Sending message: ${JSON.stringify(message)}`);
-  await sqs
-    .sendMessage({
-      QueueUrl: String(process.env.SQS_URL_WEBHOOK),
-      MessageBody: JSON.stringify(message),
-    })
-    .promise();
+  await sqs.sendMessage({
+    QueueUrl: String(process.env.SQS_URL_WEBHOOK),
+    MessageBody: JSON.stringify(message),
+  });
 };