Merge branch 'develop' into dependabot/github_actions/actions/setup-python-6

Author: roger-zhangg

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/data/aws_managed_policies.json

@@ -756,7 +756,7 @@
     "AmazonGrafanaCloudWatchAccess": "arn:aws:iam::aws:policy/service-role/AmazonGrafanaCloudWatchAccess",
     "AmazonGrafanaRedshiftAccess": "arn:aws:iam::aws:policy/service-role/AmazonGrafanaRedshiftAccess",
     "AmazonGrafanaServiceLinkedRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonGrafanaServiceLinkedRolePolicy",
-    "AmazonGuardDutyFullAccess": "arn:aws:iam::aws:policy/AmazonGuardDutyFullAccess",
+    "AmazonGuardDutyFullAccess_v2": "arn:aws:iam::aws:policy/AmazonGuardDutyFullAccess_v2",
     "AmazonGuardDutyMalwareProtectionServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonGuardDutyMalwareProtectionServiceRolePolicy",
     "AmazonGuardDutyReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonGuardDutyReadOnlyAccess",
     "AmazonGuardDutyServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonGuardDutyServiceRolePolicy",
@@ -1577,7 +1577,7 @@
     "AmazonFreeRTOSOTAUpdate": "arn:aws-cn:iam::aws:policy/service-role/AmazonFreeRTOSOTAUpdate",
     "AmazonGlacierFullAccess": "arn:aws-cn:iam::aws:policy/AmazonGlacierFullAccess",
     "AmazonGlacierReadOnlyAccess": "arn:aws-cn:iam::aws:policy/AmazonGlacierReadOnlyAccess",
-    "AmazonGuardDutyFullAccess": "arn:aws-cn:iam::aws:policy/AmazonGuardDutyFullAccess",
+    "AmazonGuardDutyFullAccess_v2": "arn:aws-cn:iam::aws:policy/AmazonGuardDutyFullAccess_v2",
     "AmazonGuardDutyMalwareProtectionServiceRolePolicy": "arn:aws-cn:iam::aws:policy/aws-service-role/AmazonGuardDutyMalwareProtectionServiceRolePolicy",
     "AmazonGuardDutyReadOnlyAccess": "arn:aws-cn:iam::aws:policy/AmazonGuardDutyReadOnlyAccess",
     "AmazonGuardDutyServiceRolePolicy": "arn:aws-cn:iam::aws:policy/aws-service-role/AmazonGuardDutyServiceRolePolicy",
@@ -2200,7 +2200,7 @@
     "AmazonFSxServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AmazonFSxServiceRolePolicy",
     "AmazonGlacierFullAccess": "arn:aws-us-gov:iam::aws:policy/AmazonGlacierFullAccess",
     "AmazonGlacierReadOnlyAccess": "arn:aws-us-gov:iam::aws:policy/AmazonGlacierReadOnlyAccess",
-    "AmazonGuardDutyFullAccess": "arn:aws-us-gov:iam::aws:policy/AmazonGuardDutyFullAccess",
+    "AmazonGuardDutyFullAccess_v2": "arn:aws-us-gov:iam::aws:policy/AmazonGuardDutyFullAccess_v2",
     "AmazonGuardDutyReadOnlyAccess": "arn:aws-us-gov:iam::aws:policy/AmazonGuardDutyReadOnlyAccess",
     "AmazonGuardDutyServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AmazonGuardDutyServiceRolePolicy",
     "AmazonInspector2FullAccess": "arn:aws-us-gov:iam::aws:policy/AmazonInspector2FullAccess",
@@ -2608,7 +2608,7 @@
     "AmazonGrafanaCloudWatchAccess": "arn:aws-eusc:iam::aws:policy/service-role/AmazonGrafanaCloudWatchAccess",
     "AmazonGrafanaRedshiftAccess": "arn:aws-eusc:iam::aws:policy/service-role/AmazonGrafanaRedshiftAccess",
     "AmazonGrafanaServiceLinkedRolePolicy": "arn:aws-eusc:iam::aws:policy/aws-service-role/AmazonGrafanaServiceLinkedRolePolicy",
-    "AmazonGuardDutyFullAccess": "arn:aws-eusc:iam::aws:policy/AmazonGuardDutyFullAccess",
+    "AmazonGuardDutyFullAccess_v2": "arn:aws-eusc:iam::aws:policy/AmazonGuardDutyFullAccess_v2",
     "AmazonGuardDutyMalwareProtectionServiceRolePolicy": "arn:aws-eusc:iam::aws:policy/aws-service-role/AmazonGuardDutyMalwareProtectionServiceRolePolicy",
     "AmazonGuardDutyReadOnlyAccess": "arn:aws-eusc:iam::aws:policy/AmazonGuardDutyReadOnlyAccess",
     "AmazonGuardDutyServiceRolePolicy": "arn:aws-eusc:iam::aws:policy/aws-service-role/AmazonGuardDutyServiceRolePolicy",

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")