fix Globals.Function Architectures override behavior by allenheltondev · Pull Request #3940 · aws/serverless-application-model

allenheltondev · 2026-06-11T11:41:58Z

Issue #, if available

Description of changes

Updates Globals.Function merge behavior so resource-level Architectures overrides global Architectures instead of concatenating both lists.

Architectures is list-shaped, but Lambda functions support a single architecture value. This keeps the existing default list merge behavior for other properties, such as Layers, while handling Architectures like other overridable function properties.

Description of how you validated changes

Ran:

python -m pytest tests/plugins/globals/test_globals.py --no-cov

Result: 48 passed.

Also updated the globals_for_function translator fixture to cover resource-level Architectures overriding Globals.Function.Architectures across standard, aws-cn, and aws-us-gov outputs.

Integration tests were not added because this change is limited to Globals merge behavior and is covered by unit tests plus translator output fixtures.

Checklist

Review the generative AI contribution guidelines
Adheres to the development guidelines
Add/update transform tests
- Using correct values
- Using wrong values
Add/update integration tests

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Allen Helton <allenheltondev@gmail.com>

reedham-aws

Thank you for raising this!

Seems like the linter is failing as well, you can fix locally with make format or make lint.

reedham-aws · 2026-06-11T21:28:40Z

+ global_properties = self._drop_overridden_globals(self.global_properties, local_properties)
+ return self._do_merge(global_properties, local_properties) # type: ignore[no-untyped-call]
+
+ def _drop_overridden_globals(self, global_properties, local_properties): # type: ignore[no-untyped-def]
+ if not self.override_properties or not isinstance(global_properties, dict) or not isinstance(local_properties, dict):
+ return global_properties
+
+ global_properties = global_properties.copy()
+ for key in self.override_properties:
+ if key in global_properties and key in local_properties:
+ del global_properties[key]
+ return global_properties


I think this approach makes sense and would work, but I my first instinct is that we could get rid of the loop/copy by checking the override_properties in _merge_dict. I left another comment in the place where that might work, but I could be missing something, let me know what you think.

reedham-aws · 2026-06-11T21:31:38Z

 global_dict = global_dict.copy()

 for key in local_dict:
 if key in global_dict:


I think we could have a condition here to see if the key is in the overrides, and if it's not then we could enter the else. I think this would accomplish the same thing.

allenheltondev · 2026-06-11T11:41:58Z

Issue #, if available

Fixes#3939

Description of changes

Updates Globals.Function merge behavior so resource-level Architectures overrides global Architectures instead of concatenating both lists.

Architectures is list-shaped, but Lambda functions support a single architecture value. This keeps the existing default list merge behavior for other properties, such as Layers, while handling Architectures like other overridable function properties.

Description of how you validated changes

Ran:

python -m pytest tests/plugins/globals/test_globals.py --no-cov

Result: 48 passed.

Also updated the globals_for_function translator fixture to cover resource-level Architectures overriding Globals.Function.Architectures across standard, aws-cn, and aws-us-gov outputs.

Integration tests were not added because this change is limited to Globals merge behavior and is covered by unit tests plus translator output fixtures.

Checklist

Review the generative AI contribution guidelines
Adheres to the development guidelines
Add/update transform tests
- Using correct values
- Using wrong values
Add/update integration tests

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Allen Helton <allenheltondev@gmail.com>

reedham-aws

Thank you for raising this!

Seems like the linter is failing as well, you can fix locally with make format or make lint.

reedham-aws · 2026-06-11T21:28:40Z

+ global_properties = self._drop_overridden_globals(self.global_properties, local_properties)
+ return self._do_merge(global_properties, local_properties) # type: ignore[no-untyped-call]
+
+ def _drop_overridden_globals(self, global_properties, local_properties): # type: ignore[no-untyped-def]
+ if not self.override_properties or not isinstance(global_properties, dict) or not isinstance(local_properties, dict):
+ return global_properties
+
+ global_properties = global_properties.copy()
+ for key in self.override_properties:
+ if key in global_properties and key in local_properties:
+ del global_properties[key]
+ return global_properties


I think this approach makes sense and would work, but I my first instinct is that we could get rid of the loop/copy by checking the override_properties in _merge_dict. I left another comment in the place where that might work, but I could be missing something, let me know what you think.

reedham-aws · 2026-06-11T21:31:38Z

 global_dict = global_dict.copy()

 for key in local_dict:
 if key in global_dict:


I think we could have a condition here to see if the key is in the overrides, and if it's not then we could enter the else. I think this would accomplish the same thing.

allenheltondev · 2026-06-11T11:41:58Z

Issue #, if available

Fixes#3939

Description of changes

Updates Globals.Function merge behavior so resource-level Architectures overrides global Architectures instead of concatenating both lists.

Architectures is list-shaped, but Lambda functions support a single architecture value. This keeps the existing default list merge behavior for other properties, such as Layers, while handling Architectures like other overridable function properties.

Description of how you validated changes

Ran:

python -m pytest tests/plugins/globals/test_globals.py --no-cov

Result: 48 passed.

Also updated the globals_for_function translator fixture to cover resource-level Architectures overriding Globals.Function.Architectures across standard, aws-cn, and aws-us-gov outputs.

Integration tests were not added because this change is limited to Globals merge behavior and is covered by unit tests plus translator output fixtures.

Checklist

Review the generative AI contribution guidelines
Adheres to the development guidelines
Add/update transform tests
- Using correct values
- Using wrong values
Add/update integration tests

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Allen Helton <allenheltondev@gmail.com>

reedham-aws

Thank you for raising this!

Seems like the linter is failing as well, you can fix locally with make format or make lint.

reedham-aws · 2026-06-11T21:28:40Z

+ global_properties = self._drop_overridden_globals(self.global_properties, local_properties)
+ return self._do_merge(global_properties, local_properties) # type: ignore[no-untyped-call]
+
+ def _drop_overridden_globals(self, global_properties, local_properties): # type: ignore[no-untyped-def]
+ if not self.override_properties or not isinstance(global_properties, dict) or not isinstance(local_properties, dict):
+ return global_properties
+
+ global_properties = global_properties.copy()
+ for key in self.override_properties:
+ if key in global_properties and key in local_properties:
+ del global_properties[key]
+ return global_properties


I think this approach makes sense and would work, but I my first instinct is that we could get rid of the loop/copy by checking the override_properties in _merge_dict. I left another comment in the place where that might work, but I could be missing something, let me know what you think.

reedham-aws · 2026-06-11T21:31:38Z

 global_dict = global_dict.copy()

 for key in local_dict:
 if key in global_dict:


I think we could have a condition here to see if the key is in the overrides, and if it's not then we could enter the else. I think this would accomplish the same thing.

allenheltondev · 2026-06-11T11:41:58Z

Issue #, if available

Fixes#3939

Description of changes

Updates Globals.Function merge behavior so resource-level Architectures overrides global Architectures instead of concatenating both lists.

Architectures is list-shaped, but Lambda functions support a single architecture value. This keeps the existing default list merge behavior for other properties, such as Layers, while handling Architectures like other overridable function properties.

Description of how you validated changes

Ran:

python -m pytest tests/plugins/globals/test_globals.py --no-cov

Result: 48 passed.

Also updated the globals_for_function translator fixture to cover resource-level Architectures overriding Globals.Function.Architectures across standard, aws-cn, and aws-us-gov outputs.

Integration tests were not added because this change is limited to Globals merge behavior and is covered by unit tests plus translator output fixtures.

Checklist

Review the generative AI contribution guidelines
Adheres to the development guidelines
Add/update transform tests
- Using correct values
- Using wrong values
Add/update integration tests

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Allen Helton <allenheltondev@gmail.com>

reedham-aws

Thank you for raising this!

Seems like the linter is failing as well, you can fix locally with make format or make lint.

reedham-aws · 2026-06-11T21:28:40Z

+ global_properties = self._drop_overridden_globals(self.global_properties, local_properties)
+ return self._do_merge(global_properties, local_properties) # type: ignore[no-untyped-call]
+
+ def _drop_overridden_globals(self, global_properties, local_properties): # type: ignore[no-untyped-def]
+ if not self.override_properties or not isinstance(global_properties, dict) or not isinstance(local_properties, dict):
+ return global_properties
+
+ global_properties = global_properties.copy()
+ for key in self.override_properties:
+ if key in global_properties and key in local_properties:
+ del global_properties[key]
+ return global_properties


I think this approach makes sense and would work, but I my first instinct is that we could get rid of the loop/copy by checking the override_properties in _merge_dict. I left another comment in the place where that might work, but I could be missing something, let me know what you think.

reedham-aws · 2026-06-11T21:31:38Z

 global_dict = global_dict.copy()

 for key in local_dict:
 if key in global_dict:


I think we could have a condition here to see if the key is in the overrides, and if it's not then we could enter the else. I think this would accomplish the same thing.

allenheltondev · 2026-06-11T11:41:58Z

Issue #, if available

Fixes#3939

Description of changes

Updates Globals.Function merge behavior so resource-level Architectures overrides global Architectures instead of concatenating both lists.

Architectures is list-shaped, but Lambda functions support a single architecture value. This keeps the existing default list merge behavior for other properties, such as Layers, while handling Architectures like other overridable function properties.

Description of how you validated changes

Ran:

python -m pytest tests/plugins/globals/test_globals.py --no-cov

Result: 48 passed.

Also updated the globals_for_function translator fixture to cover resource-level Architectures overriding Globals.Function.Architectures across standard, aws-cn, and aws-us-gov outputs.

Integration tests were not added because this change is limited to Globals merge behavior and is covered by unit tests plus translator output fixtures.

Checklist

Review the generative AI contribution guidelines
Adheres to the development guidelines
Add/update transform tests
- Using correct values
- Using wrong values
Add/update integration tests

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Allen Helton <allenheltondev@gmail.com>

reedham-aws

Thank you for raising this!

Seems like the linter is failing as well, you can fix locally with make format or make lint.

reedham-aws · 2026-06-11T21:28:40Z

+ global_properties = self._drop_overridden_globals(self.global_properties, local_properties)
+ return self._do_merge(global_properties, local_properties) # type: ignore[no-untyped-call]
+
+ def _drop_overridden_globals(self, global_properties, local_properties): # type: ignore[no-untyped-def]
+ if not self.override_properties or not isinstance(global_properties, dict) or not isinstance(local_properties, dict):
+ return global_properties
+
+ global_properties = global_properties.copy()
+ for key in self.override_properties:
+ if key in global_properties and key in local_properties:
+ del global_properties[key]
+ return global_properties


I think this approach makes sense and would work, but I my first instinct is that we could get rid of the loop/copy by checking the override_properties in _merge_dict. I left another comment in the place where that might work, but I could be missing something, let me know what you think.

reedham-aws · 2026-06-11T21:31:38Z

 global_dict = global_dict.copy()

 for key in local_dict:
 if key in global_dict:


I think we could have a condition here to see if the key is in the overrides, and if it's not then we could enter the else. I think this would accomplish the same thing.

allenheltondev · 2026-06-11T11:41:58Z

Issue #, if available

Fixes#3939

Description of changes

Updates Globals.Function merge behavior so resource-level Architectures overrides global Architectures instead of concatenating both lists.

Architectures is list-shaped, but Lambda functions support a single architecture value. This keeps the existing default list merge behavior for other properties, such as Layers, while handling Architectures like other overridable function properties.

Description of how you validated changes

Ran:

python -m pytest tests/plugins/globals/test_globals.py --no-cov

Result: 48 passed.

Also updated the globals_for_function translator fixture to cover resource-level Architectures overriding Globals.Function.Architectures across standard, aws-cn, and aws-us-gov outputs.

Integration tests were not added because this change is limited to Globals merge behavior and is covered by unit tests plus translator output fixtures.

Checklist

Review the generative AI contribution guidelines
Adheres to the development guidelines
Add/update transform tests
- Using correct values
- Using wrong values
Add/update integration tests

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Allen Helton <allenheltondev@gmail.com>

reedham-aws

Thank you for raising this!

Seems like the linter is failing as well, you can fix locally with make format or make lint.

reedham-aws · 2026-06-11T21:28:40Z

+ global_properties = self._drop_overridden_globals(self.global_properties, local_properties)
+ return self._do_merge(global_properties, local_properties) # type: ignore[no-untyped-call]
+
+ def _drop_overridden_globals(self, global_properties, local_properties): # type: ignore[no-untyped-def]
+ if not self.override_properties or not isinstance(global_properties, dict) or not isinstance(local_properties, dict):
+ return global_properties
+
+ global_properties = global_properties.copy()
+ for key in self.override_properties:
+ if key in global_properties and key in local_properties:
+ del global_properties[key]
+ return global_properties


I think this approach makes sense and would work, but I my first instinct is that we could get rid of the loop/copy by checking the override_properties in _merge_dict. I left another comment in the place where that might work, but I could be missing something, let me know what you think.

reedham-aws · 2026-06-11T21:31:38Z

 global_dict = global_dict.copy()

 for key in local_dict:
 if key in global_dict:


I think we could have a condition here to see if the key is in the overrides, and if it's not then we could enter the else. I think this would accomplish the same thing.

allenheltondev · 2026-06-11T11:41:58Z

Issue #, if available

Fixes#3939

Description of changes

Updates Globals.Function merge behavior so resource-level Architectures overrides global Architectures instead of concatenating both lists.

Architectures is list-shaped, but Lambda functions support a single architecture value. This keeps the existing default list merge behavior for other properties, such as Layers, while handling Architectures like other overridable function properties.

Description of how you validated changes

Ran:

python -m pytest tests/plugins/globals/test_globals.py --no-cov

Result: 48 passed.

Also updated the globals_for_function translator fixture to cover resource-level Architectures overriding Globals.Function.Architectures across standard, aws-cn, and aws-us-gov outputs.

Integration tests were not added because this change is limited to Globals merge behavior and is covered by unit tests plus translator output fixtures.

Checklist

Review the generative AI contribution guidelines
Adheres to the development guidelines
Add/update transform tests
- Using correct values
- Using wrong values
Add/update integration tests

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Allen Helton <allenheltondev@gmail.com>

reedham-aws

Thank you for raising this!

Seems like the linter is failing as well, you can fix locally with make format or make lint.

reedham-aws · 2026-06-11T21:28:40Z

+ global_properties = self._drop_overridden_globals(self.global_properties, local_properties)
+ return self._do_merge(global_properties, local_properties) # type: ignore[no-untyped-call]
+
+ def _drop_overridden_globals(self, global_properties, local_properties): # type: ignore[no-untyped-def]
+ if not self.override_properties or not isinstance(global_properties, dict) or not isinstance(local_properties, dict):
+ return global_properties
+
+ global_properties = global_properties.copy()
+ for key in self.override_properties:
+ if key in global_properties and key in local_properties:
+ del global_properties[key]
+ return global_properties


I think this approach makes sense and would work, but I my first instinct is that we could get rid of the loop/copy by checking the override_properties in _merge_dict. I left another comment in the place where that might work, but I could be missing something, let me know what you think.

reedham-aws · 2026-06-11T21:31:38Z

 global_dict = global_dict.copy()

 for key in local_dict:
 if key in global_dict:


I think we could have a condition here to see if the key is in the overrides, and if it's not then we could enter the else. I think this would accomplish the same thing.

allenheltondev · 2026-06-11T11:41:58Z

Issue #, if available

Fixes#3939

Description of changes

Updates Globals.Function merge behavior so resource-level Architectures overrides global Architectures instead of concatenating both lists.

Architectures is list-shaped, but Lambda functions support a single architecture value. This keeps the existing default list merge behavior for other properties, such as Layers, while handling Architectures like other overridable function properties.

Description of how you validated changes

Ran:

python -m pytest tests/plugins/globals/test_globals.py --no-cov

Result: 48 passed.

Also updated the globals_for_function translator fixture to cover resource-level Architectures overriding Globals.Function.Architectures across standard, aws-cn, and aws-us-gov outputs.

Integration tests were not added because this change is limited to Globals merge behavior and is covered by unit tests plus translator output fixtures.

Checklist

Review the generative AI contribution guidelines
Adheres to the development guidelines
Add/update transform tests
- Using correct values
- Using wrong values
Add/update integration tests

Examples?

Please reach out in the comments if you want to add an example. Examples will be
added to sam init through aws/aws-sam-cli-app-templates.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Signed-off-by: Allen Helton <allenheltondev@gmail.com>

reedham-aws

Thank you for raising this!

Seems like the linter is failing as well, you can fix locally with make format or make lint.

reedham-aws · 2026-06-11T21:28:40Z

+ global_properties = self._drop_overridden_globals(self.global_properties, local_properties)
+ return self._do_merge(global_properties, local_properties) # type: ignore[no-untyped-call]
+
+ def _drop_overridden_globals(self, global_properties, local_properties): # type: ignore[no-untyped-def]
+ if not self.override_properties or not isinstance(global_properties, dict) or not isinstance(local_properties, dict):
+ return global_properties
+
+ global_properties = global_properties.copy()
+ for key in self.override_properties:
+ if key in global_properties and key in local_properties:
+ del global_properties[key]
+ return global_properties


I think this approach makes sense and would work, but I my first instinct is that we could get rid of the loop/copy by checking the override_properties in _merge_dict. I left another comment in the place where that might work, but I could be missing something, let me know what you think.

reedham-aws · 2026-06-11T21:31:38Z

 global_dict = global_dict.copy()

 for key in local_dict:
 if key in global_dict:


I think we could have a condition here to see if the key is in the overrides, and if it's not then we could enter the else. I think this would accomplish the same thing.

fix Globals.Function Architectures override behavior
4579ca3
Signed-off-by: Allen Helton <allenheltondev@gmail.com>

allenheltondev requested a review from a team as a code owner June 11, 2026 11:41

reedham-aws reviewed Jun 11, 2026
View reviewed changes

vicheey mentioned this pull request Jun 23, 2026
feat(globals): add per-property merge strategy for list properties #3945
Merged

allenheltondev closed this Jul 14, 2026

fix Globals.Function Architectures override behavior
4579ca3
Signed-off-by: Allen Helton <allenheltondev@gmail.com>

allenheltondev requested a review from a team as a code owner June 11, 2026 11:41

reedham-aws reviewed Jun 11, 2026
View reviewed changes

vicheey mentioned this pull request Jun 23, 2026
feat(globals): add per-property merge strategy for list properties #3945
Merged

allenheltondev closed this Jul 14, 2026

fix Globals.Function Architectures override behavior
4579ca3
Signed-off-by: Allen Helton <allenheltondev@gmail.com>

allenheltondev requested a review from a team as a code owner June 11, 2026 11:41

reedham-aws reviewed Jun 11, 2026
View reviewed changes

vicheey mentioned this pull request Jun 23, 2026
feat(globals): add per-property merge strategy for list properties #3945
Merged

allenheltondev closed this Jul 14, 2026

fix Globals.Function Architectures override behavior
4579ca3
Signed-off-by: Allen Helton <allenheltondev@gmail.com>

allenheltondev requested a review from a team as a code owner June 11, 2026 11:41

reedham-aws reviewed Jun 11, 2026
View reviewed changes

vicheey mentioned this pull request Jun 23, 2026
feat(globals): add per-property merge strategy for list properties #3945
Merged

allenheltondev closed this Jul 14, 2026

fix Globals.Function Architectures override behavior
4579ca3
Signed-off-by: Allen Helton <allenheltondev@gmail.com>

allenheltondev requested a review from a team as a code owner June 11, 2026 11:41

reedham-aws reviewed Jun 11, 2026
View reviewed changes

vicheey mentioned this pull request Jun 23, 2026
feat(globals): add per-property merge strategy for list properties #3945
Merged

allenheltondev closed this Jul 14, 2026

fix Globals.Function Architectures override behavior
4579ca3
Signed-off-by: Allen Helton <allenheltondev@gmail.com>

allenheltondev requested a review from a team as a code owner June 11, 2026 11:41

reedham-aws reviewed Jun 11, 2026
View reviewed changes

vicheey mentioned this pull request Jun 23, 2026
feat(globals): add per-property merge strategy for list properties #3945
Merged

allenheltondev closed this Jul 14, 2026

fix Globals.Function Architectures override behavior
4579ca3
Signed-off-by: Allen Helton <allenheltondev@gmail.com>

allenheltondev requested a review from a team as a code owner June 11, 2026 11:41

reedham-aws reviewed Jun 11, 2026
View reviewed changes

vicheey mentioned this pull request Jun 23, 2026
feat(globals): add per-property merge strategy for list properties #3945
Merged

allenheltondev closed this Jul 14, 2026

fix Globals.Function Architectures override behavior
4579ca3
Signed-off-by: Allen Helton <allenheltondev@gmail.com>

allenheltondev requested a review from a team as a code owner June 11, 2026 11:41

reedham-aws reviewed Jun 11, 2026
View reviewed changes

vicheey mentioned this pull request Jun 23, 2026
feat(globals): add per-property merge strategy for list properties #3945
Merged

allenheltondev closed this Jul 14, 2026

Uh oh!

Conversation

allenheltondev commented Jun 11, 2026

Issue #, if available

Description of changes

Description of how you validated changes

Checklist

Examples?

Uh oh!

reedham-aws left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

allenheltondev commented Jun 11, 2026

Issue #, if available

Description of changes

Description of how you validated changes

Checklist

Examples?

Uh oh!

reedham-aws left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

allenheltondev commented Jun 11, 2026

Issue #, if available

Description of changes

Description of how you validated changes

Checklist

Examples?

Uh oh!

reedham-aws left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

allenheltondev commented Jun 11, 2026

Issue #, if available

Description of changes

Description of how you validated changes

Checklist

Examples?