Merge branch 'develop' into feat_toggle_openapi

aws · Apr 19, 2024 · afd6e25 · afd6e25
2 parents 44bd87a + 7593908
commit afd6e25
Show file tree

Hide file tree

Showing 17 changed files with 3,604 additions and 647 deletions.
diff --git a/integration/resources/templates/combination/connector_sfn_to_sns_write.yaml b/integration/resources/templates/combination/connector_sfn_to_sns_write.yaml
@@ -19,6 +19,8 @@ Resources:
 
   MyTopic:
     Type: AWS::SNS::Topic
+    Properties:
+      KmsMasterKeyId: alias/aws/sns
 
   MyConnector:
     Type: AWS::Serverless::Connector

diff --git a/integration/resources/templates/combination/function_with_alias_and_event_sources.yaml b/integration/resources/templates/combination/function_with_alias_and_event_sources.yaml
@@ -91,6 +91,9 @@ Resources:
     Type: AWS::Kinesis::Stream
     Properties:
       ShardCount: 1
+      StreamEncryption:
+        EncryptionType: KMS
+        KeyId: alias/aws/kinesis
 
   # What an irony the I can't use AWS::Serverless::SimpleTable here because it doesn't support streams specification
   MyTable:

diff --git a/integration/resources/templates/combination/function_with_all_event_types.yaml b/integration/resources/templates/combination/function_with_all_event_types.yaml
@@ -132,6 +132,9 @@ Resources:
     Condition: MyCondition
     Properties:
       ShardCount: 1
+      StreamEncryption:
+        EncryptionType: KMS
+        KeyId: alias/aws/kinesis
 
   MyDynamoDB:
     UpdateReplacePolicy: Delete

diff --git a/...ration/resources/templates/combination/function_with_all_event_types_condition_false.yaml b/...ration/resources/templates/combination/function_with_all_event_types_condition_false.yaml
@@ -113,6 +113,9 @@ Resources:
     Condition: MyCondition
     Properties:
       ShardCount: 1
+      StreamEncryption:
+        EncryptionType: KMS
+        KeyId: alias/aws/kinesis
 
   MyDynamoDB:
     Type: AWS::DynamoDB::Table

diff --git a/integration/resources/templates/combination/function_with_kinesis.yaml b/integration/resources/templates/combination/function_with_kinesis.yaml
@@ -48,5 +48,8 @@ Resources:
     Type: AWS::Kinesis::Stream
     Properties:
       ShardCount: 1
+      StreamEncryption:
+        EncryptionType: KMS
+        KeyId: alias/aws/kinesis
 Metadata:
   SamTransformTest: true
diff --git a/integration/resources/templates/combination/function_with_kinesis_intrinsics.yaml b/integration/resources/templates/combination/function_with_kinesis_intrinsics.yaml
@@ -80,5 +80,8 @@ Resources:
     Type: AWS::Kinesis::Stream
     Properties:
       ShardCount: 1
+      StreamEncryption:
+        EncryptionType: KMS
+        KeyId: alias/aws/kinesis
 Metadata:
   SamTransformTest: true
diff --git a/integration/resources/templates/single/basic_function.yaml b/integration/resources/templates/single/basic_function.yaml
@@ -6,9 +6,6 @@ Resources:
       Runtime: nodejs18.x
       CodeUri: ${codeuri}
       MemorySize: 128
-      Policies:
-      - AWSLambdaRole
-      - AmazonS3ReadOnlyAccess
       Environment:
         Variables:
           Name: Value

diff --git a/integration/resources/templates/single/basic_function_no_envvar.yaml b/integration/resources/templates/single/basic_function_no_envvar.yaml
@@ -6,8 +6,5 @@ Resources:
       Runtime: nodejs18.x
       CodeUri: ${codeuri}
       MemorySize: 128
-      Policies:
-      - AWSLambdaRole
-      - AmazonS3ReadOnlyAccess
 Metadata:
   SamTransformTest: true
diff --git a/integration/resources/templates/single/basic_function_openapi.yaml b/integration/resources/templates/single/basic_function_openapi.yaml
@@ -9,9 +9,6 @@ Resources:
       Runtime: nodejs18.x
       CodeUri: ${codeuri}
       MemorySize: 128
-      Policies:
-      - AWSLambdaRole
-      - AmazonS3ReadOnlyAccess
       Environment:
         Variables:
           Name: Value

diff --git a/integration/resources/templates/single/basic_function_with_sns_dlq.yaml b/integration/resources/templates/single/basic_function_with_sns_dlq.yaml
@@ -12,5 +12,7 @@ Resources:
 
   MyTopic:
     Type: AWS::SNS::Topic
+    Properties:
+      KmsMasterKeyId: alias/aws/sns
 Metadata:
   SamTransformTest: true
diff --git a/integration/resources/templates/single/basic_function_with_tags.yaml b/integration/resources/templates/single/basic_function_with_tags.yaml
@@ -6,9 +6,6 @@ Resources:
       Runtime: nodejs18.x
       CodeUri: ${codeuri}
       MemorySize: 128
-      Policies:
-      - AWSLambdaRole
-      - AmazonS3ReadOnlyAccess
       Tags:
         TagKey1: TagValue1
         TagKey2: ''

diff --git a/samtranslator/__init__.py b/samtranslator/__init__.py
@@ -1 +1 @@
-__version__ = "1.86.0"
+__version__ = "1.87.0"