feat: Support InvokeMode in lambda function URL config

Author: aahung

samtranslator/internal/schema_source/aws_serverless_function.py

@@ -153,6 +153,7 @@ class SNSEvent(BaseModel):
 class FunctionUrlConfig(BaseModel):
     AuthType: SamIntrinsicable[str] = functionurlconfig("AuthType")
     Cors: Optional[PassThroughProp] = functionurlconfig("Cors")
+    InvokeMode: Optional[PassThroughProp]  # TODO: add to doc
 
 
 class KinesisEventProperties(BaseModel):

samtranslator/model/lambda_.py

@@ -174,4 +174,5 @@ class LambdaUrl(Resource):
         "TargetFunctionArn": GeneratedProperty(),
         "AuthType": GeneratedProperty(),
         "Cors": GeneratedProperty(),
+        "InvokeMode": GeneratedProperty(),
     }

samtranslator/model/sam_resources.py

@@ -1043,6 +1043,7 @@ def _construct_function_url(
         lambda_url.TargetFunctionArn = (
             lambda_alias.get_runtime_attr("arn") if lambda_alias else lambda_function.get_runtime_attr("name")
         )
+        lambda_url.InvokeMode = function_url_config.get("InvokeMode")
         return lambda_url
 
     def _validate_function_url_params(

samtranslator/schema/schema.json

@@ -197034,6 +197034,9 @@
           "description": "The Cross\\-Origin Resource Sharing \\(CORS\\) settings for your function URL\\.  \n*Type*: [Cors](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-url-cors.html)  \n*Required*: No  \n*AWS CloudFormation compatibility*: This property is passed directly to the [`Cors`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-url-cors.html) property of an `AWS::Lambda::Url` resource\\.",
           "markdownDescription": "The Cross\\-Origin Resource Sharing \\(CORS\\) settings for your function URL\\.  \n*Type*: [Cors](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-url-cors.html)  \n*Required*: No  \n*AWS CloudFormation compatibility*: This property is passed directly to the [`Cors`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-url-cors.html) property of an `AWS::Lambda::Url` resource\\.",
           "title": "Cors"
+        },
+        "InvokeMode": {
+          "$ref": "#/definitions/PassThroughProp"
         }
       },
       "required": [

schema_source/sam.schema.json

@@ -1217,6 +1217,9 @@
           "description": "The Cross\\-Origin Resource Sharing \\(CORS\\) settings for your function URL\\.  \n*Type*: [Cors](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-url-cors.html)  \n*Required*: No  \n*AWS CloudFormation compatibility*: This property is passed directly to the [`Cors`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-url-cors.html) property of an `AWS::Lambda::Url` resource\\.",
           "markdownDescription": "The Cross\\-Origin Resource Sharing \\(CORS\\) settings for your function URL\\.  \n*Type*: [Cors](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-url-cors.html)  \n*Required*: No  \n*AWS CloudFormation compatibility*: This property is passed directly to the [`Cors`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-url-cors.html) property of an `AWS::Lambda::Url` resource\\.",
           "title": "Cors"
+        },
+        "InvokeMode": {
+          "$ref": "#/definitions/PassThroughProp"
         }
       },
       "required": [

tests/model/test_sam_resources.py

@@ -475,7 +475,11 @@ def test_validate_function_url_config_properties_with_intrinsic(self):
         function.CodeUri = "s3://foobar/foo.zip"
         function.Runtime = "foo"
         function.Handler = "bar"
-        function.FunctionUrlConfig = {"AuthType": {"Ref": "AWS_IAM"}, "Cors": {"Ref": "MyCorConfigRef"}}
+        function.FunctionUrlConfig = {
+            "AuthType": {"Ref": "AWS_IAM"},
+            "Cors": {"Ref": "MyCorConfigRef"},
+            "InvokeMode": {"Ref": "MyInvokeMode"},
+        }
 
         cfnResources = function.to_cloudformation(**self.kwargs)
         generatedUrlList = [x for x in cfnResources if isinstance(x, LambdaUrl)]
@@ -484,6 +488,7 @@ def test_validate_function_url_config_properties_with_intrinsic(self):
         self.assertEqual(generatedUrlList.__len__(), 1)
         self.assertEqual(generatedUrlList[0].AuthType, {"Ref": "AWS_IAM"})
         self.assertEqual(generatedUrlList[0].Cors, {"Ref": "MyCorConfigRef"})
+        self.assertEqual(generatedUrlList[0].InvokeMode, {"Ref": "MyInvokeMode"})
 
     @patch("boto3.session.Session.region_name", "ap-southeast-1")
     def test_with_valid_function_url_config(self):
@@ -594,6 +599,18 @@ def test_with_invalid_function_url_config_with_authorization_type_value_as_None(
             + "`FunctionUrlConfig`. Please provide either AWS_IAM or NONE.",
         )
 
+    def test_with_function_url_config_with_invoke_mode(self):
+        function = SamFunction("foo")
+        function.CodeUri = "s3://foobar/foo.zip"
+        function.Runtime = "foo"
+        function.Handler = "bar"
+        function.FunctionUrlConfig = {"AuthType": "AWS_IAM", "InvokeMode": "RESPONSE_STREAM"}
+        cfnResources = function.to_cloudformation(**self.kwargs)
+        generatedUrlList = [x for x in cfnResources if isinstance(x, LambdaUrl)]
+        self.assertEqual(generatedUrlList.__len__(), 1)
+        self.assertEqual(generatedUrlList[0].AuthType, "AWS_IAM")
+        self.assertEqual(generatedUrlList[0].InvokeMode, "RESPONSE_STREAM")
+
 
 class TestInvalidSamConnectors(TestCase):
     kwargs = {

tests/translator/input/function_with_function_url_config.yaml

@@ -26,3 +26,4 @@ Resources:
           ExposeHeaders:
           - x-amzn-header
           MaxAge: 10
+        InvokeMode: RESPONSE_STREAM

tests/translator/input/function_with_function_url_config_and_autopublishalias.yaml

@@ -27,3 +27,4 @@ Resources:
           ExposeHeaders:
           - x-amzn-header
           MaxAge: 10
+        InvokeMode: RESPONSE_STREAM

tests/translator/input/function_with_function_url_config_with_intrinsics.yaml

@@ -12,6 +12,10 @@ Parameters:
     Type: CommaDelimitedList
     Default: GET
 
+  InvokeModeRef:
+    Type: String
+    Default: BUFFERED
+
 Resources:
   MyFunction:
     Type: AWS::Serverless::Function
@@ -27,3 +31,4 @@ Resources:
         Cors:
           AllowOrigins: !Ref AllowOriginsRef
           AllowMethods: !Ref AllowMethodsRef
+        InvokeMode: !Ref InvokeModeRef

tests/translator/output/aws-cn/function_with_function_url_config.json

@@ -80,6 +80,7 @@
           ],
           "MaxAge": 10
         },
+        "InvokeMode": "RESPONSE_STREAM",
         "TargetFunctionArn": {
           "Ref": "MyFunction"
         }