test(capacity-provider): add integration test for ManagedResourceTags#3983

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 4 commits into from
Aug 24, 2026
Merged

test(capacity-provider): add integration test for ManagedResourceTags #3983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bb8346
test(capacity-provider): add integration test for ManagedResourceTags
vicheey Aug 21, 2026
7797cde
test: add Globals.CapacityProvider.ManagedResourceTags inheritance an…
vicheey Aug 24, 2026
5e063c7
Fix mypy unused-ignore CI failure for add_multi_constructor
vicheey Aug 24, 2026
cc4c6d3
test: remove redundant CpNoManagedResourceTags fixture
vicheey Aug 24, 2026
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
33 changes: 33 additions & 0 deletions integration/combination/test_function_with_capacity_provider.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,22 @@ def test_function_with_capacity_provider_default_role(self):
self.verify_capacity_provider_vpc_config(simple_cp_config, "SimpleCapacityProvider")
self.verify_capacity_provider_permissions_config(simple_cp_config, "SimpleCapacityProvider")

# Verify Globals.CapacityProvider.ManagedResourceTags inheritance on SimpleCapacityProvider
simple_propagate_tags = simple_cp_config.get("PropagateTags")
self.assertIsNotNone(simple_propagate_tags, "SimpleCapacityProvider should inherit PropagateTags from Globals")
self.assertEqual(
simple_propagate_tags.get("Mode"),
"Explicit",
"SimpleCapacityProvider should have PropagateTags Mode: Explicit from Globals",
)
simple_explicit_tags = simple_propagate_tags.get("ExplicitTags", {})
self.assertIn("GlobalTag", simple_explicit_tags, "SimpleCapacityProvider should inherit GlobalTag from Globals")
self.assertEqual(
simple_explicit_tags["GlobalTag"],
"shared-value",
"GlobalTag should be 'shared-value' from Globals",
)

advanced_cp_config = self.get_lambda_capacity_provider_config("AdvancedCapacityProvider")
self.verify_capacity_provider_basic_config(advanced_cp_config, "AdvancedCapacityProvider")
self.verify_capacity_provider_vpc_config(advanced_cp_config, "AdvancedCapacityProvider")
Expand DownExpand Up@@ -180,6 +196,23 @@ def test_function_with_capacity_provider_default_role(self):
"AdvancedCapacityProvider should use the correct KMS key",
)

# Verify ManagedResourceTags -> PropagateTags configuration
propagate_tags = advanced_cp_config.get("PropagateTags")
self.assertIsNotNone(propagate_tags, "AdvancedCapacityProvider should have PropagateTags configuration")
self.assertEqual(
propagate_tags.get("Mode"), "Explicit", "AdvancedCapacityProvider should have PropagateTags Mode: Explicit"
)

explicit_tags = propagate_tags.get("ExplicitTags", {})
Comment thread
vicheey marked this conversation as resolved.
Comment thread
vicheey marked this conversation as resolved.
Comment thread
vicheey marked this conversation as resolved.
self.assertIn("Environment", explicit_tags, "AdvancedCapacityProvider should propagate Environment tag")
self.assertIn("Team", explicit_tags, "AdvancedCapacityProvider should propagate Team tag")
self.assertIn("GlobalTag", explicit_tags, "AdvancedCapacityProvider should override GlobalTag from Globals")
self.assertEqual(explicit_tags["Environment"], "Production", "Environment tag should be 'Production'")
self.assertEqual(explicit_tags["Team"], "Lambda-Tooling", "Team tag should be 'Lambda-Tooling'")
self.assertEqual(
explicit_tags["GlobalTag"], "overridden-value", "GlobalTag should be overridden by resource-level value"
)

telemetry_config = advanced_cp_config.get("TelemetryConfig")
self.assertIsNotNone(telemetry_config, "AdvancedCapacityProvider should have TelemetryConfig")
logging_config = telemetry_config.get("LoggingConfig")
Expand Down
11 changes: 11 additions & 0 deletions integration/resources/templates/combination/function_lmi_default.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,12 @@ Parameters:
KMSKeyArn:
Type: String

Globals:
CapacityProvider:
ManagedResourceTags:
Tags:
GlobalTag: shared-value

Resources:
SimpleCapacityProvider:
Type: AWS::Serverless::CapacityProvider
Expand DownExpand Up@@ -45,6 +51,11 @@ Resources:
KmsKeyArn: !Ref KMSKeyArn
LoggingConfig:
SystemLogLevel: DEBUG
ManagedResourceTags:
Comment thread
vicheey marked this conversation as resolved.
Tags:
Environment: Production
Team: Lambda-Tooling
GlobalTag: overridden-value
Tags:
Environment: Test

Expand Down
1 change: 0 additions & 1 deletion samtranslator/internal/schema_source/aws_serverless_capacity_provider.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@

classManagedResourceTags(BaseModel):
Tags: DictStrAny|None=managedresourcetags("Tags")
Propagate: bool|None=managedresourcetags("Propagate")


classVpcConfig(BaseModel):
Expand Down
1 change: 0 additions & 1 deletion samtranslator/internal/schema_source/sam-docs.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,6 @@
"ExcludedTypes": "A list of EC2 instance types to exclude from the capacity provider. \n*Type*: List \n*Required*: No \n*CloudFormation compatibility*: This property is passed directly to the [`ExcludedInstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-capacityprovider-instancerequirements.html#cfn-lambda-capacityprovider-instancerequirements-excludedinstancetypes) property of [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) of an `AWS::Lambda::CapacityProvider` resource."
},
"sam-property-capacityprovider-managedresourcetags": {
"Propagate": "TODO",
"Tags": "TODO"
},
"sam-property-capacityprovider-scalingconfig": {
Expand Down
3 changes: 0 additions & 3 deletions samtranslator/model/capacity_provider/generators.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,4 @@ def _transform_managed_resource_tags(self) -> dict[str, Any]:
if"Tags"intags:
return {"Mode": "Explicit", "ExplicitTags": get_tag_list(tags["Tags"])}

if"Propagate"intags:
return {"Mode": "CapacityProvider"iftags["Propagate"] else"None"}

return {}
4 changes: 0 additions & 4 deletions samtranslator/model/sam_resources.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1577,10 +1577,6 @@ class SamCapacityProvider(SamResourceMacro):
ValidationRule.MUTUALLY_EXCLUSIVE,
["InstanceRequirements.AllowedTypes", "InstanceRequirements.ExcludedTypes"],
),
(
ValidationRule.MUTUALLY_EXCLUSIVE,
["ManagedResourceTags.Propagate=True", "ManagedResourceTags.Tags"],
),
]

def to_cloudformation(self, **kwargs: Any) -> list[Resource]:
Expand Down
5 changes: 0 additions & 5 deletions samtranslator/schema/schema.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -374761,11 +374761,6 @@
"ManagedResourceTags": {
"additionalProperties": false,
"properties": {
"Propagate": {
"markdownDescription": "TODO",
"title": "Propagate",
"type": "boolean"
},
"Tags": {
"markdownDescription": "TODO",
"title": "Tags",
Expand Down
2 changes: 1 addition & 1 deletion samtranslator/yaml_helper.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

def yaml_parse(yamlstr): # type: ignore[no-untyped-def]
"""Parse a yaml string"""
yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call]
yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call,unused-ignore]
return yaml.safe_load(yamlstr)


Expand Down
5 changes: 0 additions & 5 deletions schema_source/sam.schema.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3065,11 +3065,6 @@
"ManagedResourceTags": {
"additionalProperties": false,
"properties": {
"Propagate": {
"markdownDescription": "TODO",
"title": "Propagate",
"type": "boolean"
},
"Tags": {
"markdownDescription": "TODO",
"title": "Tags",
Expand Down
9 changes: 5 additions & 4 deletions tests/model/capacity_provider/test_generators.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,8 +226,6 @@ def extract_resource(self, resource_array: list[Resource]):

@parameterized.expand(
[
("propagate_true", {"Propagate": True}, {"Mode": "CapacityProvider"}),
("propagate_false", {"Propagate": False}, {"Mode": "None"}),
(
"explicit_tags",
{"Tags": {"Env": "prod", "Team": "tooling"}},
Expand All@@ -251,9 +249,12 @@ def test_to_cloudformation_with_managed_resource_tags(self):
self.logical_id,
vpc_config=self.vpc_config,
operator_role=self.operator_role,
managed_resource_tags={"Propagate": True},
managed_resource_tags={"Tags": {"Env": "prod"}},
)
resources = generator.to_cloudformation()
resource_dict = self.extract_resource(resources)
capacity_provider = resource_dict[self.logical_id]
self.assertEqual(capacity_provider["Properties"]["PropagateTags"], {"Mode": "CapacityProvider"})
self.assertEqual(
capacity_provider["Properties"]["PropagateTags"],
{"Mode": "Explicit", "ExplicitTags": [{"Key": "Env", "Value": "prod"}]},
)
32 changes: 4 additions & 28 deletions tests/translator/input/capacity_provider_managed_resource_tags.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: Test ManagedResourceTags - all configurations
Description: Test ManagedResourceTags - explicit tags configuration

Parameters:
Environment:
Expand All@@ -10,7 +10,8 @@ Parameters:
Globals:
CapacityProvider:
ManagedResourceTags:
Propagate: true
Tags:
GlobalTag: shared-value

Resources:
CpInheritsGlobal:
Expand All@@ -22,7 +23,7 @@ Resources:
SecurityGroupIds:
- sg-11111111

CpOverridePropagateFalse:
CpOverrideWithExplicitTags:
Type: AWS::Serverless::CapacityProvider
Properties:
VpcConfig:
Expand All@@ -31,31 +32,6 @@ Resources:
SecurityGroupIds:
- sg-22222222
ManagedResourceTags:
Propagate: false

CpOverrideWithExplicitTags:
Type: AWS::Serverless::CapacityProvider
Properties:
VpcConfig:
SubnetIds:
- subnet-33333333
SecurityGroupIds:
- sg-33333333
ManagedResourceTags:
Propagate: false
Tags:
Environment: !Ref Environment
Team: !Sub '${AWS::StackName}-tooling'

# PRUNE_AND_MERGE: local has only Tags → global Propagate key is dropped
CpOverrideStrategyDropsGlobalKey:
Type: AWS::Serverless::CapacityProvider
Properties:
VpcConfig:
SubnetIds:
- subnet-44444444
SecurityGroupIds:
- sg-44444444
ManagedResourceTags:
Tags:
App: my-service
20 changes: 0 additions & 20 deletions ...s/translator/input/error_capacity_provider_managed_resource_tags_intrinsic_propagate.yaml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions tests/translator/input/error_capacity_provider_managed_resource_tags_mutual_exclusion.yaml
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
test(capacity-provider): add integration test for ManagedResourceTags#3983

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 4 commits into

from

Aug 24, 2026
 Merged


test(capacity-provider): add integration test for ManagedResourceTags
#3983
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
5bb8346

test(capacity-provider): add integration test for ManagedResourceTags


vicheey Aug 21, 2026
7797cde

test: add Globals.CapacityProvider.ManagedResourceTags inheritance an…


vicheey Aug 24, 2026
5e063c7

Fix mypy unused-ignore CI failure for add_multi_constructor


vicheey Aug 24, 2026
cc4c6d3

test: remove redundant CpNoManagedResourceTags fixture


vicheey Aug 24, 2026

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


33 changes: 33 additions & 0 deletions
integration/combination/test_function_with_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,22 @@ def test_function_with_capacity_provider_default_role(self):
 self.verify_capacity_provider_vpc_config(simple_cp_config, "SimpleCapacityProvider")
 self.verify_capacity_provider_permissions_config(simple_cp_config, "SimpleCapacityProvider")

 # Verify Globals.CapacityProvider.ManagedResourceTags inheritance on SimpleCapacityProvider
 simple_propagate_tags = simple_cp_config.get("PropagateTags")
 self.assertIsNotNone(simple_propagate_tags, "SimpleCapacityProvider should inherit PropagateTags from Globals")
 self.assertEqual(
 simple_propagate_tags.get("Mode"),
 "Explicit",
 "SimpleCapacityProvider should have PropagateTags Mode: Explicit from Globals",
 )
 simple_explicit_tags = simple_propagate_tags.get("ExplicitTags", {})
 self.assertIn("GlobalTag", simple_explicit_tags, "SimpleCapacityProvider should inherit GlobalTag from Globals")
 self.assertEqual(
 simple_explicit_tags["GlobalTag"],
 "shared-value",
 "GlobalTag should be 'shared-value' from Globals",
 )

 advanced_cp_config = self.get_lambda_capacity_provider_config("AdvancedCapacityProvider")
 self.verify_capacity_provider_basic_config(advanced_cp_config, "AdvancedCapacityProvider")
 self.verify_capacity_provider_vpc_config(advanced_cp_config, "AdvancedCapacityProvider")
Expand DownExpand Up@@ -180,6 +196,23 @@ def test_function_with_capacity_provider_default_role(self):
 "AdvancedCapacityProvider should use the correct KMS key",
 )

 # Verify ManagedResourceTags -> PropagateTags configuration
 propagate_tags = advanced_cp_config.get("PropagateTags")
 self.assertIsNotNone(propagate_tags, "AdvancedCapacityProvider should have PropagateTags configuration")
 self.assertEqual(
 propagate_tags.get("Mode"), "Explicit", "AdvancedCapacityProvider should have PropagateTags Mode: Explicit"
 )

 explicit_tags = propagate_tags.get("ExplicitTags", {})
Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

 self.assertIn("Environment", explicit_tags, "AdvancedCapacityProvider should propagate Environment tag")
 self.assertIn("Team", explicit_tags, "AdvancedCapacityProvider should propagate Team tag")
 self.assertIn("GlobalTag", explicit_tags, "AdvancedCapacityProvider should override GlobalTag from Globals")
 self.assertEqual(explicit_tags["Environment"], "Production", "Environment tag should be 'Production'")
 self.assertEqual(explicit_tags["Team"], "Lambda-Tooling", "Team tag should be 'Lambda-Tooling'")
 self.assertEqual(
 explicit_tags["GlobalTag"], "overridden-value", "GlobalTag should be overridden by resource-level value"
 )

 telemetry_config = advanced_cp_config.get("TelemetryConfig")
 self.assertIsNotNone(telemetry_config, "AdvancedCapacityProvider should have TelemetryConfig")
 logging_config = telemetry_config.get("LoggingConfig")
Expand Down

11 changes: 11 additions & 0 deletions
integration/resources/templates/combination/function_lmi_default.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,12 @@ Parameters:
 KMSKeyArn:
 Type: String

Globals:
 CapacityProvider:
 ManagedResourceTags:
 Tags:
 GlobalTag: shared-value

Resources:
 SimpleCapacityProvider:
 Type: AWS::Serverless::CapacityProvider
Expand DownExpand Up@@ -45,6 +51,11 @@ Resources:
 KmsKeyArn: !Ref KMSKeyArn
 LoggingConfig:
 SystemLogLevel: DEBUG
 ManagedResourceTags:
Comment thread
vicheey marked this conversation as resolved.

 Tags:
 Environment: Production
 Team: Lambda-Tooling
 GlobalTag: overridden-value
 Tags:
 Environment: Test

Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/aws_serverless_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@

classManagedResourceTags(BaseModel):
Tags: DictStrAny|None=managedresourcetags("Tags")
Propagate: bool|None=managedresourcetags("Propagate")


classVpcConfig(BaseModel):
Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/sam-docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,6 @@
"ExcludedTypes": "A list of EC2 instance types to exclude from the capacity provider. \n*Type*: List \n*Required*: No \n*CloudFormation compatibility*: This property is passed directly to the [`ExcludedInstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-capacityprovider-instancerequirements.html#cfn-lambda-capacityprovider-instancerequirements-excludedinstancetypes) property of [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) of an `AWS::Lambda::CapacityProvider` resource."
 },
"sam-property-capacityprovider-managedresourcetags": {
"Propagate": "TODO",
"Tags": "TODO"
 },
"sam-property-capacityprovider-scalingconfig": {
Expand Down

3 changes: 0 additions & 3 deletions
samtranslator/model/capacity_provider/generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,4 @@ def _transform_managed_resource_tags(self) -> dict[str, Any]:
if"Tags"intags:
return {"Mode": "Explicit", "ExplicitTags": get_tag_list(tags["Tags"])}

if"Propagate"intags:
return {"Mode": "CapacityProvider"iftags["Propagate"] else"None"}

return {}

4 changes: 0 additions & 4 deletions
samtranslator/model/sam_resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1577,10 +1577,6 @@ class SamCapacityProvider(SamResourceMacro):
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["InstanceRequirements.AllowedTypes", "InstanceRequirements.ExcludedTypes"],
 ),
 (
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["ManagedResourceTags.Propagate=True", "ManagedResourceTags.Tags"],
 ),
 ]

 def to_cloudformation(self, **kwargs: Any) -> list[Resource]:
Expand Down

5 changes: 0 additions & 5 deletions
samtranslator/schema/schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374761,11 +374761,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

2 changes: 1 addition & 1 deletion
samtranslator/yaml_helper.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

def yaml_parse(yamlstr): # type: ignore[no-untyped-def]
 """Parse a yaml string"""
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call]
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call,unused-ignore]
 return yaml.safe_load(yamlstr)


Expand Down

5 changes: 0 additions & 5 deletions
schema_source/sam.schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3065,11 +3065,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

9 changes: 5 additions & 4 deletions
tests/model/capacity_provider/test_generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,8 +226,6 @@ def extract_resource(self, resource_array: list[Resource]):

 @parameterized.expand(
 [
 ("propagate_true", {"Propagate": True}, {"Mode": "CapacityProvider"}),
 ("propagate_false", {"Propagate": False}, {"Mode": "None"}),
 (
 "explicit_tags",
 {"Tags": {"Env": "prod", "Team": "tooling"}},
Expand All@@ -251,9 +249,12 @@ def test_to_cloudformation_with_managed_resource_tags(self):
 self.logical_id,
 vpc_config=self.vpc_config,
 operator_role=self.operator_role,
 managed_resource_tags={"Propagate": True},
 managed_resource_tags={"Tags": {"Env": "prod"}},
 )
 resources = generator.to_cloudformation()
 resource_dict = self.extract_resource(resources)
 capacity_provider = resource_dict[self.logical_id]
 self.assertEqual(capacity_provider["Properties"]["PropagateTags"], {"Mode": "CapacityProvider"})
 self.assertEqual(
 capacity_provider["Properties"]["PropagateTags"],
 {"Mode": "Explicit", "ExplicitTags": [{"Key": "Env", "Value": "prod"}]},
 )

32 changes: 4 additions & 28 deletions
tests/translator/input/capacity_provider_managed_resource_tags.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: Test ManagedResourceTags - all configurations
Description: Test ManagedResourceTags - explicit tags configuration

Parameters:
 Environment:
Expand All@@ -10,7 +10,8 @@ Parameters:
Globals:
 CapacityProvider:
 ManagedResourceTags:
 Propagate: true
 Tags:
 GlobalTag: shared-value

Resources:
 CpInheritsGlobal:
Expand All@@ -22,7 +23,7 @@ Resources:
 SecurityGroupIds:
 - sg-11111111

CpOverridePropagateFalse:
CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
Expand All@@ -31,31 +32,6 @@ Resources:
 SecurityGroupIds:
 - sg-22222222
 ManagedResourceTags:
 Propagate: false

 CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-33333333
 SecurityGroupIds:
 - sg-33333333
 ManagedResourceTags:
 Propagate: false
 Tags:
 Environment: !Ref Environment
 Team: !Sub '${AWS::StackName}-tooling'

 # PRUNE_AND_MERGE: local has only Tags → global Propagate key is dropped
 CpOverrideStrategyDropsGlobalKey:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-44444444
 SecurityGroupIds:
 - sg-44444444
 ManagedResourceTags:
 Tags:
 App: my-service

20 changes: 0 additions & 20 deletions
...s/translator/input/error_capacity_provider_managed_resource_tags_intrinsic_propagate.yaml

View file


Open in desktop


This file was deleted.


20 changes: 0 additions & 20 deletions
tests/translator/input/error_capacity_provider_managed_resource_tags_mutual_exclusion.yaml

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(capacity-provider): add integration test for ManagedResourceTags#3983

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 4 commits into

from

Aug 24, 2026
 Merged


test(capacity-provider): add integration test for ManagedResourceTags
#3983
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
5bb8346

test(capacity-provider): add integration test for ManagedResourceTags


vicheey Aug 21, 2026
7797cde

test: add Globals.CapacityProvider.ManagedResourceTags inheritance an…


vicheey Aug 24, 2026
5e063c7

Fix mypy unused-ignore CI failure for add_multi_constructor


vicheey Aug 24, 2026
cc4c6d3

test: remove redundant CpNoManagedResourceTags fixture


vicheey Aug 24, 2026

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


33 changes: 33 additions & 0 deletions
integration/combination/test_function_with_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,22 @@ def test_function_with_capacity_provider_default_role(self):
 self.verify_capacity_provider_vpc_config(simple_cp_config, "SimpleCapacityProvider")
 self.verify_capacity_provider_permissions_config(simple_cp_config, "SimpleCapacityProvider")

 # Verify Globals.CapacityProvider.ManagedResourceTags inheritance on SimpleCapacityProvider
 simple_propagate_tags = simple_cp_config.get("PropagateTags")
 self.assertIsNotNone(simple_propagate_tags, "SimpleCapacityProvider should inherit PropagateTags from Globals")
 self.assertEqual(
 simple_propagate_tags.get("Mode"),
 "Explicit",
 "SimpleCapacityProvider should have PropagateTags Mode: Explicit from Globals",
 )
 simple_explicit_tags = simple_propagate_tags.get("ExplicitTags", {})
 self.assertIn("GlobalTag", simple_explicit_tags, "SimpleCapacityProvider should inherit GlobalTag from Globals")
 self.assertEqual(
 simple_explicit_tags["GlobalTag"],
 "shared-value",
 "GlobalTag should be 'shared-value' from Globals",
 )

 advanced_cp_config = self.get_lambda_capacity_provider_config("AdvancedCapacityProvider")
 self.verify_capacity_provider_basic_config(advanced_cp_config, "AdvancedCapacityProvider")
 self.verify_capacity_provider_vpc_config(advanced_cp_config, "AdvancedCapacityProvider")
Expand DownExpand Up@@ -180,6 +196,23 @@ def test_function_with_capacity_provider_default_role(self):
 "AdvancedCapacityProvider should use the correct KMS key",
 )

 # Verify ManagedResourceTags -> PropagateTags configuration
 propagate_tags = advanced_cp_config.get("PropagateTags")
 self.assertIsNotNone(propagate_tags, "AdvancedCapacityProvider should have PropagateTags configuration")
 self.assertEqual(
 propagate_tags.get("Mode"), "Explicit", "AdvancedCapacityProvider should have PropagateTags Mode: Explicit"
 )

 explicit_tags = propagate_tags.get("ExplicitTags", {})
Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

 self.assertIn("Environment", explicit_tags, "AdvancedCapacityProvider should propagate Environment tag")
 self.assertIn("Team", explicit_tags, "AdvancedCapacityProvider should propagate Team tag")
 self.assertIn("GlobalTag", explicit_tags, "AdvancedCapacityProvider should override GlobalTag from Globals")
 self.assertEqual(explicit_tags["Environment"], "Production", "Environment tag should be 'Production'")
 self.assertEqual(explicit_tags["Team"], "Lambda-Tooling", "Team tag should be 'Lambda-Tooling'")
 self.assertEqual(
 explicit_tags["GlobalTag"], "overridden-value", "GlobalTag should be overridden by resource-level value"
 )

 telemetry_config = advanced_cp_config.get("TelemetryConfig")
 self.assertIsNotNone(telemetry_config, "AdvancedCapacityProvider should have TelemetryConfig")
 logging_config = telemetry_config.get("LoggingConfig")
Expand Down

11 changes: 11 additions & 0 deletions
integration/resources/templates/combination/function_lmi_default.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,12 @@ Parameters:
 KMSKeyArn:
 Type: String

Globals:
 CapacityProvider:
 ManagedResourceTags:
 Tags:
 GlobalTag: shared-value

Resources:
 SimpleCapacityProvider:
 Type: AWS::Serverless::CapacityProvider
Expand DownExpand Up@@ -45,6 +51,11 @@ Resources:
 KmsKeyArn: !Ref KMSKeyArn
 LoggingConfig:
 SystemLogLevel: DEBUG
 ManagedResourceTags:
Comment thread
vicheey marked this conversation as resolved.

 Tags:
 Environment: Production
 Team: Lambda-Tooling
 GlobalTag: overridden-value
 Tags:
 Environment: Test

Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/aws_serverless_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@

classManagedResourceTags(BaseModel):
Tags: DictStrAny|None=managedresourcetags("Tags")
Propagate: bool|None=managedresourcetags("Propagate")


classVpcConfig(BaseModel):
Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/sam-docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,6 @@
"ExcludedTypes": "A list of EC2 instance types to exclude from the capacity provider. \n*Type*: List \n*Required*: No \n*CloudFormation compatibility*: This property is passed directly to the [`ExcludedInstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-capacityprovider-instancerequirements.html#cfn-lambda-capacityprovider-instancerequirements-excludedinstancetypes) property of [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) of an `AWS::Lambda::CapacityProvider` resource."
 },
"sam-property-capacityprovider-managedresourcetags": {
"Propagate": "TODO",
"Tags": "TODO"
 },
"sam-property-capacityprovider-scalingconfig": {
Expand Down

3 changes: 0 additions & 3 deletions
samtranslator/model/capacity_provider/generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,4 @@ def _transform_managed_resource_tags(self) -> dict[str, Any]:
if"Tags"intags:
return {"Mode": "Explicit", "ExplicitTags": get_tag_list(tags["Tags"])}

if"Propagate"intags:
return {"Mode": "CapacityProvider"iftags["Propagate"] else"None"}

return {}

4 changes: 0 additions & 4 deletions
samtranslator/model/sam_resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1577,10 +1577,6 @@ class SamCapacityProvider(SamResourceMacro):
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["InstanceRequirements.AllowedTypes", "InstanceRequirements.ExcludedTypes"],
 ),
 (
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["ManagedResourceTags.Propagate=True", "ManagedResourceTags.Tags"],
 ),
 ]

 def to_cloudformation(self, **kwargs: Any) -> list[Resource]:
Expand Down

5 changes: 0 additions & 5 deletions
samtranslator/schema/schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374761,11 +374761,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

2 changes: 1 addition & 1 deletion
samtranslator/yaml_helper.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

def yaml_parse(yamlstr): # type: ignore[no-untyped-def]
 """Parse a yaml string"""
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call]
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call,unused-ignore]
 return yaml.safe_load(yamlstr)


Expand Down

5 changes: 0 additions & 5 deletions
schema_source/sam.schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3065,11 +3065,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

9 changes: 5 additions & 4 deletions
tests/model/capacity_provider/test_generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,8 +226,6 @@ def extract_resource(self, resource_array: list[Resource]):

 @parameterized.expand(
 [
 ("propagate_true", {"Propagate": True}, {"Mode": "CapacityProvider"}),
 ("propagate_false", {"Propagate": False}, {"Mode": "None"}),
 (
 "explicit_tags",
 {"Tags": {"Env": "prod", "Team": "tooling"}},
Expand All@@ -251,9 +249,12 @@ def test_to_cloudformation_with_managed_resource_tags(self):
 self.logical_id,
 vpc_config=self.vpc_config,
 operator_role=self.operator_role,
 managed_resource_tags={"Propagate": True},
 managed_resource_tags={"Tags": {"Env": "prod"}},
 )
 resources = generator.to_cloudformation()
 resource_dict = self.extract_resource(resources)
 capacity_provider = resource_dict[self.logical_id]
 self.assertEqual(capacity_provider["Properties"]["PropagateTags"], {"Mode": "CapacityProvider"})
 self.assertEqual(
 capacity_provider["Properties"]["PropagateTags"],
 {"Mode": "Explicit", "ExplicitTags": [{"Key": "Env", "Value": "prod"}]},
 )

32 changes: 4 additions & 28 deletions
tests/translator/input/capacity_provider_managed_resource_tags.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: Test ManagedResourceTags - all configurations
Description: Test ManagedResourceTags - explicit tags configuration

Parameters:
 Environment:
Expand All@@ -10,7 +10,8 @@ Parameters:
Globals:
 CapacityProvider:
 ManagedResourceTags:
 Propagate: true
 Tags:
 GlobalTag: shared-value

Resources:
 CpInheritsGlobal:
Expand All@@ -22,7 +23,7 @@ Resources:
 SecurityGroupIds:
 - sg-11111111

CpOverridePropagateFalse:
CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
Expand All@@ -31,31 +32,6 @@ Resources:
 SecurityGroupIds:
 - sg-22222222
 ManagedResourceTags:
 Propagate: false

 CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-33333333
 SecurityGroupIds:
 - sg-33333333
 ManagedResourceTags:
 Propagate: false
 Tags:
 Environment: !Ref Environment
 Team: !Sub '${AWS::StackName}-tooling'

 # PRUNE_AND_MERGE: local has only Tags → global Propagate key is dropped
 CpOverrideStrategyDropsGlobalKey:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-44444444
 SecurityGroupIds:
 - sg-44444444
 ManagedResourceTags:
 Tags:
 App: my-service

20 changes: 0 additions & 20 deletions
...s/translator/input/error_capacity_provider_managed_resource_tags_intrinsic_propagate.yaml

View file


Open in desktop


This file was deleted.


20 changes: 0 additions & 20 deletions
tests/translator/input/error_capacity_provider_managed_resource_tags_mutual_exclusion.yaml

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(capacity-provider): add integration test for ManagedResourceTags#3983

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 4 commits into

from

Aug 24, 2026
 Merged


test(capacity-provider): add integration test for ManagedResourceTags
#3983
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
5bb8346

test(capacity-provider): add integration test for ManagedResourceTags


vicheey Aug 21, 2026
7797cde

test: add Globals.CapacityProvider.ManagedResourceTags inheritance an…


vicheey Aug 24, 2026
5e063c7

Fix mypy unused-ignore CI failure for add_multi_constructor


vicheey Aug 24, 2026
cc4c6d3

test: remove redundant CpNoManagedResourceTags fixture


vicheey Aug 24, 2026

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


33 changes: 33 additions & 0 deletions
integration/combination/test_function_with_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,22 @@ def test_function_with_capacity_provider_default_role(self):
 self.verify_capacity_provider_vpc_config(simple_cp_config, "SimpleCapacityProvider")
 self.verify_capacity_provider_permissions_config(simple_cp_config, "SimpleCapacityProvider")

 # Verify Globals.CapacityProvider.ManagedResourceTags inheritance on SimpleCapacityProvider
 simple_propagate_tags = simple_cp_config.get("PropagateTags")
 self.assertIsNotNone(simple_propagate_tags, "SimpleCapacityProvider should inherit PropagateTags from Globals")
 self.assertEqual(
 simple_propagate_tags.get("Mode"),
 "Explicit",
 "SimpleCapacityProvider should have PropagateTags Mode: Explicit from Globals",
 )
 simple_explicit_tags = simple_propagate_tags.get("ExplicitTags", {})
 self.assertIn("GlobalTag", simple_explicit_tags, "SimpleCapacityProvider should inherit GlobalTag from Globals")
 self.assertEqual(
 simple_explicit_tags["GlobalTag"],
 "shared-value",
 "GlobalTag should be 'shared-value' from Globals",
 )

 advanced_cp_config = self.get_lambda_capacity_provider_config("AdvancedCapacityProvider")
 self.verify_capacity_provider_basic_config(advanced_cp_config, "AdvancedCapacityProvider")
 self.verify_capacity_provider_vpc_config(advanced_cp_config, "AdvancedCapacityProvider")
Expand DownExpand Up@@ -180,6 +196,23 @@ def test_function_with_capacity_provider_default_role(self):
 "AdvancedCapacityProvider should use the correct KMS key",
 )

 # Verify ManagedResourceTags -> PropagateTags configuration
 propagate_tags = advanced_cp_config.get("PropagateTags")
 self.assertIsNotNone(propagate_tags, "AdvancedCapacityProvider should have PropagateTags configuration")
 self.assertEqual(
 propagate_tags.get("Mode"), "Explicit", "AdvancedCapacityProvider should have PropagateTags Mode: Explicit"
 )

 explicit_tags = propagate_tags.get("ExplicitTags", {})
Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

 self.assertIn("Environment", explicit_tags, "AdvancedCapacityProvider should propagate Environment tag")
 self.assertIn("Team", explicit_tags, "AdvancedCapacityProvider should propagate Team tag")
 self.assertIn("GlobalTag", explicit_tags, "AdvancedCapacityProvider should override GlobalTag from Globals")
 self.assertEqual(explicit_tags["Environment"], "Production", "Environment tag should be 'Production'")
 self.assertEqual(explicit_tags["Team"], "Lambda-Tooling", "Team tag should be 'Lambda-Tooling'")
 self.assertEqual(
 explicit_tags["GlobalTag"], "overridden-value", "GlobalTag should be overridden by resource-level value"
 )

 telemetry_config = advanced_cp_config.get("TelemetryConfig")
 self.assertIsNotNone(telemetry_config, "AdvancedCapacityProvider should have TelemetryConfig")
 logging_config = telemetry_config.get("LoggingConfig")
Expand Down

11 changes: 11 additions & 0 deletions
integration/resources/templates/combination/function_lmi_default.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,12 @@ Parameters:
 KMSKeyArn:
 Type: String

Globals:
 CapacityProvider:
 ManagedResourceTags:
 Tags:
 GlobalTag: shared-value

Resources:
 SimpleCapacityProvider:
 Type: AWS::Serverless::CapacityProvider
Expand DownExpand Up@@ -45,6 +51,11 @@ Resources:
 KmsKeyArn: !Ref KMSKeyArn
 LoggingConfig:
 SystemLogLevel: DEBUG
 ManagedResourceTags:
Comment thread
vicheey marked this conversation as resolved.

 Tags:
 Environment: Production
 Team: Lambda-Tooling
 GlobalTag: overridden-value
 Tags:
 Environment: Test

Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/aws_serverless_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@

classManagedResourceTags(BaseModel):
Tags: DictStrAny|None=managedresourcetags("Tags")
Propagate: bool|None=managedresourcetags("Propagate")


classVpcConfig(BaseModel):
Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/sam-docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,6 @@
"ExcludedTypes": "A list of EC2 instance types to exclude from the capacity provider. \n*Type*: List \n*Required*: No \n*CloudFormation compatibility*: This property is passed directly to the [`ExcludedInstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-capacityprovider-instancerequirements.html#cfn-lambda-capacityprovider-instancerequirements-excludedinstancetypes) property of [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) of an `AWS::Lambda::CapacityProvider` resource."
 },
"sam-property-capacityprovider-managedresourcetags": {
"Propagate": "TODO",
"Tags": "TODO"
 },
"sam-property-capacityprovider-scalingconfig": {
Expand Down

3 changes: 0 additions & 3 deletions
samtranslator/model/capacity_provider/generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,4 @@ def _transform_managed_resource_tags(self) -> dict[str, Any]:
if"Tags"intags:
return {"Mode": "Explicit", "ExplicitTags": get_tag_list(tags["Tags"])}

if"Propagate"intags:
return {"Mode": "CapacityProvider"iftags["Propagate"] else"None"}

return {}

4 changes: 0 additions & 4 deletions
samtranslator/model/sam_resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1577,10 +1577,6 @@ class SamCapacityProvider(SamResourceMacro):
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["InstanceRequirements.AllowedTypes", "InstanceRequirements.ExcludedTypes"],
 ),
 (
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["ManagedResourceTags.Propagate=True", "ManagedResourceTags.Tags"],
 ),
 ]

 def to_cloudformation(self, **kwargs: Any) -> list[Resource]:
Expand Down

5 changes: 0 additions & 5 deletions
samtranslator/schema/schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374761,11 +374761,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

2 changes: 1 addition & 1 deletion
samtranslator/yaml_helper.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

def yaml_parse(yamlstr): # type: ignore[no-untyped-def]
 """Parse a yaml string"""
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call]
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call,unused-ignore]
 return yaml.safe_load(yamlstr)


Expand Down

5 changes: 0 additions & 5 deletions
schema_source/sam.schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3065,11 +3065,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

9 changes: 5 additions & 4 deletions
tests/model/capacity_provider/test_generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,8 +226,6 @@ def extract_resource(self, resource_array: list[Resource]):

 @parameterized.expand(
 [
 ("propagate_true", {"Propagate": True}, {"Mode": "CapacityProvider"}),
 ("propagate_false", {"Propagate": False}, {"Mode": "None"}),
 (
 "explicit_tags",
 {"Tags": {"Env": "prod", "Team": "tooling"}},
Expand All@@ -251,9 +249,12 @@ def test_to_cloudformation_with_managed_resource_tags(self):
 self.logical_id,
 vpc_config=self.vpc_config,
 operator_role=self.operator_role,
 managed_resource_tags={"Propagate": True},
 managed_resource_tags={"Tags": {"Env": "prod"}},
 )
 resources = generator.to_cloudformation()
 resource_dict = self.extract_resource(resources)
 capacity_provider = resource_dict[self.logical_id]
 self.assertEqual(capacity_provider["Properties"]["PropagateTags"], {"Mode": "CapacityProvider"})
 self.assertEqual(
 capacity_provider["Properties"]["PropagateTags"],
 {"Mode": "Explicit", "ExplicitTags": [{"Key": "Env", "Value": "prod"}]},
 )

32 changes: 4 additions & 28 deletions
tests/translator/input/capacity_provider_managed_resource_tags.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: Test ManagedResourceTags - all configurations
Description: Test ManagedResourceTags - explicit tags configuration

Parameters:
 Environment:
Expand All@@ -10,7 +10,8 @@ Parameters:
Globals:
 CapacityProvider:
 ManagedResourceTags:
 Propagate: true
 Tags:
 GlobalTag: shared-value

Resources:
 CpInheritsGlobal:
Expand All@@ -22,7 +23,7 @@ Resources:
 SecurityGroupIds:
 - sg-11111111

CpOverridePropagateFalse:
CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
Expand All@@ -31,31 +32,6 @@ Resources:
 SecurityGroupIds:
 - sg-22222222
 ManagedResourceTags:
 Propagate: false

 CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-33333333
 SecurityGroupIds:
 - sg-33333333
 ManagedResourceTags:
 Propagate: false
 Tags:
 Environment: !Ref Environment
 Team: !Sub '${AWS::StackName}-tooling'

 # PRUNE_AND_MERGE: local has only Tags → global Propagate key is dropped
 CpOverrideStrategyDropsGlobalKey:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-44444444
 SecurityGroupIds:
 - sg-44444444
 ManagedResourceTags:
 Tags:
 App: my-service

20 changes: 0 additions & 20 deletions
...s/translator/input/error_capacity_provider_managed_resource_tags_intrinsic_propagate.yaml

View file


Open in desktop


This file was deleted.


20 changes: 0 additions & 20 deletions
tests/translator/input/error_capacity_provider_managed_resource_tags_mutual_exclusion.yaml

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
test(capacity-provider): add integration test for ManagedResourceTags#3983

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 4 commits into

from

Aug 24, 2026
 Merged


test(capacity-provider): add integration test for ManagedResourceTags
#3983
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
5bb8346

test(capacity-provider): add integration test for ManagedResourceTags


vicheey Aug 21, 2026
7797cde

test: add Globals.CapacityProvider.ManagedResourceTags inheritance an…


vicheey Aug 24, 2026
5e063c7

Fix mypy unused-ignore CI failure for add_multi_constructor


vicheey Aug 24, 2026
cc4c6d3

test: remove redundant CpNoManagedResourceTags fixture


vicheey Aug 24, 2026

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


33 changes: 33 additions & 0 deletions
integration/combination/test_function_with_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,22 @@ def test_function_with_capacity_provider_default_role(self):
 self.verify_capacity_provider_vpc_config(simple_cp_config, "SimpleCapacityProvider")
 self.verify_capacity_provider_permissions_config(simple_cp_config, "SimpleCapacityProvider")

 # Verify Globals.CapacityProvider.ManagedResourceTags inheritance on SimpleCapacityProvider
 simple_propagate_tags = simple_cp_config.get("PropagateTags")
 self.assertIsNotNone(simple_propagate_tags, "SimpleCapacityProvider should inherit PropagateTags from Globals")
 self.assertEqual(
 simple_propagate_tags.get("Mode"),
 "Explicit",
 "SimpleCapacityProvider should have PropagateTags Mode: Explicit from Globals",
 )
 simple_explicit_tags = simple_propagate_tags.get("ExplicitTags", {})
 self.assertIn("GlobalTag", simple_explicit_tags, "SimpleCapacityProvider should inherit GlobalTag from Globals")
 self.assertEqual(
 simple_explicit_tags["GlobalTag"],
 "shared-value",
 "GlobalTag should be 'shared-value' from Globals",
 )

 advanced_cp_config = self.get_lambda_capacity_provider_config("AdvancedCapacityProvider")
 self.verify_capacity_provider_basic_config(advanced_cp_config, "AdvancedCapacityProvider")
 self.verify_capacity_provider_vpc_config(advanced_cp_config, "AdvancedCapacityProvider")
Expand DownExpand Up@@ -180,6 +196,23 @@ def test_function_with_capacity_provider_default_role(self):
 "AdvancedCapacityProvider should use the correct KMS key",
 )

 # Verify ManagedResourceTags -> PropagateTags configuration
 propagate_tags = advanced_cp_config.get("PropagateTags")
 self.assertIsNotNone(propagate_tags, "AdvancedCapacityProvider should have PropagateTags configuration")
 self.assertEqual(
 propagate_tags.get("Mode"), "Explicit", "AdvancedCapacityProvider should have PropagateTags Mode: Explicit"
 )

 explicit_tags = propagate_tags.get("ExplicitTags", {})
Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

 self.assertIn("Environment", explicit_tags, "AdvancedCapacityProvider should propagate Environment tag")
 self.assertIn("Team", explicit_tags, "AdvancedCapacityProvider should propagate Team tag")
 self.assertIn("GlobalTag", explicit_tags, "AdvancedCapacityProvider should override GlobalTag from Globals")
 self.assertEqual(explicit_tags["Environment"], "Production", "Environment tag should be 'Production'")
 self.assertEqual(explicit_tags["Team"], "Lambda-Tooling", "Team tag should be 'Lambda-Tooling'")
 self.assertEqual(
 explicit_tags["GlobalTag"], "overridden-value", "GlobalTag should be overridden by resource-level value"
 )

 telemetry_config = advanced_cp_config.get("TelemetryConfig")
 self.assertIsNotNone(telemetry_config, "AdvancedCapacityProvider should have TelemetryConfig")
 logging_config = telemetry_config.get("LoggingConfig")
Expand Down

11 changes: 11 additions & 0 deletions
integration/resources/templates/combination/function_lmi_default.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,12 @@ Parameters:
 KMSKeyArn:
 Type: String

Globals:
 CapacityProvider:
 ManagedResourceTags:
 Tags:
 GlobalTag: shared-value

Resources:
 SimpleCapacityProvider:
 Type: AWS::Serverless::CapacityProvider
Expand DownExpand Up@@ -45,6 +51,11 @@ Resources:
 KmsKeyArn: !Ref KMSKeyArn
 LoggingConfig:
 SystemLogLevel: DEBUG
 ManagedResourceTags:
Comment thread
vicheey marked this conversation as resolved.

 Tags:
 Environment: Production
 Team: Lambda-Tooling
 GlobalTag: overridden-value
 Tags:
 Environment: Test

Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/aws_serverless_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@

classManagedResourceTags(BaseModel):
Tags: DictStrAny|None=managedresourcetags("Tags")
Propagate: bool|None=managedresourcetags("Propagate")


classVpcConfig(BaseModel):
Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/sam-docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,6 @@
"ExcludedTypes": "A list of EC2 instance types to exclude from the capacity provider. \n*Type*: List \n*Required*: No \n*CloudFormation compatibility*: This property is passed directly to the [`ExcludedInstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-capacityprovider-instancerequirements.html#cfn-lambda-capacityprovider-instancerequirements-excludedinstancetypes) property of [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) of an `AWS::Lambda::CapacityProvider` resource."
 },
"sam-property-capacityprovider-managedresourcetags": {
"Propagate": "TODO",
"Tags": "TODO"
 },
"sam-property-capacityprovider-scalingconfig": {
Expand Down

3 changes: 0 additions & 3 deletions
samtranslator/model/capacity_provider/generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,4 @@ def _transform_managed_resource_tags(self) -> dict[str, Any]:
if"Tags"intags:
return {"Mode": "Explicit", "ExplicitTags": get_tag_list(tags["Tags"])}

if"Propagate"intags:
return {"Mode": "CapacityProvider"iftags["Propagate"] else"None"}

return {}

4 changes: 0 additions & 4 deletions
samtranslator/model/sam_resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1577,10 +1577,6 @@ class SamCapacityProvider(SamResourceMacro):
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["InstanceRequirements.AllowedTypes", "InstanceRequirements.ExcludedTypes"],
 ),
 (
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["ManagedResourceTags.Propagate=True", "ManagedResourceTags.Tags"],
 ),
 ]

 def to_cloudformation(self, **kwargs: Any) -> list[Resource]:
Expand Down

5 changes: 0 additions & 5 deletions
samtranslator/schema/schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374761,11 +374761,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

2 changes: 1 addition & 1 deletion
samtranslator/yaml_helper.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

def yaml_parse(yamlstr): # type: ignore[no-untyped-def]
 """Parse a yaml string"""
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call]
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call,unused-ignore]
 return yaml.safe_load(yamlstr)


Expand Down

5 changes: 0 additions & 5 deletions
schema_source/sam.schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3065,11 +3065,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

9 changes: 5 additions & 4 deletions
tests/model/capacity_provider/test_generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,8 +226,6 @@ def extract_resource(self, resource_array: list[Resource]):

 @parameterized.expand(
 [
 ("propagate_true", {"Propagate": True}, {"Mode": "CapacityProvider"}),
 ("propagate_false", {"Propagate": False}, {"Mode": "None"}),
 (
 "explicit_tags",
 {"Tags": {"Env": "prod", "Team": "tooling"}},
Expand All@@ -251,9 +249,12 @@ def test_to_cloudformation_with_managed_resource_tags(self):
 self.logical_id,
 vpc_config=self.vpc_config,
 operator_role=self.operator_role,
 managed_resource_tags={"Propagate": True},
 managed_resource_tags={"Tags": {"Env": "prod"}},
 )
 resources = generator.to_cloudformation()
 resource_dict = self.extract_resource(resources)
 capacity_provider = resource_dict[self.logical_id]
 self.assertEqual(capacity_provider["Properties"]["PropagateTags"], {"Mode": "CapacityProvider"})
 self.assertEqual(
 capacity_provider["Properties"]["PropagateTags"],
 {"Mode": "Explicit", "ExplicitTags": [{"Key": "Env", "Value": "prod"}]},
 )

32 changes: 4 additions & 28 deletions
tests/translator/input/capacity_provider_managed_resource_tags.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: Test ManagedResourceTags - all configurations
Description: Test ManagedResourceTags - explicit tags configuration

Parameters:
 Environment:
Expand All@@ -10,7 +10,8 @@ Parameters:
Globals:
 CapacityProvider:
 ManagedResourceTags:
 Propagate: true
 Tags:
 GlobalTag: shared-value

Resources:
 CpInheritsGlobal:
Expand All@@ -22,7 +23,7 @@ Resources:
 SecurityGroupIds:
 - sg-11111111

CpOverridePropagateFalse:
CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
Expand All@@ -31,31 +32,6 @@ Resources:
 SecurityGroupIds:
 - sg-22222222
 ManagedResourceTags:
 Propagate: false

 CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-33333333
 SecurityGroupIds:
 - sg-33333333
 ManagedResourceTags:
 Propagate: false
 Tags:
 Environment: !Ref Environment
 Team: !Sub '${AWS::StackName}-tooling'

 # PRUNE_AND_MERGE: local has only Tags → global Propagate key is dropped
 CpOverrideStrategyDropsGlobalKey:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-44444444
 SecurityGroupIds:
 - sg-44444444
 ManagedResourceTags:
 Tags:
 App: my-service

20 changes: 0 additions & 20 deletions
...s/translator/input/error_capacity_provider_managed_resource_tags_intrinsic_propagate.yaml

View file


Open in desktop


This file was deleted.


20 changes: 0 additions & 20 deletions
tests/translator/input/error_capacity_provider_managed_resource_tags_mutual_exclusion.yaml

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(capacity-provider): add integration test for ManagedResourceTags#3983

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 4 commits into

from

Aug 24, 2026
 Merged


test(capacity-provider): add integration test for ManagedResourceTags
#3983
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
5bb8346

test(capacity-provider): add integration test for ManagedResourceTags


vicheey Aug 21, 2026
7797cde

test: add Globals.CapacityProvider.ManagedResourceTags inheritance an…


vicheey Aug 24, 2026
5e063c7

Fix mypy unused-ignore CI failure for add_multi_constructor


vicheey Aug 24, 2026
cc4c6d3

test: remove redundant CpNoManagedResourceTags fixture


vicheey Aug 24, 2026

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


33 changes: 33 additions & 0 deletions
integration/combination/test_function_with_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,22 @@ def test_function_with_capacity_provider_default_role(self):
 self.verify_capacity_provider_vpc_config(simple_cp_config, "SimpleCapacityProvider")
 self.verify_capacity_provider_permissions_config(simple_cp_config, "SimpleCapacityProvider")

 # Verify Globals.CapacityProvider.ManagedResourceTags inheritance on SimpleCapacityProvider
 simple_propagate_tags = simple_cp_config.get("PropagateTags")
 self.assertIsNotNone(simple_propagate_tags, "SimpleCapacityProvider should inherit PropagateTags from Globals")
 self.assertEqual(
 simple_propagate_tags.get("Mode"),
 "Explicit",
 "SimpleCapacityProvider should have PropagateTags Mode: Explicit from Globals",
 )
 simple_explicit_tags = simple_propagate_tags.get("ExplicitTags", {})
 self.assertIn("GlobalTag", simple_explicit_tags, "SimpleCapacityProvider should inherit GlobalTag from Globals")
 self.assertEqual(
 simple_explicit_tags["GlobalTag"],
 "shared-value",
 "GlobalTag should be 'shared-value' from Globals",
 )

 advanced_cp_config = self.get_lambda_capacity_provider_config("AdvancedCapacityProvider")
 self.verify_capacity_provider_basic_config(advanced_cp_config, "AdvancedCapacityProvider")
 self.verify_capacity_provider_vpc_config(advanced_cp_config, "AdvancedCapacityProvider")
Expand DownExpand Up@@ -180,6 +196,23 @@ def test_function_with_capacity_provider_default_role(self):
 "AdvancedCapacityProvider should use the correct KMS key",
 )

 # Verify ManagedResourceTags -> PropagateTags configuration
 propagate_tags = advanced_cp_config.get("PropagateTags")
 self.assertIsNotNone(propagate_tags, "AdvancedCapacityProvider should have PropagateTags configuration")
 self.assertEqual(
 propagate_tags.get("Mode"), "Explicit", "AdvancedCapacityProvider should have PropagateTags Mode: Explicit"
 )

 explicit_tags = propagate_tags.get("ExplicitTags", {})
Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

 self.assertIn("Environment", explicit_tags, "AdvancedCapacityProvider should propagate Environment tag")
 self.assertIn("Team", explicit_tags, "AdvancedCapacityProvider should propagate Team tag")
 self.assertIn("GlobalTag", explicit_tags, "AdvancedCapacityProvider should override GlobalTag from Globals")
 self.assertEqual(explicit_tags["Environment"], "Production", "Environment tag should be 'Production'")
 self.assertEqual(explicit_tags["Team"], "Lambda-Tooling", "Team tag should be 'Lambda-Tooling'")
 self.assertEqual(
 explicit_tags["GlobalTag"], "overridden-value", "GlobalTag should be overridden by resource-level value"
 )

 telemetry_config = advanced_cp_config.get("TelemetryConfig")
 self.assertIsNotNone(telemetry_config, "AdvancedCapacityProvider should have TelemetryConfig")
 logging_config = telemetry_config.get("LoggingConfig")
Expand Down

11 changes: 11 additions & 0 deletions
integration/resources/templates/combination/function_lmi_default.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,12 @@ Parameters:
 KMSKeyArn:
 Type: String

Globals:
 CapacityProvider:
 ManagedResourceTags:
 Tags:
 GlobalTag: shared-value

Resources:
 SimpleCapacityProvider:
 Type: AWS::Serverless::CapacityProvider
Expand DownExpand Up@@ -45,6 +51,11 @@ Resources:
 KmsKeyArn: !Ref KMSKeyArn
 LoggingConfig:
 SystemLogLevel: DEBUG
 ManagedResourceTags:
Comment thread
vicheey marked this conversation as resolved.

 Tags:
 Environment: Production
 Team: Lambda-Tooling
 GlobalTag: overridden-value
 Tags:
 Environment: Test

Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/aws_serverless_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@

classManagedResourceTags(BaseModel):
Tags: DictStrAny|None=managedresourcetags("Tags")
Propagate: bool|None=managedresourcetags("Propagate")


classVpcConfig(BaseModel):
Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/sam-docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,6 @@
"ExcludedTypes": "A list of EC2 instance types to exclude from the capacity provider. \n*Type*: List \n*Required*: No \n*CloudFormation compatibility*: This property is passed directly to the [`ExcludedInstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-capacityprovider-instancerequirements.html#cfn-lambda-capacityprovider-instancerequirements-excludedinstancetypes) property of [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) of an `AWS::Lambda::CapacityProvider` resource."
 },
"sam-property-capacityprovider-managedresourcetags": {
"Propagate": "TODO",
"Tags": "TODO"
 },
"sam-property-capacityprovider-scalingconfig": {
Expand Down

3 changes: 0 additions & 3 deletions
samtranslator/model/capacity_provider/generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,4 @@ def _transform_managed_resource_tags(self) -> dict[str, Any]:
if"Tags"intags:
return {"Mode": "Explicit", "ExplicitTags": get_tag_list(tags["Tags"])}

if"Propagate"intags:
return {"Mode": "CapacityProvider"iftags["Propagate"] else"None"}

return {}

4 changes: 0 additions & 4 deletions
samtranslator/model/sam_resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1577,10 +1577,6 @@ class SamCapacityProvider(SamResourceMacro):
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["InstanceRequirements.AllowedTypes", "InstanceRequirements.ExcludedTypes"],
 ),
 (
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["ManagedResourceTags.Propagate=True", "ManagedResourceTags.Tags"],
 ),
 ]

 def to_cloudformation(self, **kwargs: Any) -> list[Resource]:
Expand Down

5 changes: 0 additions & 5 deletions
samtranslator/schema/schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374761,11 +374761,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

2 changes: 1 addition & 1 deletion
samtranslator/yaml_helper.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

def yaml_parse(yamlstr): # type: ignore[no-untyped-def]
 """Parse a yaml string"""
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call]
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call,unused-ignore]
 return yaml.safe_load(yamlstr)


Expand Down

5 changes: 0 additions & 5 deletions
schema_source/sam.schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3065,11 +3065,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

9 changes: 5 additions & 4 deletions
tests/model/capacity_provider/test_generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,8 +226,6 @@ def extract_resource(self, resource_array: list[Resource]):

 @parameterized.expand(
 [
 ("propagate_true", {"Propagate": True}, {"Mode": "CapacityProvider"}),
 ("propagate_false", {"Propagate": False}, {"Mode": "None"}),
 (
 "explicit_tags",
 {"Tags": {"Env": "prod", "Team": "tooling"}},
Expand All@@ -251,9 +249,12 @@ def test_to_cloudformation_with_managed_resource_tags(self):
 self.logical_id,
 vpc_config=self.vpc_config,
 operator_role=self.operator_role,
 managed_resource_tags={"Propagate": True},
 managed_resource_tags={"Tags": {"Env": "prod"}},
 )
 resources = generator.to_cloudformation()
 resource_dict = self.extract_resource(resources)
 capacity_provider = resource_dict[self.logical_id]
 self.assertEqual(capacity_provider["Properties"]["PropagateTags"], {"Mode": "CapacityProvider"})
 self.assertEqual(
 capacity_provider["Properties"]["PropagateTags"],
 {"Mode": "Explicit", "ExplicitTags": [{"Key": "Env", "Value": "prod"}]},
 )

32 changes: 4 additions & 28 deletions
tests/translator/input/capacity_provider_managed_resource_tags.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: Test ManagedResourceTags - all configurations
Description: Test ManagedResourceTags - explicit tags configuration

Parameters:
 Environment:
Expand All@@ -10,7 +10,8 @@ Parameters:
Globals:
 CapacityProvider:
 ManagedResourceTags:
 Propagate: true
 Tags:
 GlobalTag: shared-value

Resources:
 CpInheritsGlobal:
Expand All@@ -22,7 +23,7 @@ Resources:
 SecurityGroupIds:
 - sg-11111111

CpOverridePropagateFalse:
CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
Expand All@@ -31,31 +32,6 @@ Resources:
 SecurityGroupIds:
 - sg-22222222
 ManagedResourceTags:
 Propagate: false

 CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-33333333
 SecurityGroupIds:
 - sg-33333333
 ManagedResourceTags:
 Propagate: false
 Tags:
 Environment: !Ref Environment
 Team: !Sub '${AWS::StackName}-tooling'

 # PRUNE_AND_MERGE: local has only Tags → global Propagate key is dropped
 CpOverrideStrategyDropsGlobalKey:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-44444444
 SecurityGroupIds:
 - sg-44444444
 ManagedResourceTags:
 Tags:
 App: my-service

20 changes: 0 additions & 20 deletions
...s/translator/input/error_capacity_provider_managed_resource_tags_intrinsic_propagate.yaml

View file


Open in desktop


This file was deleted.


20 changes: 0 additions & 20 deletions
tests/translator/input/error_capacity_provider_managed_resource_tags_mutual_exclusion.yaml

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(capacity-provider): add integration test for ManagedResourceTags#3983

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 4 commits into

from

Aug 24, 2026
 Merged


test(capacity-provider): add integration test for ManagedResourceTags
#3983
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
5bb8346

test(capacity-provider): add integration test for ManagedResourceTags


vicheey Aug 21, 2026
7797cde

test: add Globals.CapacityProvider.ManagedResourceTags inheritance an…


vicheey Aug 24, 2026
5e063c7

Fix mypy unused-ignore CI failure for add_multi_constructor


vicheey Aug 24, 2026
cc4c6d3

test: remove redundant CpNoManagedResourceTags fixture


vicheey Aug 24, 2026

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


33 changes: 33 additions & 0 deletions
integration/combination/test_function_with_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,22 @@ def test_function_with_capacity_provider_default_role(self):
 self.verify_capacity_provider_vpc_config(simple_cp_config, "SimpleCapacityProvider")
 self.verify_capacity_provider_permissions_config(simple_cp_config, "SimpleCapacityProvider")

 # Verify Globals.CapacityProvider.ManagedResourceTags inheritance on SimpleCapacityProvider
 simple_propagate_tags = simple_cp_config.get("PropagateTags")
 self.assertIsNotNone(simple_propagate_tags, "SimpleCapacityProvider should inherit PropagateTags from Globals")
 self.assertEqual(
 simple_propagate_tags.get("Mode"),
 "Explicit",
 "SimpleCapacityProvider should have PropagateTags Mode: Explicit from Globals",
 )
 simple_explicit_tags = simple_propagate_tags.get("ExplicitTags", {})
 self.assertIn("GlobalTag", simple_explicit_tags, "SimpleCapacityProvider should inherit GlobalTag from Globals")
 self.assertEqual(
 simple_explicit_tags["GlobalTag"],
 "shared-value",
 "GlobalTag should be 'shared-value' from Globals",
 )

 advanced_cp_config = self.get_lambda_capacity_provider_config("AdvancedCapacityProvider")
 self.verify_capacity_provider_basic_config(advanced_cp_config, "AdvancedCapacityProvider")
 self.verify_capacity_provider_vpc_config(advanced_cp_config, "AdvancedCapacityProvider")
Expand DownExpand Up@@ -180,6 +196,23 @@ def test_function_with_capacity_provider_default_role(self):
 "AdvancedCapacityProvider should use the correct KMS key",
 )

 # Verify ManagedResourceTags -> PropagateTags configuration
 propagate_tags = advanced_cp_config.get("PropagateTags")
 self.assertIsNotNone(propagate_tags, "AdvancedCapacityProvider should have PropagateTags configuration")
 self.assertEqual(
 propagate_tags.get("Mode"), "Explicit", "AdvancedCapacityProvider should have PropagateTags Mode: Explicit"
 )

 explicit_tags = propagate_tags.get("ExplicitTags", {})
Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

 self.assertIn("Environment", explicit_tags, "AdvancedCapacityProvider should propagate Environment tag")
 self.assertIn("Team", explicit_tags, "AdvancedCapacityProvider should propagate Team tag")
 self.assertIn("GlobalTag", explicit_tags, "AdvancedCapacityProvider should override GlobalTag from Globals")
 self.assertEqual(explicit_tags["Environment"], "Production", "Environment tag should be 'Production'")
 self.assertEqual(explicit_tags["Team"], "Lambda-Tooling", "Team tag should be 'Lambda-Tooling'")
 self.assertEqual(
 explicit_tags["GlobalTag"], "overridden-value", "GlobalTag should be overridden by resource-level value"
 )

 telemetry_config = advanced_cp_config.get("TelemetryConfig")
 self.assertIsNotNone(telemetry_config, "AdvancedCapacityProvider should have TelemetryConfig")
 logging_config = telemetry_config.get("LoggingConfig")
Expand Down

11 changes: 11 additions & 0 deletions
integration/resources/templates/combination/function_lmi_default.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,12 @@ Parameters:
 KMSKeyArn:
 Type: String

Globals:
 CapacityProvider:
 ManagedResourceTags:
 Tags:
 GlobalTag: shared-value

Resources:
 SimpleCapacityProvider:
 Type: AWS::Serverless::CapacityProvider
Expand DownExpand Up@@ -45,6 +51,11 @@ Resources:
 KmsKeyArn: !Ref KMSKeyArn
 LoggingConfig:
 SystemLogLevel: DEBUG
 ManagedResourceTags:
Comment thread
vicheey marked this conversation as resolved.

 Tags:
 Environment: Production
 Team: Lambda-Tooling
 GlobalTag: overridden-value
 Tags:
 Environment: Test

Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/aws_serverless_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@

classManagedResourceTags(BaseModel):
Tags: DictStrAny|None=managedresourcetags("Tags")
Propagate: bool|None=managedresourcetags("Propagate")


classVpcConfig(BaseModel):
Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/sam-docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,6 @@
"ExcludedTypes": "A list of EC2 instance types to exclude from the capacity provider. \n*Type*: List \n*Required*: No \n*CloudFormation compatibility*: This property is passed directly to the [`ExcludedInstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-capacityprovider-instancerequirements.html#cfn-lambda-capacityprovider-instancerequirements-excludedinstancetypes) property of [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) of an `AWS::Lambda::CapacityProvider` resource."
 },
"sam-property-capacityprovider-managedresourcetags": {
"Propagate": "TODO",
"Tags": "TODO"
 },
"sam-property-capacityprovider-scalingconfig": {
Expand Down

3 changes: 0 additions & 3 deletions
samtranslator/model/capacity_provider/generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,4 @@ def _transform_managed_resource_tags(self) -> dict[str, Any]:
if"Tags"intags:
return {"Mode": "Explicit", "ExplicitTags": get_tag_list(tags["Tags"])}

if"Propagate"intags:
return {"Mode": "CapacityProvider"iftags["Propagate"] else"None"}

return {}

4 changes: 0 additions & 4 deletions
samtranslator/model/sam_resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1577,10 +1577,6 @@ class SamCapacityProvider(SamResourceMacro):
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["InstanceRequirements.AllowedTypes", "InstanceRequirements.ExcludedTypes"],
 ),
 (
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["ManagedResourceTags.Propagate=True", "ManagedResourceTags.Tags"],
 ),
 ]

 def to_cloudformation(self, **kwargs: Any) -> list[Resource]:
Expand Down

5 changes: 0 additions & 5 deletions
samtranslator/schema/schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374761,11 +374761,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

2 changes: 1 addition & 1 deletion
samtranslator/yaml_helper.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

def yaml_parse(yamlstr): # type: ignore[no-untyped-def]
 """Parse a yaml string"""
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call]
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call,unused-ignore]
 return yaml.safe_load(yamlstr)


Expand Down

5 changes: 0 additions & 5 deletions
schema_source/sam.schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3065,11 +3065,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

9 changes: 5 additions & 4 deletions
tests/model/capacity_provider/test_generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,8 +226,6 @@ def extract_resource(self, resource_array: list[Resource]):

 @parameterized.expand(
 [
 ("propagate_true", {"Propagate": True}, {"Mode": "CapacityProvider"}),
 ("propagate_false", {"Propagate": False}, {"Mode": "None"}),
 (
 "explicit_tags",
 {"Tags": {"Env": "prod", "Team": "tooling"}},
Expand All@@ -251,9 +249,12 @@ def test_to_cloudformation_with_managed_resource_tags(self):
 self.logical_id,
 vpc_config=self.vpc_config,
 operator_role=self.operator_role,
 managed_resource_tags={"Propagate": True},
 managed_resource_tags={"Tags": {"Env": "prod"}},
 )
 resources = generator.to_cloudformation()
 resource_dict = self.extract_resource(resources)
 capacity_provider = resource_dict[self.logical_id]
 self.assertEqual(capacity_provider["Properties"]["PropagateTags"], {"Mode": "CapacityProvider"})
 self.assertEqual(
 capacity_provider["Properties"]["PropagateTags"],
 {"Mode": "Explicit", "ExplicitTags": [{"Key": "Env", "Value": "prod"}]},
 )

32 changes: 4 additions & 28 deletions
tests/translator/input/capacity_provider_managed_resource_tags.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: Test ManagedResourceTags - all configurations
Description: Test ManagedResourceTags - explicit tags configuration

Parameters:
 Environment:
Expand All@@ -10,7 +10,8 @@ Parameters:
Globals:
 CapacityProvider:
 ManagedResourceTags:
 Propagate: true
 Tags:
 GlobalTag: shared-value

Resources:
 CpInheritsGlobal:
Expand All@@ -22,7 +23,7 @@ Resources:
 SecurityGroupIds:
 - sg-11111111

CpOverridePropagateFalse:
CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
Expand All@@ -31,31 +32,6 @@ Resources:
 SecurityGroupIds:
 - sg-22222222
 ManagedResourceTags:
 Propagate: false

 CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-33333333
 SecurityGroupIds:
 - sg-33333333
 ManagedResourceTags:
 Propagate: false
 Tags:
 Environment: !Ref Environment
 Team: !Sub '${AWS::StackName}-tooling'

 # PRUNE_AND_MERGE: local has only Tags → global Propagate key is dropped
 CpOverrideStrategyDropsGlobalKey:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-44444444
 SecurityGroupIds:
 - sg-44444444
 ManagedResourceTags:
 Tags:
 App: my-service

20 changes: 0 additions & 20 deletions
...s/translator/input/error_capacity_provider_managed_resource_tags_intrinsic_propagate.yaml

View file


Open in desktop


This file was deleted.


20 changes: 0 additions & 20 deletions
tests/translator/input/error_capacity_provider_managed_resource_tags_mutual_exclusion.yaml

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
test(capacity-provider): add integration test for ManagedResourceTags#3983

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 4 commits into

from

Aug 24, 2026
 Merged


test(capacity-provider): add integration test for ManagedResourceTags
#3983
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
5bb8346

test(capacity-provider): add integration test for ManagedResourceTags


vicheey Aug 21, 2026
7797cde

test: add Globals.CapacityProvider.ManagedResourceTags inheritance an…


vicheey Aug 24, 2026
5e063c7

Fix mypy unused-ignore CI failure for add_multi_constructor


vicheey Aug 24, 2026
cc4c6d3

test: remove redundant CpNoManagedResourceTags fixture


vicheey Aug 24, 2026

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


33 changes: 33 additions & 0 deletions
integration/combination/test_function_with_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,22 @@ def test_function_with_capacity_provider_default_role(self):
 self.verify_capacity_provider_vpc_config(simple_cp_config, "SimpleCapacityProvider")
 self.verify_capacity_provider_permissions_config(simple_cp_config, "SimpleCapacityProvider")

 # Verify Globals.CapacityProvider.ManagedResourceTags inheritance on SimpleCapacityProvider
 simple_propagate_tags = simple_cp_config.get("PropagateTags")
 self.assertIsNotNone(simple_propagate_tags, "SimpleCapacityProvider should inherit PropagateTags from Globals")
 self.assertEqual(
 simple_propagate_tags.get("Mode"),
 "Explicit",
 "SimpleCapacityProvider should have PropagateTags Mode: Explicit from Globals",
 )
 simple_explicit_tags = simple_propagate_tags.get("ExplicitTags", {})
 self.assertIn("GlobalTag", simple_explicit_tags, "SimpleCapacityProvider should inherit GlobalTag from Globals")
 self.assertEqual(
 simple_explicit_tags["GlobalTag"],
 "shared-value",
 "GlobalTag should be 'shared-value' from Globals",
 )

 advanced_cp_config = self.get_lambda_capacity_provider_config("AdvancedCapacityProvider")
 self.verify_capacity_provider_basic_config(advanced_cp_config, "AdvancedCapacityProvider")
 self.verify_capacity_provider_vpc_config(advanced_cp_config, "AdvancedCapacityProvider")
Expand DownExpand Up@@ -180,6 +196,23 @@ def test_function_with_capacity_provider_default_role(self):
 "AdvancedCapacityProvider should use the correct KMS key",
 )

 # Verify ManagedResourceTags -> PropagateTags configuration
 propagate_tags = advanced_cp_config.get("PropagateTags")
 self.assertIsNotNone(propagate_tags, "AdvancedCapacityProvider should have PropagateTags configuration")
 self.assertEqual(
 propagate_tags.get("Mode"), "Explicit", "AdvancedCapacityProvider should have PropagateTags Mode: Explicit"
 )

 explicit_tags = propagate_tags.get("ExplicitTags", {})
Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

Comment thread
vicheey marked this conversation as resolved.

 self.assertIn("Environment", explicit_tags, "AdvancedCapacityProvider should propagate Environment tag")
 self.assertIn("Team", explicit_tags, "AdvancedCapacityProvider should propagate Team tag")
 self.assertIn("GlobalTag", explicit_tags, "AdvancedCapacityProvider should override GlobalTag from Globals")
 self.assertEqual(explicit_tags["Environment"], "Production", "Environment tag should be 'Production'")
 self.assertEqual(explicit_tags["Team"], "Lambda-Tooling", "Team tag should be 'Lambda-Tooling'")
 self.assertEqual(
 explicit_tags["GlobalTag"], "overridden-value", "GlobalTag should be overridden by resource-level value"
 )

 telemetry_config = advanced_cp_config.get("TelemetryConfig")
 self.assertIsNotNone(telemetry_config, "AdvancedCapacityProvider should have TelemetryConfig")
 logging_config = telemetry_config.get("LoggingConfig")
Expand Down

11 changes: 11 additions & 0 deletions
integration/resources/templates/combination/function_lmi_default.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,12 @@ Parameters:
 KMSKeyArn:
 Type: String

Globals:
 CapacityProvider:
 ManagedResourceTags:
 Tags:
 GlobalTag: shared-value

Resources:
 SimpleCapacityProvider:
 Type: AWS::Serverless::CapacityProvider
Expand DownExpand Up@@ -45,6 +51,11 @@ Resources:
 KmsKeyArn: !Ref KMSKeyArn
 LoggingConfig:
 SystemLogLevel: DEBUG
 ManagedResourceTags:
Comment thread
vicheey marked this conversation as resolved.

 Tags:
 Environment: Production
 Team: Lambda-Tooling
 GlobalTag: overridden-value
 Tags:
 Environment: Test

Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/aws_serverless_capacity_provider.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@

classManagedResourceTags(BaseModel):
Tags: DictStrAny|None=managedresourcetags("Tags")
Propagate: bool|None=managedresourcetags("Propagate")


classVpcConfig(BaseModel):
Expand Down

1 change: 0 additions & 1 deletion
samtranslator/internal/schema_source/sam-docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,6 @@
"ExcludedTypes": "A list of EC2 instance types to exclude from the capacity provider. \n*Type*: List \n*Required*: No \n*CloudFormation compatibility*: This property is passed directly to the [`ExcludedInstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-capacityprovider-instancerequirements.html#cfn-lambda-capacityprovider-instancerequirements-excludedinstancetypes) property of [`InstanceRequirements`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-capacityprovider.html#cfn-lambda-capacityprovider-instancerequirements) of an `AWS::Lambda::CapacityProvider` resource."
 },
"sam-property-capacityprovider-managedresourcetags": {
"Propagate": "TODO",
"Tags": "TODO"
 },
"sam-property-capacityprovider-scalingconfig": {
Expand Down

3 changes: 0 additions & 3 deletions
samtranslator/model/capacity_provider/generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,4 @@ def _transform_managed_resource_tags(self) -> dict[str, Any]:
if"Tags"intags:
return {"Mode": "Explicit", "ExplicitTags": get_tag_list(tags["Tags"])}

if"Propagate"intags:
return {"Mode": "CapacityProvider"iftags["Propagate"] else"None"}

return {}

4 changes: 0 additions & 4 deletions
samtranslator/model/sam_resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1577,10 +1577,6 @@ class SamCapacityProvider(SamResourceMacro):
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["InstanceRequirements.AllowedTypes", "InstanceRequirements.ExcludedTypes"],
 ),
 (
 ValidationRule.MUTUALLY_EXCLUSIVE,
 ["ManagedResourceTags.Propagate=True", "ManagedResourceTags.Tags"],
 ),
 ]

 def to_cloudformation(self, **kwargs: Any) -> list[Resource]:
Expand Down

5 changes: 0 additions & 5 deletions
samtranslator/schema/schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -374761,11 +374761,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

2 changes: 1 addition & 1 deletion
samtranslator/yaml_helper.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@

def yaml_parse(yamlstr): # type: ignore[no-untyped-def]
 """Parse a yaml string"""
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call]
 yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor) # type: ignore[no-untyped-call,unused-ignore]
 return yaml.safe_load(yamlstr)


Expand Down

5 changes: 0 additions & 5 deletions
schema_source/sam.schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3065,11 +3065,6 @@
 "ManagedResourceTags": {
 "additionalProperties": false,
 "properties": {
 "Propagate": {
 "markdownDescription": "TODO",
 "title": "Propagate",
 "type": "boolean"
 },
 "Tags": {
 "markdownDescription": "TODO",
 "title": "Tags",
Expand Down

9 changes: 5 additions & 4 deletions
tests/model/capacity_provider/test_generators.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,8 +226,6 @@ def extract_resource(self, resource_array: list[Resource]):

 @parameterized.expand(
 [
 ("propagate_true", {"Propagate": True}, {"Mode": "CapacityProvider"}),
 ("propagate_false", {"Propagate": False}, {"Mode": "None"}),
 (
 "explicit_tags",
 {"Tags": {"Env": "prod", "Team": "tooling"}},
Expand All@@ -251,9 +249,12 @@ def test_to_cloudformation_with_managed_resource_tags(self):
 self.logical_id,
 vpc_config=self.vpc_config,
 operator_role=self.operator_role,
 managed_resource_tags={"Propagate": True},
 managed_resource_tags={"Tags": {"Env": "prod"}},
 )
 resources = generator.to_cloudformation()
 resource_dict = self.extract_resource(resources)
 capacity_provider = resource_dict[self.logical_id]
 self.assertEqual(capacity_provider["Properties"]["PropagateTags"], {"Mode": "CapacityProvider"})
 self.assertEqual(
 capacity_provider["Properties"]["PropagateTags"],
 {"Mode": "Explicit", "ExplicitTags": [{"Key": "Env", "Value": "prod"}]},
 )

32 changes: 4 additions & 28 deletions
tests/translator/input/capacity_provider_managed_resource_tags.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: Test ManagedResourceTags - all configurations
Description: Test ManagedResourceTags - explicit tags configuration

Parameters:
 Environment:
Expand All@@ -10,7 +10,8 @@ Parameters:
Globals:
 CapacityProvider:
 ManagedResourceTags:
 Propagate: true
 Tags:
 GlobalTag: shared-value

Resources:
 CpInheritsGlobal:
Expand All@@ -22,7 +23,7 @@ Resources:
 SecurityGroupIds:
 - sg-11111111

CpOverridePropagateFalse:
CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
Expand All@@ -31,31 +32,6 @@ Resources:
 SecurityGroupIds:
 - sg-22222222
 ManagedResourceTags:
 Propagate: false

 CpOverrideWithExplicitTags:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-33333333
 SecurityGroupIds:
 - sg-33333333
 ManagedResourceTags:
 Propagate: false
 Tags:
 Environment: !Ref Environment
 Team: !Sub '${AWS::StackName}-tooling'

 # PRUNE_AND_MERGE: local has only Tags → global Propagate key is dropped
 CpOverrideStrategyDropsGlobalKey:
 Type: AWS::Serverless::CapacityProvider
 Properties:
 VpcConfig:
 SubnetIds:
 - subnet-44444444
 SecurityGroupIds:
 - sg-44444444
 ManagedResourceTags:
 Tags:
 App: my-service

20 changes: 0 additions & 20 deletions
...s/translator/input/error_capacity_provider_managed_resource_tags_intrinsic_propagate.yaml

View file


Open in desktop


This file was deleted.


20 changes: 0 additions & 20 deletions
tests/translator/input/error_capacity_provider_managed_resource_tags_mutual_exclusion.yaml

View file


Open in desktop


This file was deleted.

Loading