chore: forward merge 'master' into 'v2-main' #13414
Merged
Conversation
This file contains 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
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
I believe the reason our auto-approve workflow does not work is because it was triggered when the pull request was _created_ and before the `pr/auto-approve` label was applied to it. This adds `types: [ labeled ]` so the workflow is triggered when a PR is labeled. The condition remains the same.
Some tricks we are using to locate packages on disk don't work anymore under newer Node versions. Switch strategies. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Fixes #13228 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
This is a re-submit of the PR #12700, which had to be reverted because of JSII issue aws/jsii#2256. Since that issue has been fixed in JSII version `1.23.0`, which is what we currently use, re-introduce the changes from that PR. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Use lerna to generate a topologically sorted list of `.tgz` files. This list will be used during publishing to impose an order on the package publishing actions. Fixes #13221. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…12674) `allowAllTraffic` only applies to inbound traffic, but it should also apply to outbound traffic. Deprecate it and add a new enum-based property, `defaultAllowedTraffic`, which also allows controlling outbound traffic rules. There is no option to allow inbound but not outbound because there is no use case for that. Fix #12673 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…overy records (#12798) Adds `container` and `containerPort` as optional properties of `CloudMapOptions`. This change allows the user to select which container and container port the `SRV` record points to. Closes #12796 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Bumps [actions/setup-node](https://github.com/actions/setup-node) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v2.1.4...46071b5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Adam Ruka <adamruka@amazon.com>
aws-cdk-automation
added
pr/auto-approve
|
|
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…ions to be from the 'constructs' library.
…m the 'constructs' library.
|
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). |
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
njlynch
added a commit
that referenced
this pull request
Mar 23, 2021
The forward merge #13414 was erroneously squash-merged, resulting in some defects in the future forward merges. In particular, #13426 was dropped, un-reverting the commit and causing issues. There were also some test changes from #13462 that appeared to be dropped. This PR fixes the issue by just directly applying a patch to v2-main that solves the difference between the current v2-main and what we'd have if we un-squashed the squashed merge-commit and replayed all commits after that. This is an effective duplicate of #13742, except that this is a clean patch that can be applied, whereas the other is a rebased branch that will need to be force-pushed to be applied.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Automated action from aws/cdk-ops