Skip to content

Conversation

@Abogical
Copy link
Member

See CHANGELOG.v2.md and CHANGELOG.v2.alpha.md

mrgrain and others added 3 commits November 24, 2025 09:48
… 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*
@aws-cdk-automation aws-cdk-automation requested a review from a team November 24, 2025 10:01
@github-actions github-actions bot added the p2 label Nov 24, 2025
@Abogical Abogical added pr/no-squash This PR should be merged instead of squash-merging it and removed p2 labels Nov 24, 2025
@github-actions github-actions bot added the star-contributor [Pilot] contributed between 25-49 PRs to the CDK label Nov 24, 2025
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Nov 24, 2025
@Abogical Abogical added the priority-pr push the PR to priority squash queue label Nov 24, 2025
@mergify
Copy link
Contributor

mergify bot commented Nov 24, 2025

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).

@mergify mergify bot merged commit 367086f into v2-release Nov 24, 2025
48 of 49 checks passed
@mergify mergify bot deleted the release/v2.228.0 branch November 24, 2025 10:34
@github-actions
Copy link
Contributor

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 24, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

contribution/core This is a PR that came from AWS. pr/no-squash This PR should be merged instead of squash-merging it priority-pr push the PR to priority squash queue star-contributor [Pilot] contributed between 25-49 PRs to the CDK

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants