Skip to content

fix(lmi): exclude None values from CapacityProvider ScalingConfig and InstanceRequirements #3856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicheey merged 1 commit into from
Dec 3, 2025
Merged

fix(lmi): exclude None values from CapacityProvider ScalingConfig and InstanceRequirements #3856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions samtranslator/model/capacity_provider/generators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ def _transform_instance_requirements(self) -> Dict[str, Any]:
"""
instance_requirements = {}

if "Architectures" in self.instance_requirements:
if self.instance_requirements.get("Architectures") is not None:
instance_requirements["Architectures"] = self.instance_requirements["Architectures"]

if "AllowedTypes" in self.instance_requirements:
if self.instance_requirements.get("AllowedTypes") is not None:
instance_requirements["AllowedInstanceTypes"] = self.instance_requirements["AllowedTypes"]

if "ExcludedTypes" in self.instance_requirements:
if self.instance_requirements.get("ExcludedTypes") is not None:
instance_requirements["ExcludedInstanceTypes"] = self.instance_requirements["ExcludedTypes"]

return instance_requirements
Expand All @@ -150,11 +150,11 @@ def _transform_scaling_config(self) -> Dict[str, Any]:
"""
scaling_config = {}

if "MaxVCpuCount" in self.scaling_config:
if self.scaling_config.get("MaxVCpuCount") is not None:
scaling_config["MaxVCpuCount"] = self.scaling_config["MaxVCpuCount"]

# Handle AverageCPUUtilization structure
if "AverageCPUUtilization" in self.scaling_config:
if self.scaling_config.get("AverageCPUUtilization") is not None:
scaling_config["ScalingMode"] = "Manual"
scaling_policies = []

Expand Down
2 changes: 1 addition & 1 deletion samtranslator/model/sam_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ def to_cloudformation(self, **kwargs: Any) -> List[Resource]:
instance_requirements=(
model.InstanceRequirements.dict(exclude_none=True) if model.InstanceRequirements else None
),
scaling_config=model.ScalingConfig.dict() if model.ScalingConfig else None,
scaling_config=model.ScalingConfig.dict(exclude_none=True) if model.ScalingConfig else None,
kms_key_arn=passthrough_value(model.KMSKeyArn),
depends_on=self.depends_on,
resource_attributes=self.resource_attributes,
Expand Down
32 changes: 32 additions & 0 deletions tests/translator/input/capacity_provider_full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,35 @@ Resources:
MaxVCpuCount: 10
AverageCPUUtilization: 75.0
KMSKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv

CapacityProviderTwo:
Type: AWS::Serverless::CapacityProvider
Properties:
CapacityProviderName: customized-capacity-provider
VpcConfig:
SecurityGroupIds:
- sg-12345678
- sg-87654321
SubnetIds:
- subnet-12345678
ScalingConfig:
AverageCPUUtilization: 75.0
KMSKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv

PartialCapacityProviderThree:
Type: AWS::Serverless::CapacityProvider
Properties:
VpcConfig:
SecurityGroupIds:
- sg-12345678
SubnetIds:
- subnet-12345678
Tags:
Team: Tooling
PropagateTags: false
InstanceRequirements:
AllowedTypes:
- c5.xlarge
ScalingConfig:
MaxVCpuCount: 10
KMSKeyArn: arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv
140 changes: 140 additions & 0 deletions tests/translator/output/aws-cn/capacity_provider_full.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,75 @@
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "Full CapacityProvider configuration test",
"Resources": {
"CapacityProviderTwo": {
"Properties": {
"CapacityProviderName": "customized-capacity-provider",
"CapacityProviderScalingConfig": {
"ScalingMode": "Manual",
"ScalingPolicies": [
{
"PredefinedMetricType": "LambdaCapacityProviderAverageCPUUtilization",
"TargetValue": 75.0
}
]
},
"KMSKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
"PermissionsConfig": {
"CapacityProviderOperatorRoleArn": {
"Fn::GetAtt": [
"CapacityProviderTwoOperatorRole",
"Arn"
]
}
},
"Tags": [
{
"Key": "lambda:createdBy",
"Value": "SAM"
}
],
"VpcConfig": {
"SecurityGroupIds": [
"sg-12345678",
"sg-87654321"
],
"SubnetIds": [
"subnet-12345678"
]
}
},
"Type": "AWS::Lambda::CapacityProvider"
},
"CapacityProviderTwoOperatorRole": {
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": [
"sts:AssumeRole"
],
"Effect": "Allow",
"Principal": {
"Service": [
"lambda.amazonaws.com"
]
}
}
],
"Version": "2012-10-17"
},
"ManagedPolicyArns": [
"arn:aws-cn:iam::aws:policy/AWSLambdaManagedEC2ResourceOperator"
],
"Tags": [
{
"Key": "lambda:createdBy",
"Value": "SAM"
}
]
},
"Type": "AWS::IAM::Role"
},
"FullCapacityProvider": {
"Properties": {
"CapacityProviderName": "customized-capacity-provider",
Expand Down Expand Up @@ -88,6 +157,77 @@
]
},
"Type": "AWS::IAM::Role"
},
"PartialCapacityProviderThree": {
"Properties": {
"CapacityProviderScalingConfig": {
"MaxVCpuCount": 10,
"ScalingMode": "Auto"
},
"InstanceRequirements": {
"AllowedInstanceTypes": [
"c5.xlarge"
]
},
"KMSKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
"PermissionsConfig": {
"CapacityProviderOperatorRoleArn": {
"Fn::GetAtt": [
"PartialCapacityProviderThreeOperatorRole",
"Arn"
]
}
},
"Tags": [
{
"Key": "Team",
"Value": "Tooling"
},
{
"Key": "lambda:createdBy",
"Value": "SAM"
}
],
"VpcConfig": {
"SecurityGroupIds": [
"sg-12345678"
],
"SubnetIds": [
"subnet-12345678"
]
}
},
"Type": "AWS::Lambda::CapacityProvider"
},
"PartialCapacityProviderThreeOperatorRole": {
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": [
"sts:AssumeRole"
],
"Effect": "Allow",
"Principal": {
"Service": [
"lambda.amazonaws.com"
]
}
}
],
"Version": "2012-10-17"
},
"ManagedPolicyArns": [
"arn:aws-cn:iam::aws:policy/AWSLambdaManagedEC2ResourceOperator"
],
"Tags": [
{
"Key": "lambda:createdBy",
"Value": "SAM"
}
]
},
"Type": "AWS::IAM::Role"
}
}
}
140 changes: 140 additions & 0 deletions tests/translator/output/aws-us-gov/capacity_provider_full.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,75 @@
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "Full CapacityProvider configuration test",
"Resources": {
"CapacityProviderTwo": {
"Properties": {
"CapacityProviderName": "customized-capacity-provider",
"CapacityProviderScalingConfig": {
"ScalingMode": "Manual",
"ScalingPolicies": [
{
"PredefinedMetricType": "LambdaCapacityProviderAverageCPUUtilization",
"TargetValue": 75.0
}
]
},
"KMSKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
"PermissionsConfig": {
"CapacityProviderOperatorRoleArn": {
"Fn::GetAtt": [
"CapacityProviderTwoOperatorRole",
"Arn"
]
}
},
"Tags": [
{
"Key": "lambda:createdBy",
"Value": "SAM"
}
],
"VpcConfig": {
"SecurityGroupIds": [
"sg-12345678",
"sg-87654321"
],
"SubnetIds": [
"subnet-12345678"
]
}
},
"Type": "AWS::Lambda::CapacityProvider"
},
"CapacityProviderTwoOperatorRole": {
"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/AWSLambdaManagedEC2ResourceOperator"
],
"Tags": [
{
"Key": "lambda:createdBy",
"Value": "SAM"
}
]
},
"Type": "AWS::IAM::Role"
},
"FullCapacityProvider": {
"Properties": {
"CapacityProviderName": "customized-capacity-provider",
Expand Down Expand Up @@ -88,6 +157,77 @@
]
},
"Type": "AWS::IAM::Role"
},
"PartialCapacityProviderThree": {
"Properties": {
"CapacityProviderScalingConfig": {
"MaxVCpuCount": 10,
"ScalingMode": "Auto"
},
"InstanceRequirements": {
"AllowedInstanceTypes": [
"c5.xlarge"
]
},
"KMSKeyArn": "arn:aws:kms:us-east-1:123456789012:key/abcd1234-ef56-gh78-ij90-klmnopqrstuv",
"PermissionsConfig": {
"CapacityProviderOperatorRoleArn": {
"Fn::GetAtt": [
"PartialCapacityProviderThreeOperatorRole",
"Arn"
]
}
},
"Tags": [
{
"Key": "Team",
"Value": "Tooling"
},
{
"Key": "lambda:createdBy",
"Value": "SAM"
}
],
"VpcConfig": {
"SecurityGroupIds": [
"sg-12345678"
],
"SubnetIds": [
"subnet-12345678"
]
}
},
"Type": "AWS::Lambda::CapacityProvider"
},
"PartialCapacityProviderThreeOperatorRole": {
"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/AWSLambdaManagedEC2ResourceOperator"
],
"Tags": [
{
"Key": "lambda:createdBy",
"Value": "SAM"
}
]
},
"Type": "AWS::IAM::Role"
}
}
}
Loading
Loading