test: bump AWS::Serverless::Function runtime to nodejs18.x (#6196)

* test: bump AWS::Serverless::Function runtime to nodejs18.x * chore: remove import of aws-sdk where not needed * chore: replace SQS clients from JS SDK v2 to v3 * chore: replace DynamoDB clients from JS SDK v2 to v3 * chore: replace EventBridge clients from JS SDK v2 to v3 --------- Co-authored-by: Mohamed Elasmar <[email protected]>
aws · Nov 8, 2023 · 7d39ecb · 7d39ecb
1 parent eb47e4a
commit 7d39ecb
Show file tree

Hide file tree

Showing 46 changed files with 106 additions and 114 deletions.
diff --git a/tests/functional/commands/validate/lib/models/api_merge_definitions_global.yaml b/tests/functional/commands/validate/lib/models/api_merge_definitions_global.yaml
@@ -31,7 +31,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {

diff --git a/.../functional/commands/validate/lib/models/api_merge_definitions_with_conflicting_auth.yaml b/.../functional/commands/validate/lib/models/api_merge_definitions_with_conflicting_auth.yaml
@@ -28,7 +28,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {

diff --git a/...nctional/commands/validate/lib/models/api_merge_definitions_with_conflicting_methods.yaml b/...nctional/commands/validate/lib/models/api_merge_definitions_with_conflicting_methods.yaml
@@ -27,7 +27,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {

diff --git a/...l/commands/validate/lib/models/api_merge_definitions_with_conflicting_request_models.yaml b/...l/commands/validate/lib/models/api_merge_definitions_with_conflicting_request_models.yaml
@@ -35,7 +35,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {

diff --git a/...functional/commands/validate/lib/models/api_merge_definitions_with_different_methods.yaml b/...functional/commands/validate/lib/models/api_merge_definitions_with_different_methods.yaml
@@ -27,7 +27,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {

diff --git a/...s/functional/commands/validate/lib/models/api_merge_definitions_with_full_properties.yaml b/...s/functional/commands/validate/lib/models/api_merge_definitions_with_full_properties.yaml
@@ -49,7 +49,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {

diff --git a/...tional/commands/validate/lib/models/api_with_custom_domains_regional_latency_routing.yaml b/...tional/commands/validate/lib/models/api_with_custom_domains_regional_latency_routing.yaml
@@ -41,7 +41,7 @@ Resources:
           return response;
         };
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Events:
         ImplicitGet:
           Type: Api

diff --git a/...l/commands/validate/lib/models/api_with_custom_domains_regional_latency_routing_ipv6.yaml b/...l/commands/validate/lib/models/api_with_custom_domains_regional_latency_routing_ipv6.yaml
@@ -42,7 +42,7 @@ Resources:
           return response;
         };
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Events:
         ImplicitGet:
           Type: Api

diff --git a/tests/functional/commands/validate/lib/models/congito_userpool_with_sms_configuration.yaml b/tests/functional/commands/validate/lib/models/congito_userpool_with_sms_configuration.yaml
@@ -4,7 +4,7 @@ Resources:
     Properties:
       CodeUri: s3://bucket/key
       Handler: app.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Events:
         CognitoUserPoolPreSignup:
           Type: Cognito

diff --git a/tests/functional/commands/validate/lib/models/connector_api_to_function.yaml b/tests/functional/commands/validate/lib/models/connector_api_to_function.yaml
@@ -34,10 +34,9 @@ Resources:
   MyServerlessFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
         exports.handler = async (event) => {
           console.log(JSON.stringify(event));
         };
@@ -58,11 +57,10 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Role: !GetAtt MyRole.Arn
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       Code:
         ZipFile: |
-          const AWS = require('aws-sdk');
           exports.handler = async (event) => {
             console.log(JSON.stringify(event));
           };

diff --git a/tests/functional/commands/validate/lib/models/connector_api_to_multiple_function.yaml b/tests/functional/commands/validate/lib/models/connector_api_to_multiple_function.yaml
@@ -7,10 +7,9 @@ Resources:
   MyServerlessFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
         exports.handler = async (event) => {
           console.log(JSON.stringify(event));
         };
@@ -31,11 +30,10 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Role: !GetAtt MyRole.Arn
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       Code:
         ZipFile: |
-          const AWS = require('aws-sdk');
           exports.handler = async (event) => {
             console.log(JSON.stringify(event));
           };

diff --git a/tests/functional/commands/validate/lib/models/connector_appsync_to_lambda.yaml b/tests/functional/commands/validate/lib/models/connector_appsync_to_lambda.yaml
@@ -19,7 +19,7 @@ Resources:
           return "Hello World"
         }
       Handler: index.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
 
   AppSyncApi:
     Type: AWS::AppSync::GraphQLApi

diff --git a/tests/functional/commands/validate/lib/models/connector_bucket_to_function.yaml b/tests/functional/commands/validate/lib/models/connector_bucket_to_function.yaml
@@ -2,10 +2,9 @@ Resources:
   Function:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
         exports.handler = async (event) => {
           console.log("function")
         };

diff --git a/tests/functional/commands/validate/lib/models/connector_function_to_location.yaml b/tests/functional/commands/validate/lib/models/connector_function_to_location.yaml
@@ -2,10 +2,9 @@ Resources:
   MyFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
         exports.handler = async (event) => {
           console.log(JSON.stringify(event));
         };

diff --git a/tests/functional/commands/validate/lib/models/connector_function_to_multiple_s3.yaml b/tests/functional/commands/validate/lib/models/connector_function_to_multiple_s3.yaml
@@ -2,10 +2,9 @@ Resources:
   MyFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
         exports.handler = async (event) => {
           console.log(JSON.stringify(event));
         };

diff --git a/tests/functional/commands/validate/lib/models/connector_function_to_s3.yaml b/tests/functional/commands/validate/lib/models/connector_function_to_s3.yaml
@@ -2,10 +2,9 @@ Resources:
   MyFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
         exports.handler = async (event) => {
           console.log(JSON.stringify(event));
         };

diff --git a/tests/functional/commands/validate/lib/models/connector_function_to_sqs.yaml b/tests/functional/commands/validate/lib/models/connector_function_to_sqs.yaml
@@ -15,11 +15,10 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Role: !GetAtt MyRole.Arn
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       Code:
         ZipFile: |
-          const AWS = require('aws-sdk');
           exports.handler = async (event) => {
             console.log(JSON.stringify(event));
           };
@@ -30,10 +29,9 @@ Resources:
   MyServerlessFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
         exports.handler = async (event) => {
           console.log(JSON.stringify(event));
         };

diff --git a/tests/functional/commands/validate/lib/models/connector_function_to_table.yaml b/tests/functional/commands/validate/lib/models/connector_function_to_table.yaml
@@ -15,15 +15,17 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Role: !GetAtt MyRole.Arn
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       Code:
         ZipFile: |
-          const AWS = require('aws-sdk');
+          const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
+          const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+
           exports.handler = async (event) => {
             console.log(JSON.stringify(event));
-            const docClient = new AWS.DynamoDB.DocumentClient();
-            await docClient.scan({ TableName: process.env.TABLE_NAME, }).promise();
+            const docClient = DynamoDBDocument.from(new DynamoDB());
+            await docClient.scan({ TableName: process.env.TABLE_NAME, });
           };
       Environment:
         Variables:
@@ -32,14 +34,16 @@ Resources:
   MyServerlessFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
+        const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
+        const { DynamoDB } = require('@aws-sdk/client-dynamodb');
+
         exports.handler = async (event) => {
           console.log(JSON.stringify(event));
-          const docClient = new AWS.DynamoDB.DocumentClient();
-          await docClient.scan({ TableName: process.env.TABLE_NAME, }).promise();
+          const docClient = DynamoDBDocument.from(new DynamoDB());
+          await docClient.scan({ TableName: process.env.TABLE_NAME, });
         };
       Environment:
         Variables:

diff --git a/tests/functional/commands/validate/lib/models/connector_mix_destination.yaml b/tests/functional/commands/validate/lib/models/connector_mix_destination.yaml
@@ -2,27 +2,28 @@ Resources:
   TriggerFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       Timeout: 10  # in case eb has delay
       InlineCode: |
-        const AWS = require('aws-sdk');
+        const { EventBridge } = require('@aws-sdk/client-eventbridge');
+        const { SQS } = require('@aws-sdk/client-sqs');
 
         exports.handler = async (event) => {
-          const eb = new AWS.EventBridge();
+          const eb = new EventBridge();
           const response = await eb.putEvents({
             Entries: [{
               Source: process.env.EVENT_SOURCE,
               Detail: "{}",
               DetailType: "Test",
             }]
-          }).promise();
+          });
 
-          const sqs = new AWS.SQS();
+          const sqs = new SQS();
           const data = await sqs.getQueueAttributes({
             QueueUrl: process.env.QUEUE_URL,
             AttributeNames: ['ApproximateNumberOfMessages']
-          }).promise();
+          });
 
           if (data.Attributes.ApproximateNumberOfMessages < 2) {
             throw 'Not enough messages in the queue!';
@@ -54,17 +55,17 @@ Resources:
   Function:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
+        const { SQS } = require('@aws-sdk/client-sqs');
 
         exports.handler = async (event) => {
-          const sqs = new AWS.SQS();
+          const sqs = new SQS();
           await sqs.sendMessage({
             QueueUrl: process.env.QUEUE_URL,
             MessageBody: "test"
-          }).promise();
+          });
         };
       Environment:
         Variables:

diff --git a/tests/functional/commands/validate/lib/models/connector_sfn_to_function.yaml b/tests/functional/commands/validate/lib/models/connector_sfn_to_function.yaml
@@ -19,10 +19,9 @@ Resources:
   MyFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
         exports.handler = async (event) => {
           console.log(JSON.stringify(event));
         };

diff --git a/tests/functional/commands/validate/lib/models/connector_sfn_to_function_without_policy.yaml b/tests/functional/commands/validate/lib/models/connector_sfn_to_function_without_policy.yaml
@@ -16,7 +16,7 @@ Resources:
   MyFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
         exports.handler = async (event) => {

diff --git a/tests/functional/commands/validate/lib/models/connector_sns_to_function.yaml b/tests/functional/commands/validate/lib/models/connector_sns_to_function.yaml
@@ -18,11 +18,10 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Role: !GetAtt MyRole.Arn
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       Code:
         ZipFile: |
-          const AWS = require('aws-sdk');
           exports.handler = async (event) => {
             console.log(JSON.stringify(event));
           };

diff --git a/tests/functional/commands/validate/lib/models/connector_sqs_to_function.yaml b/tests/functional/commands/validate/lib/models/connector_sqs_to_function.yaml
@@ -5,23 +5,24 @@ Resources:
   TriggerFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       Timeout: 10  # in case eb has delay
       InlineCode: |
-        const AWS = require('aws-sdk');
+        const { SQS } = require('@aws-sdk/client-sqs');
+
         exports.handler = async (event) => {
           var params = {
             QueueUrl: process.env.QUEUE_URL,
             MessageBody: "test queue"
           };
-          var sqs = new AWS.SQS();
-          await sqs.sendMessage(params).promise();
+          var sqs = new SQS();
+          await sqs.sendMessage(params);
 
           const data = await sqs.receiveMessage({
             QueueUrl: process.env.VERIFICATION_QUEUE_URL,
             WaitTimeSeconds: 5,
-          }).promise();
+          });
           if (data.Messages.length == 0) {
             throw 'No messages in the queue!';
           }
@@ -39,16 +40,17 @@ Resources:
   InvokedFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Handler: index.handler
       InlineCode: |
-        const AWS = require('aws-sdk');
+        const { SQS } = require('@aws-sdk/client-sqs');
+
         exports.handler = async (event) => {
-          const sqs = new AWS.SQS();
+          const sqs = new SQS();
           await sqs.sendMessage({
             QueueUrl: process.env.VERIFICATION_QUEUE_URL,
             MessageBody: "test"
-          }).promise();
+          });
         };
       Environment:
         Variables: