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: forward merge 'master' into 'v2-main' #13685

Merged
merged 10 commits into from
Mar 19, 2021
Merged

Conversation

aws-cdk-automation
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation commented Mar 19, 2021

Automated action from aws/cdk-ops

rix0rrr and others added 8 commits March 18, 2021 09:07
`.npmignore` did not use to be copied into the directories of the monopackage,
leading to files that *ought* to have been excluded to not be excluded.

Remove the file from the list of files that doesn't get copied to fix this.

This fix is not along the lines of the method suggested in the linked issue,
but it does address the original problem.

Fixes #12292.


----

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

These changes (plus import changes) were necessary to make these tests pass on
the `v2-main` branch. Back-porting to `master` to (hopefully) reduce future
forward-merge pain.

The 'returns base construct info if no more specific info is present' test was
removed as is wasn't truly necessary, and does not work with V2, where Construct
comes from the `constructs` library instead of `core.Construct`.


----

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


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Across the CDK repo, remove the usage of deprecated symbols.

These are going to be removed in CDKv2, and these changes make
the codebases on the two branches more aligned.

However, this does not remove *all* usages of deprecated symbols,
but only the changes that are backwards compatible.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
If the installed node version is >= 14, use Node.js 14.x. Otherwise, use
Node.js 12.x.

This removes a default on the deprecated Node.js 10.x runtime.

BREAKING CHANGE: the default runtime of a `NodejsFunction` is now Node.js 14.x if the environment from which it is deployed uses Node.js >= 14 and Node.js 12.x otherwise.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
We need this to have `jsii-rosetta` runs that try to translate READMEs
from submodules not crash (because it can't find the referenced fixture
files).

This is not a correct final state yet, but it makes the build not crash.

Hopefully allows aws/jsii#2712 to be merged.


----

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

The allowed values for `UntrustedArtifactOnDeployment` in the
`AWS::Lambda::CodeSigningConfig` resource type are 'Warn' and 'Enforce'.

This was incorrectly set in the CDK.

fixes #13586


----

*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 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 Mar 19, 2021
@gitpod-io
Copy link

gitpod-io bot commented Mar 19, 2021

@mergify
Copy link
Contributor

mergify bot commented Mar 19, 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).

@aws-cdk-automation
Copy link
Collaborator Author

AWS CodeBuild CI Report

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

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

@nija-at nija-at merged commit 23f1234 into v2-main Mar 19, 2021
@nija-at nija-at deleted the v2/forward-merge-20210319 branch March 19, 2021 12:24
njlynch pushed a commit that referenced this pull request Mar 22, 2021
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.

6 participants