chore: forward merge 'master' into 'v2-main' #13099
Closed
Conversation
This file contains 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
This was incorrectly introduced in - dd90e54. The dependency is only needed for the module `@aws-cdk/aws-apigatewayv2-authorizers`. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Bumps [@types/md5](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/md5) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/md5) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [@types/table](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/table) from 5.0.0 to 6.0.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/table) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
…ion (#12862) New CrossAccountZoneDelegationRecord documentation has a typo making code snippet not compiling this PR fix it ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…es (#13010) When the Route construct with an integration is defined in a separate stack from the one defining the HttpApi construct, a circular dependency error is thrown. The bug was introduced in - 855ce59 - where the refactor of moving the creation of Integration resulted in using the HttpApi as the scope of the Integration construct, rather than the Route. fixes #13021 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…ext string (#13011) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…count (#13055) The us-east-1 stack for EdgeFunction was defaulting to the default deploy account. This means that using one account to deploy, and another for the stack which contains the EdgeFunction, the support stack in us-east-1 will be deployed into the deploy account, rather than stack account. This fix has the us-east-1 stack inherit the account from the parent stack. fixes #12789 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Closes #12449 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…3060) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.15.0 to 4.15.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.15.1/packages/parser) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
…5.1 (#13059) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.15.0 to 4.15.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.15.1/packages/eslint-plugin) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
By default, when creating a Proxy, we were not creating a Security Group for it, and because of that, the Proxy could not connect to the Cluster/Instance. See docs at: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/rds-proxy.html ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
….0 (#13072) Bumps [eslint-import-resolver-typescript](https://github.com/alexgorbatchev/eslint-import-resolver-typescript) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/releases) - [Changelog](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/blob/master/CHANGELOG.md) - [Commits](import-js/eslint-import-resolver-typescript@v2.3.0...v2.4.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.843.0 to 2.844.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-js@v2.843.0...v2.844.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…y from its ARN (#13066) To align it with how other resources work, for example [S3 Buckets](https://github.com/aws/aws-cdk/blob/c6256992902fc4237ceb9f965e970e2c2ef00777/packages/%40aws-cdk/aws-s3/lib/bucket.ts#L1285-L1286). Fixes #13025 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Use `jest` for RDS tests, as I plan to add data-driven tests. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
See #13019 for the original fix, which was committed to the v2-main branch. This backports the change to the master/v1 branch. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Most L2 resources employ the "PhysicalName" protocol, which checks usage of resource names across environment borders, and can automatically turn auto-named resources into physically-named resources if the situation calls for it. Unfortunately, this wrapped token is a generic IResolvable, not a Reference, and so did not work with the `exportValue()` automatic reference detection. Make the token returned by `getResourceNameAttribute()` etc. a `Reference` that mimics the underlying `Reference` to make this work out. Fixes #13002, fixes #12918. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…v2-main (#13056) This was originally commented out - d7e028a - since this was not yet compatible with the v2-main branch. Since then, the v2-main branch has been updated - 7554246 - with the necessary fixes and the conditional has been enabled there[1]. No effective change to master branch because of this. It reduces divergence of the two active branches. [1]: 7554246#diff-d325e066c7cdf5d2a8423e65b0190045defe711b4dc25adc0a94a11eef163ed9 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…3084) Update how feature flags that are destined to be dropped in v2 should be developed. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
fixes #12415 To generate the correct policy, the DatabaseProxy ARN is parsed and the resulting components are used along with a new parameter to grantConnect. The unit test was updated and passes. Caveat lector, I was not able to get a full docker build or a full local build to work on my box. I'm not sure if this should be considered a breaking change. While it technically alters the functionality of a published function, the current behavior provides no utility. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Fixes #5850 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.844.0 to 2.845.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-js@v2.844.0...v2.845.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 24.1.3 to 24.1.4. - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md) - [Commits](jest-community/eslint-plugin-jest@v24.1.3...v24.1.4) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 24.1.4 to 24.1.5. - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md) - [Commits](jest-community/eslint-plugin-jest@v24.1.4...v24.1.5) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
aws-cdk-automation
added
pr/auto-approve
aws-cdk-automation
added
the
pr/no-squash
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
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 CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
mergify bot
pushed a commit
that referenced
this pull request
Feb 17, 2021
Most feature flags will be expired in CDKv2 and their 'enabled' behaviour made the default. To keep the divergence between the two branches (`master` and `v2-main`) to a minimum, update all integration tests to have the flags enabled. If the flag needs to be different for any specific test, it can be overridden when constructing the `App` object. To keep the set of changes small, only the following flags have been added. The rest will be added in a subsequent change. - @aws-cdk/aws-kms:defaultKeyPolicies - @aws-cdk/core:enableStackNameDuplicates - @aws-cdk/aws-secretsmanager:parseOwnedSecretName Currently, only these three feature flags are expired in CDKv2. Fixing them first will make the branch divergence smaller and reduce already occuring [merge conflicts]. [merge conflicts]: #13099 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
|
This commit should fix the build failure here - 200d52e Closing this for now. The next merge forward should succeed 🤞 |
NovakGu
pushed a commit
to NovakGu/aws-cdk
that referenced
this pull request
Feb 18, 2021
Most feature flags will be expired in CDKv2 and their 'enabled' behaviour made the default. To keep the divergence between the two branches (`master` and `v2-main`) to a minimum, update all integration tests to have the flags enabled. If the flag needs to be different for any specific test, it can be overridden when constructing the `App` object. To keep the set of changes small, only the following flags have been added. The rest will be added in a subsequent change. - @aws-cdk/aws-kms:defaultKeyPolicies - @aws-cdk/core:enableStackNameDuplicates - @aws-cdk/aws-secretsmanager:parseOwnedSecretName Currently, only these three feature flags are expired in CDKv2. Fixing them first will make the branch divergence smaller and reduce already occuring [merge conflicts]. [merge conflicts]: aws#13099 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
eladb
pushed a commit
that referenced
this pull request
Feb 22, 2021
Most feature flags will be expired in CDKv2 and their 'enabled' behaviour made the default. To keep the divergence between the two branches (`master` and `v2-main`) to a minimum, update all integration tests to have the flags enabled. If the flag needs to be different for any specific test, it can be overridden when constructing the `App` object. To keep the set of changes small, only the following flags have been added. The rest will be added in a subsequent change. - @aws-cdk/aws-kms:defaultKeyPolicies - @aws-cdk/core:enableStackNameDuplicates - @aws-cdk/aws-secretsmanager:parseOwnedSecretName Currently, only these three feature flags are expired in CDKv2. Fixing them first will make the branch divergence smaller and reduce already occuring [merge conflicts]. [merge conflicts]: #13099 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
eladb
pushed a commit
to cdklabs/decdk
that referenced
this pull request
Jan 18, 2022
Most feature flags will be expired in CDKv2 and their 'enabled' behaviour made the default. To keep the divergence between the two branches (`master` and `v2-main`) to a minimum, update all integration tests to have the flags enabled. If the flag needs to be different for any specific test, it can be overridden when constructing the `App` object. To keep the set of changes small, only the following flags have been added. The rest will be added in a subsequent change. - @aws-cdk/aws-kms:defaultKeyPolicies - @aws-cdk/core:enableStackNameDuplicates - @aws-cdk/aws-secretsmanager:parseOwnedSecretName Currently, only these three feature flags are expired in CDKv2. Fixing them first will make the branch divergence smaller and reduce already occuring [merge conflicts]. [merge conflicts]: aws/aws-cdk#13099 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
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