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

Commits on Mar 18, 2021

  1. chore(ubergen): copy .npmignore into monopackage (#13642)

    `.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*
    rix0rrr authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    95438b5 View commit details
    Browse the repository at this point in the history
  2. chore(core): backport runtime-info test simplification from v2 branch (

    …#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*
    njlynch authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    4934937 View commit details
    Browse the repository at this point in the history
  3. fix(neptune): create correct IAM statement in grantConnect() (#13641)

    fixes #13640
    
    
    ----
    
    *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
    christophgysin authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    2e7f046 View commit details
    Browse the repository at this point in the history
  4. chore: remove usage of deprecated symbols (#13500)

    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*
    Niranjan Jayakar authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    a872e67 View commit details
    Browse the repository at this point in the history
  5. chore(lambda-nodejs): update default runtime (#13664)

    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*
    jogold authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    ca42461 View commit details
    Browse the repository at this point in the history
  6. chore(ubergen): combine all Rosetta fixtures (#13670)

    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*
    rix0rrr authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    e047bda View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0ea4b19 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. fix(lambda): incorrect values for prop UntrustedArtifactOnDeployment (#…

    …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*
    Niranjan Jayakar authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    0757686 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'v2-main' into v2/forward-merge-20210319

    Niranjan Jayakar authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    8176d99 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ba97512 View commit details
    Browse the repository at this point in the history