chore: Bump SamTranslator version to 1.54.0 (#4402)

aws · Nov 10, 2022 · 7630807 · 7630807
1 parent 4580762
commit 7630807
Show file tree

Hide file tree

Showing 316 changed files with 3,332 additions and 2,769 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -8,7 +8,7 @@ boto3>=1.19.5,==1.*
 jmespath~=0.10.0
 PyYAML~=5.3
 cookiecutter~=2.1.1
-aws-sam-translator==1.53.0
+aws-sam-translator==1.54.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=4.2.0
 dateparser~=1.0

diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
@@ -16,10 +16,10 @@ aws-lambda-builders==1.21.0 \
     --hash=sha256:77a21d3fa969119b9d05c2a18abd8dd10cff9ee8ba9793932fa00953cefbe4e1 \
     --hash=sha256:d79ae58b5d3961f9f55e6645c4759ad9f5455165fb6a7932bf10da39f6d275c0
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.53.0 \
-    --hash=sha256:392ed4f5fb08f72cb68a8800f0bc278d2a3b6609bd1ac66bfcdeaaa94cdc18e5 \
-    --hash=sha256:84d780ad82f1a176e2f5d4c397749d1e71214cc97ee7cccd50f823fd7c7e7cdf \
-    --hash=sha256:85252646cf123642d08442137b60445e69e30bfd2f8b663b1202b20ab3782b10
+aws-sam-translator==1.54.0 \
+    --hash=sha256:10d6771ebbe9107a0ddb756ccffd68ba81d885ef2eace80358a098566e6abaf1 \
+    --hash=sha256:1bb4abb197e6de3f935425e65f67d14f47eb620d984e9de963b666cc9deb66e4 \
+    --hash=sha256:a3ae79f1f2d430f5ade4d245165d5612414233f540b471d170f1aab95c3713a6
     # via aws-sam-cli (setup.py)
 backports-zoneinfo==0.2.1 \
     --hash=sha256:17746bd546106fa389c51dbea67c8b7c8f0d14b5526a579ca6ccf5ed72c526cf \

diff --git a/tests/functional/commands/validate/lib/models/alexa_skill.yaml b/tests/functional/commands/validate/lib/models/alexa_skill.yaml
@@ -1,3 +1,5 @@
+%YAML 1.1
+---
 # File: sam.yml
 # Version: 0.9
 
@@ -16,4 +18,3 @@ Resources:
       MemorySize: 1024
       Runtime: nodejs12.x
       Timeout: 3
-
diff --git a/tests/functional/commands/validate/lib/models/alexa_skill_with_skill_id.yaml b/tests/functional/commands/validate/lib/models/alexa_skill_with_skill_id.yaml
@@ -1,3 +1,5 @@
+%YAML 1.1
+---
 # File: sam.yml
 # Version: 0.9
 

diff --git a/tests/functional/commands/validate/lib/models/all_policy_templates.yaml b/tests/functional/commands/validate/lib/models/all_policy_templates.yaml
@@ -1,176 +1,178 @@
+%YAML 1.1
+---
 # "Kitchen Sink" test containing all supported policy templates. The idea is to know every one of them is
 # transformable and fail on any changes in the policy template definition without updating the test
 # Since this not about testing the transformation logic, we will keep the policy template parameter values as literal
 # string
 
 Resources:
   KitchenSinkFunction:
-    Type: 'AWS::Serverless::Function'
+    Type: AWS::Serverless::Function
     Properties:
       CodeUri: s3://sam-demo-bucket/hello.zip
       Handler: hello.handler
       Runtime: python2.7
       Policies:
 
-        - SQSPollerPolicy:
-            QueueName: name
+      - SQSPollerPolicy:
+          QueueName: name
 
-        - LambdaInvokePolicy:
-            FunctionName: name
+      - LambdaInvokePolicy:
+          FunctionName: name
 
-        - CloudWatchDescribeAlarmHistoryPolicy: {}
+      - CloudWatchDescribeAlarmHistoryPolicy: {}
 
-        - CloudWatchPutMetricPolicy: {}
+      - CloudWatchPutMetricPolicy: {}
 
-        - EC2DescribePolicy: {}
+      - EC2DescribePolicy: {}
 
-        - DynamoDBCrudPolicy:
-            TableName: name
+      - DynamoDBCrudPolicy:
+          TableName: name
 
-        - DynamoDBReadPolicy:
-            TableName: name
+      - DynamoDBReadPolicy:
+          TableName: name
 
-        - SESSendBouncePolicy:
-            IdentityName: name
+      - SESSendBouncePolicy:
+          IdentityName: name
 
-        - ElasticsearchHttpPostPolicy:
-            DomainName: name
+      - ElasticsearchHttpPostPolicy:
+          DomainName: name
 
-        - S3ReadPolicy:
-            BucketName: name
+      - S3ReadPolicy:
+          BucketName: name
 
-        - S3CrudPolicy:
-            BucketName: name
+      - S3CrudPolicy:
+          BucketName: name
 
-        - AMIDescribePolicy: {}
+      - AMIDescribePolicy: {}
 
-        - CloudFormationDescribeStacksPolicy: {}
+      - CloudFormationDescribeStacksPolicy: {}
 
-        - RekognitionNoDataAccessPolicy:
-            CollectionId: id
+      - RekognitionNoDataAccessPolicy:
+          CollectionId: id
 
-        - RekognitionReadPolicy:
-            CollectionId: id
+      - RekognitionReadPolicy:
+          CollectionId: id
 
-        - RekognitionWriteOnlyAccessPolicy:
-            CollectionId: id
+      - RekognitionWriteOnlyAccessPolicy:
+          CollectionId: id
 
-        - SQSSendMessagePolicy:
-            QueueName: name
+      - SQSSendMessagePolicy:
+          QueueName: name
 
-        - SNSPublishMessagePolicy:
-            TopicName: name
+      - SNSPublishMessagePolicy:
+          TopicName: name
 
-        - VPCAccessPolicy: {}
+      - VPCAccessPolicy: {}
 
-        - DynamoDBStreamReadPolicy:
-            TableName: name
-            StreamName: name
+      - DynamoDBStreamReadPolicy:
+          TableName: name
+          StreamName: name
 
-        - KinesisStreamReadPolicy:
-            StreamName: name
+      - KinesisStreamReadPolicy:
+          StreamName: name
 
-        - SESCrudPolicy:
-            IdentityName: name
+      - SESCrudPolicy:
+          IdentityName: name
 
-        - SNSCrudPolicy:
-            TopicName: name
+      - SNSCrudPolicy:
+          TopicName: name
 
-        - KinesisCrudPolicy:
-            StreamName: name
+      - KinesisCrudPolicy:
+          StreamName: name
 
-        - KMSDecryptPolicy:
-            KeyId: keyId
+      - KMSDecryptPolicy:
+          KeyId: keyId
 
-        - PollyFullAccessPolicy:
-            LexiconName: name
+      - PollyFullAccessPolicy:
+          LexiconName: name
 
-        - S3FullAccessPolicy:
-            BucketName: name
+      - S3FullAccessPolicy:
+          BucketName: name
 
-        - CodePipelineLambdaExecutionPolicy: {}
+      - CodePipelineLambdaExecutionPolicy: {}
 
-        - ServerlessRepoReadWriteAccessPolicy: {}
+      - ServerlessRepoReadWriteAccessPolicy: {}
 
-        - EC2CopyImagePolicy:
-            ImageId: id
+      - EC2CopyImagePolicy:
+          ImageId: id
 
-        - CodePipelineReadOnlyPolicy:
-            PipelineName: pipeline
+      - CodePipelineReadOnlyPolicy:
+          PipelineName: pipeline
 
-        - CloudWatchDashboardPolicy: {}
+      - CloudWatchDashboardPolicy: {}
 
-        - RekognitionFacesPolicy: {}
+      - RekognitionFacesPolicy: {}
 
-        - RekognitionLabelsPolicy: {}
+      - RekognitionLabelsPolicy: {}
 
-        - DynamoDBBackupFullAccessPolicy:
-            TableName: table
+      - DynamoDBBackupFullAccessPolicy:
+          TableName: table
 
-        - DynamoDBRestoreFromBackupPolicy:
-            TableName: table
+      - DynamoDBRestoreFromBackupPolicy:
+          TableName: table
 
-        - ComprehendBasicAccessPolicy: {}
+      - ComprehendBasicAccessPolicy: {}
 
-        - AWSSecretsManagerRotationPolicy:
-            FunctionName: function
+      - AWSSecretsManagerRotationPolicy:
+          FunctionName: function
 
-        - MobileAnalyticsWriteOnlyAccessPolicy: {}
+      - MobileAnalyticsWriteOnlyAccessPolicy: {}
 
-        - PinpointEndpointAccessPolicy:
-            PinpointApplicationId: id
+      - PinpointEndpointAccessPolicy:
+          PinpointApplicationId: id
 
-        - RekognitionDetectOnlyPolicy: {}
+      - RekognitionDetectOnlyPolicy: {}
 
-        - RekognitionFacesManagementPolicy:
-            CollectionId: collection
+      - RekognitionFacesManagementPolicy:
+          CollectionId: collection
 
-        - EKSDescribePolicy: {}
+      - EKSDescribePolicy: {}
 
-        - CostExplorerReadOnlyPolicy: {}
+      - CostExplorerReadOnlyPolicy: {}
 
-        - OrganizationsListAccountsPolicy: {}
+      - OrganizationsListAccountsPolicy: {}
 
-        - DynamoDBReconfigurePolicy:
-            TableName: name
+      - DynamoDBReconfigurePolicy:
+          TableName: name
 
-        - SESBulkTemplatedCrudPolicy:
-            IdentityName: name
+      - SESBulkTemplatedCrudPolicy:
+          IdentityName: name
 
-        - SESEmailTemplateCrudPolicy: {}
+      - SESEmailTemplateCrudPolicy: {}
 
-        - FilterLogEventsPolicy:
-            LogGroupName: name
+      - FilterLogEventsPolicy:
+          LogGroupName: name
 
-        - SSMParameterReadPolicy:
-            ParameterName: name
+      - SSMParameterReadPolicy:
+          ParameterName: name
 
-        - StepFunctionsExecutionPolicy:
-            StateMachineName: name
+      - StepFunctionsExecutionPolicy:
+          StateMachineName: name
 
-        - CodeCommitCrudPolicy:
-            RepositoryName: name
+      - CodeCommitCrudPolicy:
+          RepositoryName: name
 
-        - CodeCommitReadPolicy:
-            RepositoryName: name
+      - CodeCommitReadPolicy:
+          RepositoryName: name
 
-        - KMSEncryptPolicy:
-            KeyId: keyId
+      - KMSEncryptPolicy:
+          KeyId: keyId
 
-        - AthenaQueryPolicy:
-            WorkGroupName: name
+      - AthenaQueryPolicy:
+          WorkGroupName: name
 
-        - S3WritePolicy:
-            BucketName: name
+      - S3WritePolicy:
+          BucketName: name
 
-        - DynamoDBWritePolicy:
-            TableName: name
+      - DynamoDBWritePolicy:
+          TableName: name
 
-        - EventBridgePutEventsPolicy:
-            EventBusName: name
+      - EventBridgePutEventsPolicy:
+          EventBusName: name
 
-        - AcmGetCertificatePolicy:
-            CertificateArn: arn
+      - AcmGetCertificatePolicy:
+          CertificateArn: arn
 
-        - Route53ChangeResourceRecordSetsPolicy:
-            HostedZoneId: test
+      - Route53ChangeResourceRecordSetsPolicy:
+          HostedZoneId: test
diff --git a/tests/functional/commands/validate/lib/models/api_cache.yaml b/tests/functional/commands/validate/lib/models/api_cache.yaml
@@ -1,3 +1,5 @@
+%YAML 1.1
+---
 Resources:
   HtmlFunction:
     Type: AWS::Serverless::Function
@@ -19,4 +21,4 @@ Resources:
       StageName: Prod
       DefinitionUri: s3://sam-demo-bucket/webpage_swagger.json
       CacheClusterEnabled: true
-      CacheClusterSize: "1.6"
+      CacheClusterSize: '1.6'
diff --git a/tests/functional/commands/validate/lib/models/api_description.yaml b/tests/functional/commands/validate/lib/models/api_description.yaml
@@ -1,3 +1,5 @@
+%YAML 1.1
+---
 Resources:
   Function:
     Type: AWS::Serverless::Function

diff --git a/tests/functional/commands/validate/lib/models/api_endpoint_configuration.yaml b/tests/functional/commands/validate/lib/models/api_endpoint_configuration.yaml
@@ -1,11 +1,13 @@
+%YAML 1.1
+---
 Parameters:
   EndpointConfig:
     Type: String
 
 Globals:
   Api:
     # Overriding this property for Implicit API
-    EndpointConfiguration: { "Ref": "EndpointConfig" }
+    EndpointConfiguration: {Ref: EndpointConfig}
 
 Resources:
   ImplicitApiFunction:

diff --git a/.../functional/commands/validate/lib/models/api_endpoint_configuration_with_vpcendpoint.yaml b/.../functional/commands/validate/lib/models/api_endpoint_configuration_with_vpcendpoint.yaml
@@ -1,3 +1,5 @@
+%YAML 1.1
+---
 Parameters:
   EndpointConfigType:
     Type: String
@@ -8,9 +10,9 @@ Globals:
   Api:
     # Overriding this property for Implicit API
     EndpointConfiguration:
-      Type: { "Ref": "EndpointConfigType" }
+      Type: {Ref: EndpointConfigType}
       VPCEndpointIds:
-        - { "Ref": "VpcEndpointId" }
+      - {Ref: VpcEndpointId}
 Resources:
   ImplicitApiFunction:
     Type: AWS::Serverless::Function