Merged
Conversation
… intrinsic functions (#36157) ### Issue # (if applicable) Closes #36140 ### Reason for this change In #35838 we introduced typed relationships for L1 constructs. For properties with arrays, this incorrectly assumed that the value could not be a token. But it can and especially when using the `cloudformation-include` module. ### Description of changes Adds a check to ensure the value is not a Token, which cannot be used as an array, despite passing the type check. There are two places in `resolver-builder.ts` where we added a `.forEach()`. The first one is fixed in this PR, second location already has a check for a resolvable. Note we are only checking for a resolvable here, not if the value is actually an array. At some point this could extended to also check for an array, likely with some refactoring of the "in-place" mapping into a helper function (the currently generated code is very unreadable). For this PR I have chosen to do the minimal change. ### Describe any new or updated permissions being added n/a ### Description of how you validated changes Added a new unit test for this case. ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Abogical
added
pr/no-squash
github-actions
bot
added
the
star-contributor
mrgrain
approved these changes
Nov 24, 2025
Contributor
|
Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to allow changes to be pushed to your fork). |
Contributor
|
Comments on closed issues and PRs are hard for our team to see. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See CHANGELOG.v2.md and CHANGELOG.v2.alpha.md