fix: add Enabled to MSK model. Use this property for MSK events in integ tests (#3822)

Author: valerena

integration/resources/templates/combination/function_with_msk.yaml

@@ -60,6 +60,7 @@ Resources:
         MyMskEvent:
           Type: MSK
           Properties:
+            Enabled: false
             StartingPosition: LATEST
             Stream:
               Ref: MyMskCluster

integration/resources/templates/combination/function_with_msk_trigger_and_confluent_schema_registry.yaml

@@ -60,6 +60,7 @@ Resources:
         MyMskEvent:
           Type: MSK
           Properties:
+            Enabled: false
             StartingPosition: LATEST
             Stream:
               Ref: MyMskCluster

integration/resources/templates/combination/function_with_msk_trigger_and_s3_onfailure_events_destinations.yaml

@@ -27,6 +27,11 @@ Resources:
               logs:CreateLogStream, logs:PutLogEvents, s3:ListBucket]
             Effect: Allow
             Resource: '*'
+          - Action: [s3:PutObject, s3:ListBucket]
+            Effect: Allow
+            Resource:
+            - arn:aws:s3:::*/*
+            - arn:aws:s3:::*
       ManagedPolicyArns:
       - !Sub arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
       Tags:
@@ -60,6 +65,7 @@ Resources:
         MyMskEvent:
           Type: MSK
           Properties:
+            Enabled: false
             StartingPosition: LATEST
             Stream:
               Ref: MyMskCluster

integration/resources/templates/combination/function_with_msk_using_managed_policy.yaml

@@ -33,6 +33,7 @@ Resources:
         MyMskEvent:
           Type: MSK
           Properties:
+            Enabled: false
             StartingPosition: LATEST
             Stream:
               Ref: MyMskCluster

samtranslator/internal/schema_source/aws_serverless_function.py

@@ -411,6 +411,7 @@ class HttpApiEvent(BaseModel):
 
 class MSKEventProperties(BaseModel):
     ConsumerGroupId: Optional[PassThroughProp] = mskeventproperties("ConsumerGroupId")
+    Enabled: Optional[PassThroughProp]  # TODO: it doesn't show up in docs yet
     FilterCriteria: Optional[PassThroughProp] = mskeventproperties("FilterCriteria")
     KmsKeyArn: Optional[PassThroughProp]  # TODO: add documentation
     MaximumBatchingWindowInSeconds: Optional[PassThroughProp] = mskeventproperties("MaximumBatchingWindowInSeconds")

samtranslator/schema/schema.json

@@ -275792,6 +275792,9 @@
         "DestinationConfig": {
           "$ref": "#/definitions/PassThroughProp"
         },
+        "Enabled": {
+          "$ref": "#/definitions/PassThroughProp"
+        },
         "FilterCriteria": {
           "allOf": [
             {

schema_source/sam.schema.json

@@ -2397,6 +2397,9 @@
         "DestinationConfig": {
           "$ref": "#/definitions/PassThroughProp"
         },
+        "Enabled": {
+          "$ref": "#/definitions/PassThroughProp"
+        },
         "FilterCriteria": {
           "allOf": [
             {