fix: support KmsKeyArn in Serverless::CapacityProvider

.cfnlintrc.yaml

@@ -144,7 +144,7 @@ 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/**/*capacity_provider*.json # TODO: Remove this once CFN updates
+  - tests/translator/output/aws-*/*capacity_provider*.json # Ignore Capacity Provider test format in non-aws partitions
   - 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

samtranslator/internal/schema_source/aws_serverless_capacity_provider.py

@@ -88,12 +88,12 @@ class Properties(BaseModel):
     # TODO: Change back to passthrough_prop after CloudFormation schema is updated with AWS::Lambda::CapacityProvider
     # Optional KMS key ARN - passes through directly to CFN for encryption configuration
     # Uses PassThroughProp because it's a direct 1:1 mapping with no SAM transformation
-    # KMSKeyArn: Optional[PassThroughProp] = passthrough_prop(
+    # KmsKeyArn: Optional[PassThroughProp] = passthrough_prop(
     #     PROPERTIES_STEM,
-    #     "KMSKeyArn",
-    #     ["AWS::Lambda::CapacityProvider", "Properties", "KMSKeyArn"],
+    #     "KmsKeyArn",
+    #     ["AWS::Lambda::CapacityProvider", "Properties", "KmsKeyArn"],
     # )
-    KMSKeyArn: Optional[PassThroughProp]  # TODO: add documentation
+    KmsKeyArn: Optional[PassThroughProp]  # TODO: add documentation
 
 
 class Globals(BaseModel):
@@ -120,7 +120,7 @@ class Globals(BaseModel):
     # Uses custom ScalingConfig class because SAM renames construct (CapacityProviderScalingConfig→ScalingConfig)
     ScalingConfig: Optional[ScalingConfig] = properties("ScalingConfig")
 
-    KMSKeyArn: Optional[PassThroughProp]  # TODO: add documentation
+    KmsKeyArn: Optional[PassThroughProp]  # TODO: add documentation
 
 
 class Resource(ResourceAttributes):

samtranslator/model/capacity_provider/generators.py

@@ -107,9 +107,9 @@ def _create_capacity_provider(self) -> LambdaCapacityProvider:
         if self.scaling_config:
             capacity_provider.CapacityProviderScalingConfig = self._transform_scaling_config()
 
-        # Set the KMSKeyArn if provided
+        # Set the KmsKeyArn if provided
         if self.kms_key_arn:
-            capacity_provider.KMSKeyArn = self.kms_key_arn
+            capacity_provider.KmsKeyArn = self.kms_key_arn
 
         # Pass through resource attributes
         if self.passthrough_resource_attributes:

samtranslator/model/capacity_provider/resources.py

@@ -22,7 +22,7 @@ class LambdaCapacityProvider(Resource):
         "Tags": GeneratedProperty(),
         "InstanceRequirements": GeneratedProperty(),
         "CapacityProviderScalingConfig": GeneratedProperty(),
-        "KMSKeyArn": GeneratedProperty(),
+        "KmsKeyArn": GeneratedProperty(),
     }
 
     CapacityProviderName: Optional[Intrinsicable[str]]
@@ -31,7 +31,7 @@ class LambdaCapacityProvider(Resource):
     Tags: Optional[List[Dict[str, Any]]]
     InstanceRequirements: Optional[Dict[str, Any]]
     CapacityProviderScalingConfig: Optional[Dict[str, Any]]
-    KMSKeyArn: Optional[Intrinsicable[str]]
+    KmsKeyArn: Optional[Intrinsicable[str]]
 
     runtime_attrs = {
         "name": lambda self: ref(self.logical_id),

samtranslator/model/sam_resources.py

@@ -1468,7 +1468,7 @@ class SamCapacityProvider(SamResourceMacro):
         "PropagateTags": Property(False, IS_BOOL),
         "InstanceRequirements": Property(False, IS_DICT),
         "ScalingConfig": Property(False, IS_DICT),
-        "KMSKeyArn": Property(False, one_of(IS_STR, IS_DICT)),
+        "KmsKeyArn": Property(False, one_of(IS_STR, IS_DICT)),
     }
 
     CapacityProviderName: Optional[Intrinsicable[str]]
@@ -1478,7 +1478,7 @@ class SamCapacityProvider(SamResourceMacro):
     PropagateTags: Optional[bool]
     InstanceRequirements: Optional[Dict[str, Any]]
     ScalingConfig: Optional[Dict[str, Any]]
-    KMSKeyArn: Optional[Intrinsicable[str]]
+    KmsKeyArn: Optional[Intrinsicable[str]]
 
     # Validation rules
     __validation_rules__ = [
@@ -1509,7 +1509,7 @@ def to_cloudformation(self, **kwargs: Any) -> List[Resource]:
                 model.InstanceRequirements.dict(exclude_none=True) if model.InstanceRequirements else None
             ),
             scaling_config=model.ScalingConfig.dict(exclude_none=True) if model.ScalingConfig else None,
-            kms_key_arn=passthrough_value(model.KMSKeyArn),
+            kms_key_arn=passthrough_value(model.KmsKeyArn),
             depends_on=self.depends_on,
             resource_attributes=self.resource_attributes,
             passthrough_resource_attributes=self.get_passthrough_resource_attributes(),

samtranslator/plugins/globals/globals.py

@@ -110,7 +110,7 @@ class Globals:
             "Tags",
             "InstanceRequirements",
             "ScalingConfig",
-            "KMSKeyArn",
+            "KmsKeyArn",
             "PropagateTags",
         ],
     }

samtranslator/schema/schema.json

@@ -278147,7 +278147,7 @@
           "markdownDescription": "Instance requirements for the capacity provider.\n*Type*: [InstanceRequirements](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-capacityprovider-instancerequirements.html)\n*Required*: No\n*AWS CloudFormation compatibility*: This property is passed directly to the [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) property of an `AWS::Lambda::CapacityProvider` resource.",
           "title": "InstanceRequirements"
         },
-        "KMSKeyArn": {
+        "KmsKeyArn": {
           "$ref": "#/definitions/PassThroughProp"
         },
         "OperatorRole": {
@@ -278206,7 +278206,7 @@
           "markdownDescription": "Instance requirements for the capacity provider.\n*Type*: [InstanceRequirements](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-capacityprovider-instancerequirements.html)\n*Required*: No\n*AWS CloudFormation compatibility*: This property is passed directly to the [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) property of an `AWS::Lambda::CapacityProvider` resource.",
           "title": "InstanceRequirements"
         },
-        "KMSKeyArn": {
+        "KmsKeyArn": {
           "$ref": "#/definitions/PassThroughProp"
         },
         "OperatorRole": {

schema_source/sam.schema.json

@@ -5138,7 +5138,7 @@
           "markdownDescription": "Instance requirements for the capacity provider.\n*Type*: [InstanceRequirements](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-capacityprovider-instancerequirements.html)\n*Required*: No\n*AWS CloudFormation compatibility*: This property is passed directly to the [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) property of an `AWS::Lambda::CapacityProvider` resource.",
           "title": "InstanceRequirements"
         },
-        "KMSKeyArn": {
+        "KmsKeyArn": {
           "$ref": "#/definitions/PassThroughProp"
         },
         "OperatorRole": {
@@ -5197,7 +5197,7 @@
           "markdownDescription": "Instance requirements for the capacity provider.\n*Type*: [InstanceRequirements](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-capacityprovider-instancerequirements.html)\n*Required*: No\n*AWS CloudFormation compatibility*: This property is passed directly to the [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) property of an `AWS::Lambda::CapacityProvider` resource.",
           "title": "InstanceRequirements"
         },
-        "KMSKeyArn": {
+        "KmsKeyArn": {
           "$ref": "#/definitions/PassThroughProp"
         },
         "OperatorRole": {

tests/model/capacity_provider/test_generators.py

@@ -96,7 +96,7 @@ def test_to_cloudformation_with_provided_permissions(self):
             properties["VpcConfig"], {"SubnetIds": ["subnet-123", "subnet-456"], "SecurityGroupIds": ["sg-123"]}
         )
         self.assertEqual(properties["PermissionsConfig"]["CapacityProviderOperatorRoleArn"], operator_role)
-        self.assertEqual(properties["KMSKeyArn"], self.kms_key_arn)
+        self.assertEqual(properties["KmsKeyArn"], self.kms_key_arn)
 
     def test_to_cloudformation_with_auto_generated_permissions(self):
         """Test to_cloudformation with auto-generated operator role"""

tests/model/capacity_provider/test_resources.py

@@ -32,7 +32,7 @@ def test_properties(self):
                 {"PredefinedMetricType": "LambdaCapacityProviderAverageCPUUtilization", "TargetValue": 70.0}
             ],
         }
-        capacity_provider.KMSKeyArn = "arn:aws:kms:us-west-2:123456789012:key/abcd1234-ab12-cd34-ef56-abcdef123456"
+        capacity_provider.KmsKeyArn = "arn:aws:kms:us-west-2:123456789012:key/abcd1234-ab12-cd34-ef56-abcdef123456"
 
         # Verify properties
         self.assertEqual(capacity_provider.CapacityProviderName, "test-provider")
@@ -64,7 +64,7 @@ def test_properties(self):
             },
         )
         self.assertEqual(
-            capacity_provider.KMSKeyArn, "arn:aws:kms:us-west-2:123456789012:key/abcd1234-ab12-cd34-ef56-abcdef123456"
+            capacity_provider.KmsKeyArn, "arn:aws:kms:us-west-2:123456789012:key/abcd1234-ab12-cd34-ef56-abcdef123456"
         )
 
     def test_runtime_attributes(self):

tests/translator/input/capacity_provider_full.yaml

@@ -25,12 +25,12 @@ Resources:
       ScalingConfig:
         MaxVCpuCount: 10
         AverageCPUUtilization: 75.0
-      KMSKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv
+      KmsKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv
 
   CapacityProviderTwo:
     Type: AWS::Serverless::CapacityProvider
     Properties:
-      CapacityProviderName: customized-capacity-provider
+      CapacityProviderName: customized-capacity-provider2
       VpcConfig:
         SecurityGroupIds:
         - sg-12345678
@@ -39,7 +39,7 @@ Resources:
         - subnet-12345678
       ScalingConfig:
         AverageCPUUtilization: 75.0
-      KMSKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv
+      KmsKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv
 
   PartialCapacityProviderThree:
     Type: AWS::Serverless::CapacityProvider
@@ -57,4 +57,4 @@ Resources:
         - c5.xlarge
       ScalingConfig:
         MaxVCpuCount: 10
-      KMSKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv
+      KmsKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv

tests/translator/input/capacity_provider_global_with_functions.yaml

@@ -48,7 +48,7 @@ Globals:
     InstanceRequirements:
       Architectures:
       - x86_64
-    KMSKeyArn: some-kms-arn
+    KmsKeyArn: some-kms-arn
 
   Function:
     Runtime: python3.12
@@ -131,8 +131,6 @@ Resources:
     Properties:
       CapacityProviderName: !Sub "${AWS::StackName}-${Environment}-capacity-provider"
       InstanceRequirements:
-        Architectures:
-        - arm64
         ExcludedTypes:
         - t2.micro
         - t2.small

tests/translator/input/capacity_provider_minimal.yaml

@@ -9,3 +9,5 @@ Resources:
       VpcConfig:
         SubnetIds:
         - subnet-12345678
+        SecurityGroupIds:
+        - sg-12345678

tests/translator/input/capacity_provider_with_intrinsics.yaml

@@ -39,7 +39,7 @@ Parameters:
     Type: Number
     Default: 81.2
 
-  KMSKeyArn:
+  KmsKeyArn:
     Type: String
     Default: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv
 
@@ -65,4 +65,4 @@ Resources:
       ScalingConfig:
         MaxVCpuCount: !Ref MaxVCpuCount
         AverageCPUUtilization: !Ref TargetCPU
-      KMSKeyArn: !Ref KMSKeyArn
+      KmsKeyArn: !Ref KmsKeyArn

tests/translator/input/error_capacity_provider_typo_properties.yaml

@@ -15,4 +15,5 @@ Resources:
         - subnet-87654321
       ScalingConfg: # Typo: missing 'i'
         MaxVCpuCount: 10
-      KMSKeyArn: arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012 # Typo: should be KMSKeyArn
+      KMSKeyArn: arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012 # Typo: should be KmsKeyArn
+# This test will actually fail only with the first error, so the rest are just ignored

tests/translator/input/function_with_capacity_provider_and_autopublish.yaml

@@ -14,7 +14,7 @@ Resources:
       Timeout: 30
       AutoPublishAlias: Production
       CapacityProviderConfig:
-        Arn: arn:aws:lambda:us-east-1:123456789012:capacity-provider/test-capacity-provider
+        Arn: arn:aws:lambda:us-east-1:123456789012:capacity-provider:test-capacity-provider
         PerExecutionEnvironmentMaxConcurrency: 50
       FunctionScalingConfig:
         MinExecutionEnvironments: 2

tests/translator/input/function_with_capacity_provider_full.yaml

@@ -17,7 +17,7 @@ Resources:
         Variables:
           ENVIRONMENT: production
       CapacityProviderConfig:
-        Arn: arn:aws:lambda:us-east-1:123456789012:capacity-provider/test-capacity-provider
+        Arn: arn:aws:lambda:us-east-1:123456789012:capacity-provider:test-capacity-provider
         PerExecutionEnvironmentMaxConcurrency: 100
         ExecutionEnvironmentMemoryGiBPerVCpu: 4.0
       FunctionScalingConfig:

tests/translator/input/function_with_capacity_provider_minimal.yaml

@@ -10,4 +10,4 @@ Resources:
       Handler: hello.handler
       Runtime: python3.12
       CapacityProviderConfig:
-        Arn: arn:aws:lambda:us-east-1:123456789012:capacity-provider/test-capacity-provider
+        Arn: arn:aws:lambda:us-east-1:123456789012:capacity-provider:test-capacity-provider

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

@@ -4,7 +4,7 @@
   "Resources": {
     "CapacityProviderTwo": {
       "Properties": {
-        "CapacityProviderName": "customized-capacity-provider",
+        "CapacityProviderName": "customized-capacity-provider2",
         "CapacityProviderScalingConfig": {
           "ScalingMode": "Manual",
           "ScalingPolicies": [
@@ -14,7 +14,7 @@
             }
           ]
         },
-        "KMSKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
+        "KmsKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
         "PermissionsConfig": {
           "CapacityProviderOperatorRoleArn": {
             "Fn::GetAtt": [
@@ -93,7 +93,7 @@
             "arm64"
           ]
         },
-        "KMSKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
+        "KmsKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
         "PermissionsConfig": {
           "CapacityProviderOperatorRoleArn": {
             "Fn::GetAtt": [
@@ -169,7 +169,7 @@
             "c5.xlarge"
           ]
         },
-        "KMSKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
+        "KmsKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
         "PermissionsConfig": {
           "CapacityProviderOperatorRoleArn": {
             "Fn::GetAtt": [

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

@@ -217,15 +217,14 @@
         },
         "InstanceRequirements": {
           "Architectures": [
-            "x86_64",
-            "arm64"
+            "x86_64"
           ],
           "ExcludedInstanceTypes": [
             "t2.micro",
             "t2.small"
           ]
         },
-        "KMSKeyArn": "some-kms-arn",
+        "KmsKeyArn": "some-kms-arn",
         "PermissionsConfig": {
           "CapacityProviderOperatorRoleArn": {
             "Fn::GetAtt": [

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

@@ -19,6 +19,9 @@
           }
         ],
         "VpcConfig": {
+          "SecurityGroupIds": [
+            "sg-12345678"
+          ],
           "SubnetIds": [
             "subnet-12345678"
           ]

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

@@ -18,7 +18,7 @@
       "Default": "t2.micro",
       "Type": "String"
     },
-    "KMSKeyArn": {
+    "KmsKeyArn": {
       "Default": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
       "Type": "String"
     },
@@ -84,8 +84,8 @@
             }
           ]
         },
-        "KMSKeyArn": {
-          "Ref": "KMSKeyArn"
+        "KmsKeyArn": {
+          "Ref": "KmsKeyArn"
         },
         "PermissionsConfig": {
           "CapacityProviderOperatorRoleArn": {

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

@@ -30,7 +30,7 @@
       "Properties": {
         "CapacityProviderConfig": {
           "LambdaManagedInstancesCapacityProviderConfig": {
-            "CapacityProviderArn": "arn:aws:lambda:us-east-1:123456789012:capacity-provider/test-capacity-provider",
+            "CapacityProviderArn": "arn:aws:lambda:us-east-1:123456789012:capacity-provider:test-capacity-provider",
             "PerExecutionEnvironmentMaxConcurrency": 50
           }
         },

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

@@ -6,7 +6,7 @@
       "Properties": {
         "CapacityProviderConfig": {
           "LambdaManagedInstancesCapacityProviderConfig": {
-            "CapacityProviderArn": "arn:aws:lambda:us-east-1:123456789012:capacity-provider/test-capacity-provider",
+            "CapacityProviderArn": "arn:aws:lambda:us-east-1:123456789012:capacity-provider:test-capacity-provider",
             "ExecutionEnvironmentMemoryGiBPerVCpu": 4,
             "PerExecutionEnvironmentMaxConcurrency": 100
           }

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

@@ -6,7 +6,7 @@
       "Properties": {
         "CapacityProviderConfig": {
           "LambdaManagedInstancesCapacityProviderConfig": {
-            "CapacityProviderArn": "arn:aws:lambda:us-east-1:123456789012:capacity-provider/test-capacity-provider"
+            "CapacityProviderArn": "arn:aws:lambda:us-east-1:123456789012:capacity-provider:test-capacity-provider"
           }
         },
         "Code": {