Merge pull request #3846 from aws/tmp/1763588423/main

Merge main to develop

Author: roger-zhangg

.cfnlintrc.yaml

@@ -144,6 +144,10 @@ ignore_templates:
   - tests/translator/output/**/function_with_metrics_config.json
   - tests/translator/output/**/function_with_self_managed_kafka_and_schema_registry.json # cfnlint is not updated to recognize the SchemaRegistryConfig property
   - tests/translator/output/**/function_with_msk_with_schema_registry_config.json # cfnlint is not updated to recognize the SchemaRegistryConfig property
+  - tests/translator/output/**/function_with_tenancy_config.json # cfnlint is not updated to recognize the TenancyConfig property
+  - tests/translator/output/**/function_with_tenancy_and_api_event.json # cfnlint is not updated to recognize the TenancyConfig property
+  - tests/translator/output/**/function_with_tenancy_and_httpapi_event.json # cfnlint is not updated to recognize the TenancyConfig property
+  - tests/translator/output/**/function_with_tenancy_config_global.json # cfnlint is not updated to recognize the TenancyConfig property
 
 ignore_checks:
   - E2531 # Deprecated runtime; not relevant for transform tests

integration/resources/expected/single/basic_function_with_tenancy_config.json

@@ -0,0 +1,10 @@
+[
+  {
+    "LogicalResourceId": "MyLambdaFunction",
+    "ResourceType": "AWS::Lambda::Function"
+  },
+  {
+    "LogicalResourceId": "MyLambdaFunctionRole",
+    "ResourceType": "AWS::IAM::Role"
+  }
+]

integration/resources/templates/single/basic_function_with_tenancy_config.yaml

@@ -0,0 +1,15 @@
+Resources:
+  MyLambdaFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: nodejs18.x
+      CodeUri: ${codeuri}
+      MemorySize: 128
+      TenancyConfig:
+        TenantIsolationMode: PER_TENANT
+      Policies:
+      - AWSLambdaRole
+      - AmazonS3ReadOnlyAccess
+Metadata:
+  SamTransformTest: true

integration/single/test_basic_function.py

@@ -392,3 +392,24 @@ def _assert_invoke(self, lambda_client, function_name, qualifier=None, expected_
     def _verify_get_request(self, url, expected_text):
         response = self.verify_get_request_response(url, 200)
         self.assertEqual(response.text, expected_text)
+
+    # @skipIf(current_region_does_not_support([MULTI_TENANCY]), "Multi-tenancy is not supported in this testing region")
+    @skipIf(True, "Multi-tenancy feature is not available to test yet")
+    def test_basic_function_with_tenancy_config(self):
+        """
+        Creates a basic lambda function with TenancyConfig
+        """
+        self.create_and_verify_stack("single/basic_function_with_tenancy_config")
+
+        lambda_client = self.client_provider.lambda_client
+        function_name = self.get_physical_id_by_type("AWS::Lambda::Function")
+
+        # Get function configuration
+        function_config = lambda_client.get_function_configuration(FunctionName=function_name)
+
+        # Verify TenancyConfig is set correctly
+        self.assertEqual(
+            function_config["TenancyConfig"]["TenantIsolationMode"],
+            "PER_TENANT",
+            "Expected TenantIsolationMode to be PER_TENANT",
+        )

samtranslator/__init__.py

@@ -1 +1 @@
-__version__ = "1.101.0"
+__version__ = "1.102.0"

samtranslator/internal/schema_source/aws_serverless_function.py

@@ -522,6 +522,7 @@ class ScheduleV2Event(BaseModel):
 LoggingConfig = Optional[PassThroughProp]  # TODO: add documentation
 RecursiveLoop = Optional[PassThroughProp]
 SourceKMSKeyArn = Optional[PassThroughProp]
+TenancyConfig = Optional[PassThroughProp]
 
 
 class Properties(BaseModel):
@@ -650,6 +651,7 @@ class Properties(BaseModel):
     LoggingConfig: Optional[PassThroughProp]  # TODO: add documentation
     RecursiveLoop: Optional[PassThroughProp]  # TODO: add documentation
     SourceKMSKeyArn: Optional[PassThroughProp]  # TODO: add documentation
+    TenancyConfig: Optional[PassThroughProp]  # TODO: add documentation
 
 
 class Globals(BaseModel):
@@ -710,6 +712,7 @@ class Globals(BaseModel):
     LoggingConfig: Optional[PassThroughProp]  # TODO: add documentation
     RecursiveLoop: Optional[PassThroughProp]  # TODO: add documentation
     SourceKMSKeyArn: Optional[PassThroughProp]  # TODO: add documentation
+    TenancyConfig: Optional[PassThroughProp]  # TODO: add documentation
 
 
 class Resource(ResourceAttributes):

samtranslator/model/lambda_.py

@@ -36,6 +36,7 @@ class LambdaFunction(Resource):
         "RuntimeManagementConfig": GeneratedProperty(),
         "LoggingConfig": GeneratedProperty(),
         "RecursiveLoop": GeneratedProperty(),
+        "TenancyConfig": GeneratedProperty(),
     }
 
     Code: Dict[str, Any]
@@ -64,6 +65,7 @@ class LambdaFunction(Resource):
     RuntimeManagementConfig: Optional[Dict[str, Any]]
     LoggingConfig: Optional[Dict[str, Any]]
     RecursiveLoop: Optional[str]
+    TenancyConfig: Optional[Dict[str, Any]]
 
     runtime_attrs = {"name": lambda self: ref(self.logical_id), "arn": lambda self: fnGetAtt(self.logical_id, "Arn")}
 

samtranslator/model/sam_resources.py

@@ -184,6 +184,7 @@ class SamFunction(SamResourceMacro):
         "LoggingConfig": PassThroughProperty(False),
         "RecursiveLoop": PassThroughProperty(False),
         "SourceKMSKeyArn": PassThroughProperty(False),
+        "TenancyConfig": PassThroughProperty(False),
     }
 
     FunctionName: Optional[Intrinsicable[str]]
@@ -228,6 +229,7 @@ class SamFunction(SamResourceMacro):
     LoggingConfig: Optional[Dict[str, Any]]
     RecursiveLoop: Optional[str]
     SourceKMSKeyArn: Optional[str]
+    TenancyConfig: Optional[Dict[str, Any]]
 
     event_resolver = ResourceTypeResolver(
         samtranslator.model.eventsources,
@@ -277,6 +279,8 @@ def to_cloudformation(self, **kwargs):  # type: ignore[no-untyped-def] # noqa: P
         if self.DeadLetterQueue:
             self._validate_dlq(self.DeadLetterQueue)
 
+        self._validate_tenancy_config_compatibility()
+
         lambda_function = self._construct_lambda_function(intrinsics_resolver)
         resources.append(lambda_function)
 
@@ -572,6 +576,37 @@ def _get_resolved_alias_name(
 
         return resolved_alias_name
 
+    def _validate_tenancy_config_compatibility(self) -> None:
+        if not self.TenancyConfig:
+            return
+
+        if self.ProvisionedConcurrencyConfig:
+            raise InvalidResourceException(
+                self.logical_id,
+                "Provisioned concurrency is not supported for functions enabled with tenancy configuration.",
+            )
+
+        if self.FunctionUrlConfig:
+            raise InvalidResourceException(
+                self.logical_id,
+                "Function URL is not supported for functions enabled with tenancy configuration.",
+            )
+
+        if self.SnapStart:
+            raise InvalidResourceException(
+                self.logical_id,
+                "SnapStart is not supported for functions enabled with tenancy configuration.",
+            )
+
+        if self.Events:
+            for event in self.Events.values():
+                event_type = event.get("Type")
+                if event_type not in ["Api", "HttpApi"]:
+                    raise InvalidResourceException(
+                        self.logical_id,
+                        f"Event source '{event_type}' is not supported for functions enabled with tenancy configuration. Only Api and HttpApi event sources are supported.",
+                    )
+
     def _construct_lambda_function(self, intrinsics_resolver: IntrinsicsResolver) -> LambdaFunction:
         """Constructs and returns the Lambda function.
 
@@ -618,6 +653,7 @@ def _construct_lambda_function(self, intrinsics_resolver: IntrinsicsResolver) ->
 
         lambda_function.RuntimeManagementConfig = self.RuntimeManagementConfig  # type: ignore[attr-defined]
         lambda_function.LoggingConfig = self.LoggingConfig
+        lambda_function.TenancyConfig = self.TenancyConfig
         lambda_function.RecursiveLoop = self.RecursiveLoop
         self._validate_package_type(lambda_function)
         return lambda_function

samtranslator/plugins/globals/globals.py

@@ -56,6 +56,7 @@ class Globals:
             "LoggingConfig",
             "RecursiveLoop",
             "SourceKMSKeyArn",
+            "TenancyConfig",
         ],
         # Everything except
         #   DefinitionBody: because its hard to reason about merge of Swagger dictionaries
@@ -101,7 +102,12 @@ class Globals:
     }
     # unreleased_properties *must be* part of supported_properties too
     unreleased_properties: Dict[str, List[str]] = {
-        SamResourceType.Function.value: ["RuntimeManagementConfig", "RecursiveLoop", "SourceKMSKeyArn"],
+        SamResourceType.Function.value: [
+            "RuntimeManagementConfig",
+            "RecursiveLoop",
+            "SourceKMSKeyArn",
+            "TenancyConfig",
+        ],
     }
 
     def __init__(self, template: Dict[str, Any]) -> None:

samtranslator/schema/schema.json

@@ -278502,6 +278502,9 @@
           "title": "Tags",
           "type": "object"
         },
+        "TenancyConfig": {
+          "$ref": "#/definitions/PassThroughProp"
+        },
         "Timeout": {
           "allOf": [
             {
@@ -278899,6 +278902,9 @@
           "title": "Tags",
           "type": "object"
         },
+        "TenancyConfig": {
+          "$ref": "#/definitions/PassThroughProp"
+        },
         "Timeout": {
           "allOf": [
             {