fix: Revert lambda nodejs18.x upgrade (#3326)

Author: GavinZZ

integration/combination/test_connectors.py

@@ -1,12 +1,14 @@
 from time import sleep
 from unittest import SkipTest
+from unittest.case import skipIf
 
 from parameterized import parameterized
 from tenacity import retry, retry_if_exception, stop_after_attempt
 
+from integration.config.service_names import SCHEDULE_EVENT
 from integration.conftest import clean_bucket
 from integration.helpers.base_test import S3_BUCKET_PREFIX, BaseTest
-from integration.helpers.resource import generate_suffix
+from integration.helpers.resource import current_region_does_not_support, generate_suffix
 
 retry_once = retry(
     stop=stop_after_attempt(2),
@@ -15,6 +17,39 @@
 )
 
 
+# Explicitly move EB tests out to handlle the failed test in some regions.
+# In those regions, the tests should have been skipped but somehow not.
+# Test using `skipIf` to see if it helps.
+@skipIf(
+    current_region_does_not_support([SCHEDULE_EVENT]),
+    "SCHEDULE_EVENT is not supported in this testing region",
+)
+class TestConnectorsWithEventBus(BaseTest):
+    @parameterized.expand(
+        [
+            ("combination/connector_function_to_eventbus_write",),
+        ]
+    )
+    @retry_once
+    def test_connector_by_invoking_a_function_with_eventbus(self, template_file_path):
+        self.create_and_verify_stack(template_file_path)
+
+        lambda_function_name = self.get_physical_id_by_logical_id("TriggerFunction")
+        lambda_client = self.client_provider.lambda_client
+
+        request_params = {
+            "FunctionName": lambda_function_name,
+            "InvocationType": "RequestResponse",
+            "Payload": "{}",
+        }
+        response = lambda_client.invoke(**request_params)
+        import pdb
+
+        pdb.set_trace()
+        self.assertEqual(response.get("StatusCode"), 200)
+        self.assertEqual(response.get("FunctionError"), None)
+
+
 class TestConnectors(BaseTest):
     def tearDown(self):
         # Some tests will create items in S3 Bucket, which result in stack DELETE_FAILED state
@@ -42,7 +77,6 @@ def tearDown(self):
             ("combination/connector_function_to_queue_write",),
             ("combination/connector_function_to_queue_read",),
             ("combination/connector_function_to_topic_write",),
-            ("combination/connector_function_to_eventbus_write",),
             ("combination/connector_topic_to_queue_write",),
             ("combination/connector_event_rule_to_sqs_write",),
             ("combination/connector_event_rule_to_sns_write",),

integration/resources/templates/combination/api_with_authorizer_apikey.yaml

@@ -14,7 +14,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {
@@ -45,7 +45,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           console.log(event);

integration/resources/templates/combination/api_with_authorizers_invokefunction_set_none.yaml

@@ -31,7 +31,7 @@ Resources:
       InlineCode: |
         print("hello")
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       Events:
         API3:
           Type: Api
@@ -50,7 +50,7 @@ Resources:
       InlineCode: |
         print("hello")
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       Events:
         MyApiWithAwsIamAuth:
           Type: Api

integration/resources/templates/combination/api_with_authorizers_max.yaml

@@ -43,7 +43,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {
@@ -101,7 +101,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           const token = event.type === 'TOKEN' ? event.authorizationToken : event.queryStringParameters.authorization

integration/resources/templates/combination/api_with_authorizers_max_openapi.yaml

@@ -46,7 +46,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {
@@ -114,7 +114,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           const token = event.type === 'TOKEN' ? event.authorizationToken : event.queryStringParameters.authorization

integration/resources/templates/combination/api_with_authorizers_min.yaml

@@ -23,7 +23,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           return {
@@ -80,7 +80,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       InlineCode: |
         exports.handler = async (event, context, callback) => {
           const token = event.type === 'TOKEN' ? event.authorizationToken : event.queryStringParameters.authorization

integration/resources/templates/combination/api_with_binary_media_types_with_definition_body_openapi.yaml

@@ -51,7 +51,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       CodeUri:
         Bucket:
           Ref: Bucket

integration/resources/templates/combination/api_with_cors.yaml

@@ -22,7 +22,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       CodeUri: ${codeuri}
       MemorySize: 128
 

integration/resources/templates/combination/api_with_cors_and_apikey.yaml

@@ -22,7 +22,7 @@ Resources:
             body: JSON.stringify({ message: "Hello, SAM!" }),
           }
         }
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
 
   ApiGatewayLambdaRole:
     Type: AWS::IAM::Role

integration/resources/templates/combination/api_with_cors_only_headers.yaml

@@ -24,7 +24,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: index.handler
-      Runtime: nodejs18.x
+      Runtime: nodejs16.x
       CodeUri: ${codeuri}
       MemorySize: 128