Skip to content

Commit 26b2c64

Browse files
committed
remove dupe
1 parent cf38fc7 commit 26b2c64

2 files changed

Lines changed: 1 addition & 14 deletions

File tree

samtranslator/model/codedeploy.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ class CodeDeployApplication(Resource):
77
property_types = {
88
"ComputePlatform": GeneratedProperty(),
99
"Tags": GeneratedProperty(),
10-
"PropagateTags": GeneratedProperty(),
1110
}
1211

1312
runtime_attrs = {"name": lambda self: ref(self.logical_id)}
@@ -24,7 +23,6 @@ class CodeDeployDeploymentGroup(Resource):
2423
"ServiceRoleArn": GeneratedProperty(),
2524
"TriggerConfigurations": GeneratedProperty(),
2625
"Tags": GeneratedProperty(),
27-
"PropagateTags": GeneratedProperty(),
2826
}
2927

3028
runtime_attrs = {"name": lambda self: ref(self.logical_id)}

samtranslator/model/preferences/deployment_preference_collection.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def get_codedeploy_application(self) -> CodeDeployApplication:
140140

141141
merged_tags: Dict[str, Any] = {}
142142
for preference in self._resource_preferences.values():
143-
if preference.tags:
143+
if preference.enabled and preference.propagate_tags and preference.tags:
144144
merged_tags.update(preference.tags)
145145
if merged_tags:
146146
codedeploy_application_resource.Tags = get_tag_list(merged_tags)
@@ -150,14 +150,6 @@ def get_codedeploy_application(self) -> CodeDeployApplication:
150150
if len(conditions) <= 1:
151151
condition_name = conditions.pop()
152152
codedeploy_application_resource.set_resource_attribute("Condition", condition_name)
153-
154-
merged_tags: Dict[str, Any] = {}
155-
for preference in self._resource_preferences.values():
156-
if preference.enabled and preference.propagate_tags and preference.tags:
157-
merged_tags.update(preference.tags)
158-
if merged_tags:
159-
codedeploy_application_resource.Tags = get_tag_list(merged_tags)
160-
161153
return codedeploy_application_resource
162154

163155
def get_codedeploy_iam_role(self) -> IAMRole:
@@ -240,9 +232,6 @@ def deployment_group(self, function_logical_id: str) -> CodeDeployDeploymentGrou
240232
if deployment_preference.condition:
241233
deployment_group.set_resource_attribute("Condition", deployment_preference.condition)
242234

243-
if deployment_preference.tags:
244-
deployment_group.Tags = get_tag_list(deployment_preference.tags)
245-
246235
return deployment_group
247236

248237
def _convert_alarms(self, preference_alarms): # type: ignore[no-untyped-def]

0 commit comments

Comments
 (0)