Merge branch 'develop' into develop

Author: vicheey

.cfnlintrc.yaml

@@ -144,6 +144,12 @@ ignore_templates:
   - tests/translator/output/**/function_with_metrics_config.json
   - tests/translator/output/**/function_with_self_managed_kafka_and_schema_registry.json # cfnlint is not updated to recognize the SchemaRegistryConfig property
   - tests/translator/output/**/function_with_msk_with_schema_registry_config.json # cfnlint is not updated to recognize the SchemaRegistryConfig property
+  - tests/translator/output/**/*capacity_provider*.json # TODO: Remove this once CFN updates
+  - tests/translator/output/**/function_with_tenancy_config.json # cfnlint is not updated to recognize the TenancyConfig property
+  - tests/translator/output/**/function_with_tenancy_and_api_event.json # cfnlint is not updated to recognize the TenancyConfig property
+  - tests/translator/output/**/function_with_tenancy_and_httpapi_event.json # cfnlint is not updated to recognize the TenancyConfig property
+  - tests/translator/output/**/function_with_tenancy_config_global.json # cfnlint is not updated to recognize the TenancyConfig property
+  - tests/translator/output/**/*durable_config*.json # TODO: Remove this once Durable Function is launched in CFN
 
 ignore_checks:
   - E2531 # Deprecated runtime; not relevant for transform tests

integration/combination/test_function_with_msk.py

@@ -41,14 +41,20 @@ def test_function_with_msk_trigger_and_s3_onfailure_events_destinations(self):
             "combination/function_with_msk_trigger_and_s3_onfailure_events_destinations", parameters
         )
 
-    def test_function_with_msk_trigger_and_confluent_schema_registry(self):
+    def test_function_with_msk_trigger_and_premium_features(self):
         companion_stack_outputs = self.companion_stack_outputs
         parameters = self.get_parameters(companion_stack_outputs)
         cluster_name = "MskCluster4-" + generate_suffix()
         parameters.append(self.generate_parameter("MskClusterName4", cluster_name))
-        self._common_validations_for_MSK(
+        self._common_validations_for_MSK("combination/function_with_msk_trigger_and_premium_features", parameters)
+        event_source_mapping_result = self._common_validations_for_MSK(
             "combination/function_with_msk_trigger_and_confluent_schema_registry", parameters
         )
+        # Verify error handling properties are correctly set
+        self.assertTrue(event_source_mapping_result.get("BisectBatchOnFunctionError"))
+        self.assertEqual(event_source_mapping_result.get("MaximumRecordAgeInSeconds"), 3600)
+        self.assertEqual(event_source_mapping_result.get("MaximumRetryAttempts"), 3)
+        self.assertEqual(event_source_mapping_result.get("FunctionResponseTypes"), ["ReportBatchItemFailures"])
 
     def _common_validations_for_MSK(self, file_name, parameters):
         self.create_and_verify_stack(file_name, parameters)
@@ -74,6 +80,7 @@ def _common_validations_for_MSK(self, file_name, parameters):
 
         self.assertEqual(event_source_mapping_function_arn, lambda_function_arn)
         self.assertEqual(event_source_mapping_kafka_cluster_arn, msk_cluster_arn)
+        return event_source_mapping_result
 
     def get_parameters(self, dictionary):
         parameters = []

integration/combination/test_function_with_self_managed_kafka.py

@@ -16,7 +16,6 @@ class TestFunctionWithSelfManagedKafka(BaseTest):
     @pytest.mark.flaky(reruns=5)
     @parameterized.expand(
         [
-            "combination/function_with_self_managed_kafka",
             "combination/function_with_self_managed_kafka_intrinsics",
         ]
     )
@@ -30,3 +29,29 @@ def test_function_with_self_managed_kafka(self, file_name):
         event_source_mapping_result = lambda_client.get_event_source_mapping(UUID=event_source_mapping_id)
         event_source_mapping_function_arn = event_source_mapping_result["FunctionArn"]
         self.assertEqual(event_source_mapping_function_arn, lambda_function_arn)
+
+    @parameterized.expand(["combination/function_with_self_managed_kafka"])
+    def test_function_with_self_managed_kafka_with_provisioned_mode(self, file_name):
+        self.create_and_verify_stack(file_name)
+        # Get the notification configuration and make sure Lambda Function connection is added
+        lambda_client = self.client_provider.lambda_client
+        function_name = self.get_physical_id_by_type("AWS::Lambda::Function")
+        lambda_function_arn = lambda_client.get_function_configuration(FunctionName=function_name)["FunctionArn"]
+        event_source_mapping_id = self.get_physical_id_by_type("AWS::Lambda::EventSourceMapping")
+        event_source_mapping_result = lambda_client.get_event_source_mapping(UUID=event_source_mapping_id)
+        event_source_mapping_function_arn = event_source_mapping_result["FunctionArn"]
+        self.assertEqual(event_source_mapping_function_arn, lambda_function_arn)
+
+        # Verify error handling properties are correctly set
+        self.assertTrue(event_source_mapping_result.get("BisectBatchOnFunctionError"))
+        self.assertEqual(event_source_mapping_result.get("MaximumRecordAgeInSeconds"), 3600)
+        self.assertEqual(event_source_mapping_result.get("MaximumRetryAttempts"), 3)
+        self.assertEqual(event_source_mapping_result.get("FunctionResponseTypes"), ["ReportBatchItemFailures"])
+        # Uncomment this once SDK is updated.
+        # provisioned_poller_config = event_source_mapping_result["ProvisionedPollerConfig"]
+        # actual_poller_group_name = provisioned_poller_config["PollerGroupName"]
+        # self.assertEqual(
+        #     actual_poller_group_name,
+        #     "test1",
+        #     f"Expected PollerGroupName to be 'test1' but got '{actual_poller_group_name}'",
+        # )

integration/resources/expected/combination/function_with_msk_trigger_and_confluent_schema_registry.json renamed to integration/resources/expected/combination/function_with_msk_trigger_and_premium_features.json

@@ -0,0 +1,22 @@
+[
+  {
+    "LogicalResourceId": "MyApi",
+    "ResourceType": "AWS::ApiGateway::RestApi"
+  },
+  {
+    "LogicalResourceId": "MyApiDeployment",
+    "ResourceType": "AWS::ApiGateway::Deployment"
+  },
+  {
+    "LogicalResourceId": "MyApiProdStage",
+    "ResourceType": "AWS::ApiGateway::Stage"
+  },
+  {
+    "LogicalResourceId": "ApiGatewayDomainName",
+    "ResourceType": "AWS::ApiGateway::DomainName"
+  },
+  {
+    "LogicalResourceId": "MyApiBasePathMapping",
+    "ResourceType": "AWS::ApiGateway::BasePathMapping"
+  }
+]

integration/resources/expected/single/api_with_domain_ipaddresstype.json

@@ -0,0 +1,14 @@
+[
+  {
+    "LogicalResourceId": "MyApi",
+    "ResourceType": "AWS::ApiGateway::RestApi"
+  },
+  {
+    "LogicalResourceId": "MyApiDeployment",
+    "ResourceType": "AWS::ApiGateway::Deployment"
+  },
+  {
+    "LogicalResourceId": "MyApiProdStage",
+    "ResourceType": "AWS::ApiGateway::Stage"
+  }
+]

integration/resources/expected/single/api_with_ipaddresstype.json

@@ -0,0 +1,10 @@
+[
+  {
+    "LogicalResourceId": "MyLambdaFunction",
+    "ResourceType": "AWS::Lambda::Function"
+  },
+  {
+    "LogicalResourceId": "MyLambdaFunctionRole",
+    "ResourceType": "AWS::IAM::Role"
+  }
+]

integration/resources/expected/single/basic_function_with_tenancy_config.json

@@ -66,8 +66,17 @@ Resources:
               Ref: MyMskCluster
             Topics:
             - SchemaRegistryTestTopic
+            DestinationConfig:
+              OnFailure:
+                Type: Kafka
+                Destination: kafka://testTopic
             ProvisionedPollerConfig:
               MinimumPollers: 1
+            BisectBatchOnFunctionError: true
+            MaximumRecordAgeInSeconds: 3600
+            MaximumRetryAttempts: 3
+            FunctionResponseTypes:
+            - ReportBatchItemFailures
             SchemaRegistryConfig:
               AccessConfigs:
               - Type: BASIC_AUTH

integration/resources/templates/combination/function_with_msk_trigger_and_confluent_schema_registry.yaml renamed to integration/resources/templates/combination/function_with_msk_trigger_and_premium_features.yaml

@@ -15,10 +15,18 @@ Resources:
             - 123.45.67.89:9096
             Topics:
             - Topic1
+            ProvisionedPollerConfig:
+              MinimumPollers: 1
+              PollerGroupName: test1
             SourceAccessConfigurations:
             - Type: BASIC_AUTH
               URI:
                 Ref: KafkaUserSecret
+            BisectBatchOnFunctionError: true
+            MaximumRecordAgeInSeconds: 3600
+            MaximumRetryAttempts: 3
+            FunctionResponseTypes:
+            - ReportBatchItemFailures
 
   KafkaUserSecret:
     Type: AWS::SecretsManager::Secret

integration/resources/templates/combination/function_with_self_managed_kafka.yaml

@@ -0,0 +1,23 @@
+Parameters:
+  IpAddressType:
+    Type: String
+    Default: dualstack
+  DomainName:
+    Type: String
+  CertificateArn:
+    Type: String
+
+Resources:
+  MyApi:
+    Type: AWS::Serverless::Api
+    Properties:
+      StageName: Prod
+      DefinitionUri: ${definitionuri}
+      Domain:
+        DomainName: !Ref DomainName
+        CertificateArn: !Ref CertificateArn
+        EndpointConfiguration: REGIONAL
+        IpAddressType: !Ref IpAddressType
+
+Metadata:
+  SamTransformTest: true