Merge pull request #3368 from aws/release-v1.77.0

GavinZZ · web-flow · commit fff021350727 · 2023-10-05T14:28:07.000-07:00
Release 1.77.0 (to main)
diff --git a/integration/resources/expected/single/basic_function_with_function_url_config.json b/integration/resources/expected/single/basic_function_with_function_url_config.json
@@ -10,9 +10,5 @@
   {
     "LogicalResourceId": "MyLambdaFunctionRole",
     "ResourceType": "AWS::IAM::Role"
-  },
-  {
-    "LogicalResourceId": "MyLambdaFunctionUrlPublicPermissions",
-    "ResourceType": "AWS::Lambda::Permission"
   }
 ]
diff --git a/integration/resources/expected/single/basic_function_with_function_url_with_autopuplishalias.json b/integration/resources/expected/single/basic_function_with_function_url_with_autopuplishalias.json
@@ -18,9 +18,5 @@
   {
     "LogicalResourceId": "MyLambdaFunctionVersion",
     "ResourceType": "AWS::Lambda::Version"
-  },
-  {
-    "LogicalResourceId": "MyLambdaFunctionUrlPublicPermissions",
-    "ResourceType": "AWS::Lambda::Permission"
   }
 ]
diff --git a/integration/resources/templates/combination/api_with_authorizers_min.yaml b/integration/resources/templates/combination/api_with_authorizers_min.yaml
@@ -101,11 +101,15 @@ Resources:
         }
 
   MyCognitoUserPool:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Cognito::UserPool
     Properties:
       UserPoolName: MyCognitoUserPool
 
   MyCognitoUserPoolClient:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Cognito::UserPoolClient
     Properties:
       UserPoolId:
diff --git a/integration/resources/templates/combination/connector_bucket_to_function_write.yaml b/integration/resources/templates/combination/connector_bucket_to_function_write.yaml
@@ -4,6 +4,8 @@ Parameters:
 
 Resources:
   VerificationQueue:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::SQS::Queue
 
   TriggerFunction:
diff --git a/integration/resources/templates/combination/connector_event_rule_to_eb_default_write.yaml b/integration/resources/templates/combination/connector_event_rule_to_eb_default_write.yaml
@@ -46,11 +46,15 @@ Resources:
           QueueName: !GetAtt VerificationQueue.QueueName
 
   CustomEventBus:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Events::EventBus
     Properties:
       Name: !Sub "${AWS::StackName}-EventBus"
 
   EventRule:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Events::Rule
     Properties:
       Description: !Sub 'EventRule-${AWS::StackName}'
@@ -86,6 +90,8 @@ Resources:
       - Write
 
   VerificationEventRule:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Events::Rule
     Properties:
       Description: !Sub 'EventRule-${AWS::StackName}-verification'
@@ -97,6 +103,8 @@ Resources:
         Id: SQSqueue
 
   VerificationQueue:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::SQS::Queue
 
   ConnectorNotBeingTested:
diff --git a/integration/resources/templates/combination/connector_sfn_to_sqs_write.yaml b/integration/resources/templates/combination/connector_sfn_to_sqs_write.yaml
@@ -1,5 +1,7 @@
 Resources:
   TriggerStateMachine:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Serverless::StateMachine
     Properties:
       Type: EXPRESS
@@ -18,6 +20,8 @@ Resources:
           FunctionName: SomethingDoesNotMatter
 
   MyQueue:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::SQS::Queue
 
   MyConnector:
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
@@ -70,9 +70,13 @@ Resources:
             StartingPosition: LATEST
 
   Notifications:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::SNS::Topic
 
   Images:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::S3::Bucket
 
   ExistingRestApi:
@@ -82,12 +86,16 @@ Resources:
       DefinitionUri: ${definitionuri}
 
   Stream:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Kinesis::Stream
     Properties:
       ShardCount: 1
 
   # What an irony the I can't use AWS::Serverless::SimpleTable here because it doesn't support streams specification
   MyTable:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::DynamoDB::Table
     Properties:
       # Enable DDB streams
diff --git a/integration/resources/templates/combination/function_with_all_event_types.yaml b/integration/resources/templates/combination/function_with_all_event_types.yaml
@@ -107,25 +107,35 @@ Resources:
             Method: get
 
   Notifications:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Condition: MyCondition
     Type: AWS::SNS::Topic
 
   Images:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::S3::Bucket
 
   CloudWatchLambdaLogsGroup:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Logs::LogGroup
     Condition: MyCondition
     Properties:
       RetentionInDays: 7
 
   MyStream:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Kinesis::Stream
     Condition: MyCondition
     Properties:
       ShardCount: 1
 
   MyDynamoDB:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::DynamoDB::Table
     Condition: MyCondition
     Properties:
diff --git a/integration/resources/templates/combination/function_with_cloudwatch_log.yaml b/integration/resources/templates/combination/function_with_cloudwatch_log.yaml
@@ -15,6 +15,8 @@ Resources:
             FilterPattern: My filter pattern
 
   CloudWatchLambdaLogsGroup:
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
     Type: AWS::Logs::LogGroup
     Properties:
       RetentionInDays: 7
diff --git a/integration/resources/templates/single/basic_function_with_function_url_config.yaml b/integration/resources/templates/single/basic_function_with_function_url_config.yaml
@@ -7,7 +7,7 @@ Resources:
       CodeUri: ${codeuri}
       MemorySize: 128
       FunctionUrlConfig:
-        AuthType: NONE
+        AuthType: AWS_IAM
         Cors:
           AllowOrigins:
           - https://foo.com
diff --git a/integration/resources/templates/single/basic_function_with_function_url_with_autopuplishalias.yaml b/integration/resources/templates/single/basic_function_with_function_url_with_autopuplishalias.yaml
@@ -8,7 +8,7 @@ Resources:
       MemorySize: 128
       AutoPublishAlias: live
       FunctionUrlConfig:
-        AuthType: NONE
+        AuthType: AWS_IAM
         Cors:
           AllowOrigins:
           - https://foo.com
diff --git a/integration/single/test_basic_function.py b/integration/single/test_basic_function.py
@@ -126,7 +126,7 @@ def test_basic_function_with_url_config(self, file_name, qualifier):
             "MaxAge": 10,
         }
 
-        self.assertEqual(function_url_config["AuthType"], "NONE")
+        self.assertEqual(function_url_config["AuthType"], "AWS_IAM")
         self.assertEqual(function_url_config["Cors"], cors_config)
         self._assert_invoke(lambda_client, function_name, qualifier, 200)
 
diff --git a/samtranslator/__init__.py b/samtranslator/__init__.py
@@ -1 +1 @@
-__version__ = "1.76.0"
+__version__ = "1.77.0"
diff --git a/samtranslator/internal/schema_source/sam-docs.json b/samtranslator/internal/schema_source/sam-docs.json
diff --git a/samtranslator/model/eventsources/push.py b/samtranslator/model/eventsources/push.py
diff --git a/samtranslator/schema/schema.json b/samtranslator/schema/schema.json
diff --git a/schema_source/sam.schema.json b/schema_source/sam.schema.json
diff --git a/tests/translator/input/error_api_override_api_auth_without_authorizer.yaml b/tests/translator/input/error_api_override_api_auth_without_authorizer.yaml
diff --git a/tests/translator/output/error_api_override_api_auth_without_authorizer.json b/tests/translator/output/error_api_override_api_auth_without_authorizer.json

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,5 @@`
`10`	`10`	`{`
`11`	`11`	`"LogicalResourceId": "MyLambdaFunctionRole",`
`12`	`12`	`"ResourceType": "AWS::IAM::Role"`
`13`		`- },`
`14`		`- {`
`15`		`- "LogicalResourceId": "MyLambdaFunctionUrlPublicPermissions",`
`16`		`- "ResourceType": "AWS::Lambda::Permission"`
`17`	`13`	`}`
`18`	`14`	`]`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,5 @@`
`18`	`18`	`{`
`19`	`19`	`"LogicalResourceId": "MyLambdaFunctionVersion",`
`20`	`20`	`"ResourceType": "AWS::Lambda::Version"`
`21`		`- },`
`22`		`- {`
`23`		`- "LogicalResourceId": "MyLambdaFunctionUrlPublicPermissions",`
`24`		`- "ResourceType": "AWS::Lambda::Permission"`
`25`	`21`	`}`
`26`	`22`	`]`