Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(merge-back): 2.173.4 #32673

Closed
wants to merge 13 commits into from
Closed

chore(merge-back): 2.173.4 #32673

wants to merge 13 commits into from

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Dec 27, 2024

See CHANGELOG

AWS CDK Team and others added 13 commits December 19, 2024 14:09
Reverts #32591

This release PR was merged to v2-release before a release was aborted last week. We initially decided to keep it and release a new CDK version next week. However, this decision also means we block ourselves from patch releasing in the meantime, because there are commits on the v2-release branch that we would not want to be included in a patch. We are reverting it entirely, so I can patch release successfully.
Closes #32470 

### Reason for this change

Some customers have reported seeing the error `TypeError: localAspects is not iterable` upon upgrading to CDK v2.172.0 (this is when the Priority-ordered aspects feature was released). This is likely caused by customers having dependencies on third-party constructs/libraries which are using outdated versions (< 2.172.0) of CDK. The problem more specifically is that the `Aspects.applied` function was added in v2.172.0, and the new `invokeAspects` function calls this function on all nodes in the tree.

### Description of changes

Created a workaround for customers. Added the `getAspectApplications` function in `synthesis.ts` - this function creates `AspectApplication` objects from `Aspects.all` if `Aspects.applied` does not exist.

### Describe any new or updated permissions being added

None.

### Description of how you validated changes

New unit test in `aspect.test.ts` with a monkey patched `Aspects.applied` function.

### 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*
See CHANGELOG

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…l` (#32668)

There is one more location where we need to convert `null` into `undefined` if a plugin provider returns `expiration: null`. The SDKv3 code base also expects this value to be `undefined | Date`, just like our own code does; when the plugin returns `null` we pass the value over to the SDKv3 which then does a `getTime()` on the value, and then it crashes.

Issue this fix as a patch, so that we can unblock users of a commonly used plugin at Amazon.

This is a PR targeting `v2-release`, picking exactly one line from #32111. After merging this we can patch-release.


----

*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 as a code owner December 27, 2024 19:43
@aws-cdk-automation aws-cdk-automation added auto-approve pr/no-squash This PR should be merged instead of squash-merging it labels Dec 27, 2024
@github-actions github-actions bot added the p2 label Dec 27, 2024
@aws-cdk-automation aws-cdk-automation requested a review from a team December 27, 2024 19:43
@aws-cdk-automation
Copy link
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 1dadd61
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

Copy link
Contributor

mergify bot commented Dec 27, 2024

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

@kaizencc kaizencc added the pr/do-not-merge This PR should not be merged at this time. label Dec 27, 2024
@kaizencc kaizencc closed this Dec 27, 2024
Copy link

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 Dec 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto-approve p2 pr/do-not-merge This PR should not be merged at this time. pr/no-squash This PR should be merged instead of squash-merging it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants