fix(cloudformation-include): TypeError when including template with intrinsic functions

[mrgrain]

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

• My code adheres to the CONTRIBUTING GUIDE and DESIGN GUIDELINES

---

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

[aws-cdk-automation]

(This review is outdated)

[mrgrain]

Change here:

aws-cdk/tools/@aws-cdk/spec2cdk/lib/cdk/resolver-builder.ts

Line 100 in c07b989

`(props.${name}?.forEach((item: ${propType.arrayOfType!.toString()}, i: number, arr: ${propType.toString()}) => { arr[i] = ${buildChain('item')}; }), props.${name} as ${resolvableType.toString()})`,

aws-cdk/tools/@aws-cdk/spec2cdk/lib/cdk/resolver-builder.ts

Line 126 in c07b989

? expr.directCode(`props.${name}.forEach((item: any, i: number, arr: any[]) => { arr[i] = ${functionName}(item) }), props.${name}`)

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

[mergify]

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

[github-actions]

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.