Skip to content

chore(aws-cdk): correct construct-versions for v2 init templates#16578

Merged
mergify[bot] merged 3 commits intomasterfrom
njlynch/backport-constructs-version-for-init
Sep 21, 2021
Merged

chore(aws-cdk): correct construct-versions for v2 init templates#16578
mergify[bot] merged 3 commits intomasterfrom
njlynch/backport-constructs-version-for-init

Conversation

@njlynch
Copy link
Copy Markdown
Contributor

@njlynch njlynch commented Sep 21, 2021

When the constructs compatibility layer was removed on the v2 branch (#12054), a
change was made to the init templates to support a flexible constructs version
(either ^3 or ^10). These changes were never back-ported to v1, leading to the
situation where there are (unnecessary) differences on the v2 templates between
the v1 and v2 branches.

Backported these changes manually (for package.json and init.ts), and then by
diffing the init templates directory between master and v2-main.


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

When the constructs compatibility layer was removed on the v2 branch (#12054), a
change was made to the init templates to support a flexible constructs version
(either ^3 or ^10). These changes were never back-ported to v1, leading to the
situation where there are (unnecessary) differences on the v2 templates between
the v1 and v2 branches.

Backported these changes manually (for package.json and init.ts), and then by
diffing the init templates directory between master and v2-main.
@njlynch njlynch requested a review from a team September 21, 2021 16:31
@njlynch njlynch self-assigned this Sep 21, 2021
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Sep 21, 2021

@njlynch njlynch changed the title chore(aws-cdk): backport %construct-versions% for init templates chore(aws-cdk): correct construct-versions for v2 init templates Sep 21, 2021
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Sep 21, 2021
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 21, 2021

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

@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

AWS CodeBuild CI Report

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

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

@mergify mergify bot merged commit f12168a into master Sep 21, 2021
@mergify mergify bot deleted the njlynch/backport-constructs-version-for-init branch September 21, 2021 20:57
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 21, 2021

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

contribution/core This is a PR that came from AWS.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants