chore: forward merge 'master' into 'v2-main'#15951
Merged
madeline-k merged 33 commits intov2-mainfrom Aug 10, 2021
Merged
Conversation
#15870) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Added a method `Template.toJSON()` to get the object representation of the CloudFormation template. This is most useful for snapshot testing. BREAKING CHANGE: `Template.fromTemplate()` is now renamed to `Template.fromJSON()` to provide clarity. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Switch all current cfn-only packages to depend on `assertions` instead of `assert`. Update `example-construct-library` to showcase using the `assertions` module. Update `cfnspec` so that new packages are created with the `assertions` module. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Happens because `python3.8` doesn't support inline code (i.e `ZipFile`) in some regions. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Co-authored-by: AWS CDK Team <aws-cdk@amazon.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Setting the lower and upper bound breaks the build on Windows. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Co-authored-by: Niranjan Jayakar <nija@amazon.com>
Co-authored-by: Niranjan Jayakar <nija@amazon.com>
chore(release): 1.117.0
chore(mergify): add kaizen3031593 to mergify
…-lambda (#15921) Remove the hard coded reference to the @aws-cdk/aws-lambda packages from the test, which should fix the issue that prevent building the aws-cdk-lib package. Copied from (and kudos to!) #15826 Related #15586 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…plate during tests (#15924) In v1, the default value of the `@aws-cdk/core:newStyleStackSynthesis` flag is `false`. As a consequence, `Template.fromStack()` generates, by default, a template without the rule and parameter related to bootstrap versions. In v2, the default value of this flag is `true`. So this test fails in the v2 branch. By explicitly setting the flag to `false`, we ensure that the tests passes on both v1 and v2, regardless of the default values. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Conducting comprehensive review on `README` file. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
To match the description just below that says: "grants containers in the task permission to call" ---- *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 2.3.0 to 2.4.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v2.3.0...v2.4.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…uring tests (#15953) In v1, the default value of the @aws-cdk/core:newStyleStackSynthesis flag is false. As a consequence, Template.fromStack() generates, by default, a template without the rule and parameter related to bootstrap versions. In v2, the default value of this flag is true. So this test fails in the v2 branch. By explicitly setting the flag to false, we ensure that the tests passes on both v1 and v2, regardless of the default values. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
… consistent template during tests (#15955) In v1, the default value of the `@aws-cdk/core:newStyleStackSynthesis` flag is `false`. As a consequence, `Template.fromStack()` generates, by default, a template without the rule and parameter related to bootstrap versions. In v2, the default value of this flag is `true`. So this test fails in the v2 branch. By explicitly setting the flag to `false`, we ensure that the tests passes on both v1 and v2, regardless of the default values. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…uce a consistent template during tests (#15960) In v1, the default value of the `@aws-cdk/core:newStyleStackSynthesis` flag is `false`. As a consequence, `Template.fromStack()` generates, by default, a template without the rule and parameter related to bootstrap versions. In v2, the default value of this flag is `true`. So this test fails in the v2 branch. By explicitly setting the flag to `false`, we ensure that the tests passes on both v1 and v2, regardless of the default values. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Collaborator
Author
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
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). |
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 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