Merge pull request #783 from PRX/dtr-scaler-node-upgrade

Upgrade Router scaler function to Node.js 20 and AWS SDK v3

package.json

@@ -16,6 +16,7 @@
     "@aws-sdk/client-cloudwatch": "3.x",
     "@aws-sdk/client-codebuild": "3.x",
     "@aws-sdk/client-codepipeline": "3.x",
+    "@aws-sdk/client-dynamodb": "3.x",
     "@aws-sdk/client-ec2": "3.x",
     "@aws-sdk/client-ecs": "3.x",
     "@aws-sdk/client-eventbridge": "3.x",

spire/templates/apps/dovetail-router.yml

@@ -925,10 +925,23 @@ Resources:
                 - aws.s3
       Handler: index.handler
       InlineCode: !Sub |
-        const AWS = require('aws-sdk');
-        const s3 = new AWS.S3();
-        const ddb = new AWS.DynamoDB({ region: '${AWS::Region}' });
-        const ecs = new AWS.ECS({ region: '${AWS::Region}' });
+        // As of 2024-09, there's no way to use `import` as part of inline
+        // Lambda function code, so we have to use `require`.
+        const { S3Client, GetObjectCommand } = require('@aws-sdk/client-s3');
+        const {
+          DynamoDBClient,
+          BatchGetItemCommand,
+          PutItemCommand,
+        } = require('@aws-sdk/client-dynamodb');
+        const {
+          ECSClient,
+          DescribeServicesCommand,
+          UpdateServiceCommand,
+        } = require('@aws-sdk/client-ecs');
+
+        const s3 = new S3Client();
+        const ddb = new DynamoDBClient({ region: '${AWS::Region}' });
+        const ecs = new ECSClient({ region: '${AWS::Region}' });
 
         const TABLE_NAME = process.env.DYNAMODB_TABLE_NAME;
         const CLUSTER_NAME = process.env.ECS_CLUSTER_NAME;
@@ -940,15 +953,18 @@ Resources:
         };
 
         exports.handler = async (event) => {
+          console.log(JSON.stringify(event));
+
           const Bucket = event.detail.bucket.name;
           const Key = event.detail.object.key;
           if (!SCALE_TO[Key]) {
             return;
           }
 
           // read rss guids
-          const result = await s3.getObject({ Bucket, Key }).promise();
-          const matches = result.Body.toString('utf-8').matchAll(/>([^<]+)<\/guid>/g);
+          const result = await s3.send(new GetObjectCommand({ Bucket, Key }));
+          const resultBody = await result.Body.transformToString();
+          const matches = resultBody.matchAll(/>([^<]+)<\/guid>/g);
           const guids = [];
           for (const match of matches) {
             guids.push(match[1]);
@@ -966,7 +982,7 @@ Resources:
           const found = {};
           for (const Keys of chunkedKeys) {
             const params = { RequestItems: { [TABLE_NAME]: { Keys } } };
-            const data = await ddb.batchGetItem(params).promise();
+            const data = await ddb.send(new BatchGetItemCommand(params));
             data.Responses[TABLE_NAME].forEach((r) => (found[r.guid.S] = true));
           }
           const newGuids = guids.filter((g) => !found[g]);
@@ -975,7 +991,7 @@ Resources:
           // scale ECS service
           if (newGuids.length > 0) {
             const params = { cluster: CLUSTER_NAME, services: [SERVICE_NAME] };
-            const res = await ecs.describeServices(params).promise();
+            const res = await ecs.send(new DescribeServicesCommand(params));
             const count = res.services[0].desiredCount;
             const desiredCount = SCALE_TO[Key];
             if (count < desiredCount) {
@@ -985,7 +1001,7 @@ Resources:
                 service: SERVICE_NAME,
                 desiredCount,
               };
-              await ecs.updateService(updateParams).promise();
+              await ecs.send(new UpdateServiceCommand(updateParams));
             } else {
               console.info(`Already at ${!count}`);
             }
@@ -994,7 +1010,7 @@ Resources:
           // set new guids in DDB
           for (const guid of newGuids) {
             const params = { TableName: TABLE_NAME, Item: { guid: { S: guid } } };
-            await ddb.putItem(params).promise();
+            await ddb.send(new PutItemCommand(params));
           }
         };
       MemorySize: 512
@@ -1022,7 +1038,7 @@ Resources:
               Effect: Allow
               Resource: !Sub arn:aws:ecs:${AWS::Region}:${AWS::AccountId}:service/${EcsClusterName}/${EcsService.Name}
           Version: "2012-10-17"
-      Runtime: nodejs16.x
+      Runtime: nodejs20.x
       Tags:
         prx:meta:tagging-version: "2021-04-07"
         prx:cloudformation:stack-name: !Ref AWS::StackName