Merge branch 'release-v1.57.0'

aws · Jan 12, 2023 · f7ec351 · f7ec351
2 parents 89e6214 + 544d8a9
commit f7ec351
Show file tree

Hide file tree

Showing 9 changed files with 241 additions and 1 deletion.
diff --git a/samtranslator/__init__.py b/samtranslator/__init__.py
@@ -1 +1 @@
-__version__ = "1.56.0"
+__version__ = "1.57.0"
diff --git a/samtranslator/model/eventsources/pull.py b/samtranslator/model/eventsources/pull.py
@@ -55,6 +55,7 @@ class PullEventSource(ResourceMacro):
         "KafkaBootstrapServers": PropertyType(False, is_type(list)),
         "FilterCriteria": PropertyType(False, is_type(dict)),
         "ConsumerGroupId": PropertyType(False, is_str()),
+        "ScalingConfig": PropertyType(False, is_type(dict)),
     }
 
     Stream: Optional[Intrinsicable[str]]
@@ -78,6 +79,7 @@ class PullEventSource(ResourceMacro):
     KafkaBootstrapServers: Optional[List[Any]]
     FilterCriteria: Optional[Dict[str, Any]]
     ConsumerGroupId: Optional[Intrinsicable[str]]
+    ScalingConfig: Optional[Dict[str, Any]]
 
     def get_policy_arn(self):  # type: ignore[no-untyped-def]
         raise NotImplementedError("Subclass must implement this method")
@@ -137,6 +139,7 @@ def to_cloudformation(self, **kwargs):  # type: ignore[no-untyped-def]
         lambda_eventsourcemapping.TumblingWindowInSeconds = self.TumblingWindowInSeconds
         lambda_eventsourcemapping.FunctionResponseTypes = self.FunctionResponseTypes
         lambda_eventsourcemapping.FilterCriteria = self.FilterCriteria
+        lambda_eventsourcemapping.ScalingConfig = self.ScalingConfig
         self._validate_filter_criteria()  # type: ignore[no-untyped-call]
 
         if self.KafkaBootstrapServers:

diff --git a/samtranslator/model/lambda_.py b/samtranslator/model/lambda_.py
@@ -84,6 +84,7 @@ class LambdaEventSourceMapping(Resource):
         "FilterCriteria": PropertyType(False, is_type(dict)),
         "AmazonManagedKafkaEventSourceConfig": PropertyType(False, is_type(dict)),
         "SelfManagedKafkaEventSourceConfig": PropertyType(False, is_type(dict)),
+        "ScalingConfig": PropertyType(False, is_type(dict)),
     }
 
     runtime_attrs = {"name": lambda self: ref(self.logical_id)}

diff --git a/samtranslator/schema/aws_serverless_function.py b/samtranslator/schema/aws_serverless_function.py
@@ -193,6 +193,7 @@ class SQSEventProperties(BaseModel):
     FilterCriteria: Optional[PassThrough] = sqseventproperties("FilterCriteria")
     MaximumBatchingWindowInSeconds: Optional[PassThrough] = sqseventproperties("MaximumBatchingWindowInSeconds")
     Queue: PassThrough = sqseventproperties("Queue")
+    ScalingConfig: Optional[PassThrough]  # Update docs when live
 
 
 class SQSEvent(BaseModel):

diff --git a/samtranslator/schema/schema.json b/samtranslator/schema/schema.json
@@ -2291,6 +2291,9 @@
           "title": "Queue",
           "description": "The ARN of the queue\\.  \n*Type*: String  \n*Required*: Yes  \n*AWS CloudFormation compatibility*: This property is passed directly to the [`EventSourceArn`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-eventsourcearn) property of an `AWS::Lambda::EventSourceMapping` resource\\.",
           "markdownDescription": "The ARN of the queue\\.  \n*Type*: String  \n*Required*: Yes  \n*AWS CloudFormation compatibility*: This property is passed directly to the [`EventSourceArn`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-eventsourcearn) property of an `AWS::Lambda::EventSourceMapping` resource\\."
+        },
+        "ScalingConfig": {
+          "title": "Scalingconfig"
         }
       },
       "additionalProperties": false

diff --git a/tests/translator/input/sqs_with_scaling_config.yaml b/tests/translator/input/sqs_with_scaling_config.yaml
@@ -0,0 +1,16 @@
+Resources:
+  SQSFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: s3://sam-demo-bucket/queues.zip
+      Handler: queue.sqs_handler
+      Runtime: python2.7
+      Events:
+        MySqsQueue:
+          Type: SQS
+          Properties:
+            Queue: arn:aws:sqs:us-west-2:012345678901:my-queue
+            BatchSize: 10
+            Enabled: false
+            ScalingConfig:
+              MaximumConcurrency: 500
diff --git a/tests/translator/output/aws-cn/sqs_with_scaling_config.json b/tests/translator/output/aws-cn/sqs_with_scaling_config.json
@@ -0,0 +1,72 @@
+{
+  "Resources": {
+    "SQSFunction": {
+      "Properties": {
+        "Code": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "queues.zip"
+        },
+        "Handler": "queue.sqs_handler",
+        "Role": {
+          "Fn::GetAtt": [
+            "SQSFunctionRole",
+            "Arn"
+          ]
+        },
+        "Runtime": "python2.7",
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ]
+      },
+      "Type": "AWS::Lambda::Function"
+    },
+    "SQSFunctionMySqsQueue": {
+      "Properties": {
+        "BatchSize": 10,
+        "Enabled": false,
+        "EventSourceArn": "arn:aws:sqs:us-west-2:012345678901:my-queue",
+        "FunctionName": {
+          "Ref": "SQSFunction"
+        },
+        "ScalingConfig": {
+          "MaximumConcurrency": 500
+        }
+      },
+      "Type": "AWS::Lambda::EventSourceMapping"
+    },
+    "SQSFunctionRole": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "sts:AssumeRole"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [
+                  "lambda.amazonaws.com"
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ]
+      },
+      "Type": "AWS::IAM::Role"
+    }
+  }
+}
diff --git a/tests/translator/output/aws-us-gov/sqs_with_scaling_config.json b/tests/translator/output/aws-us-gov/sqs_with_scaling_config.json
@@ -0,0 +1,72 @@
+{
+  "Resources": {
+    "SQSFunction": {
+      "Properties": {
+        "Code": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "queues.zip"
+        },
+        "Handler": "queue.sqs_handler",
+        "Role": {
+          "Fn::GetAtt": [
+            "SQSFunctionRole",
+            "Arn"
+          ]
+        },
+        "Runtime": "python2.7",
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ]
+      },
+      "Type": "AWS::Lambda::Function"
+    },
+    "SQSFunctionMySqsQueue": {
+      "Properties": {
+        "BatchSize": 10,
+        "Enabled": false,
+        "EventSourceArn": "arn:aws:sqs:us-west-2:012345678901:my-queue",
+        "FunctionName": {
+          "Ref": "SQSFunction"
+        },
+        "ScalingConfig": {
+          "MaximumConcurrency": 500
+        }
+      },
+      "Type": "AWS::Lambda::EventSourceMapping"
+    },
+    "SQSFunctionRole": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "sts:AssumeRole"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [
+                  "lambda.amazonaws.com"
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+          "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ]
+      },
+      "Type": "AWS::IAM::Role"
+    }
+  }
+}
diff --git a/tests/translator/output/sqs_with_scaling_config.json b/tests/translator/output/sqs_with_scaling_config.json
@@ -0,0 +1,72 @@
+{
+  "Resources": {
+    "SQSFunction": {
+      "Properties": {
+        "Code": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "queues.zip"
+        },
+        "Handler": "queue.sqs_handler",
+        "Role": {
+          "Fn::GetAtt": [
+            "SQSFunctionRole",
+            "Arn"
+          ]
+        },
+        "Runtime": "python2.7",
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ]
+      },
+      "Type": "AWS::Lambda::Function"
+    },
+    "SQSFunctionMySqsQueue": {
+      "Properties": {
+        "BatchSize": 10,
+        "Enabled": false,
+        "EventSourceArn": "arn:aws:sqs:us-west-2:012345678901:my-queue",
+        "FunctionName": {
+          "Ref": "SQSFunction"
+        },
+        "ScalingConfig": {
+          "MaximumConcurrency": 500
+        }
+      },
+      "Type": "AWS::Lambda::EventSourceMapping"
+    },
+    "SQSFunctionRole": {
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "sts:AssumeRole"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [
+                  "lambda.amazonaws.com"
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+          "arn:aws:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ]
+      },
+      "Type": "AWS::IAM::Role"
+    }
+  }
+}