Skip to content

chore: forward merge 'master' into 'v2-main'#15951

Merged
madeline-k merged 33 commits intov2-mainfrom
v2/forward-merge-20210809
Aug 10, 2021
Merged

chore: forward merge 'master' into 'v2-main'#15951
madeline-k merged 33 commits intov2-mainfrom
v2/forward-merge-20210809

Conversation

@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

@aws-cdk-automation aws-cdk-automation commented Aug 9, 2021

Automated action from aws/cdk-ops

otaviomacedo and others added 23 commits August 3, 2021 14:06
#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*
…ry stream (#15836)

closes #15500 
closes #10783 

----

*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(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>
@aws-cdk-automation aws-cdk-automation added pr/auto-approve Notifies the GH action to auto-approve this PR pr/forward-merge PR label to indicate forward merges of master to v2-main pr/no-squash This PR should be merged instead of squash-merging it labels Aug 9, 2021
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Aug 9, 2021

madeline-k and others added 3 commits August 9, 2021 17:42
…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*
madeline-k and others added 2 commits August 9, 2021 20:26
… 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*
madeline-k and others added 2 commits August 9, 2021 23:00
…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*
@aws-cdk-automation
Copy link
Copy Markdown
Collaborator Author

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 76aaca9
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Aug 10, 2021

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

@madeline-k madeline-k merged commit 8ad1dd7 into v2-main Aug 10, 2021
@madeline-k madeline-k deleted the v2/forward-merge-20210809 branch August 10, 2021 00:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/auto-approve Notifies the GH action to auto-approve this PR pr/forward-merge PR label to indicate forward merges of master to v2-main 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.

8 participants