chore: forward merge 'master' into 'v2-main'#20441
Merged
mergify[bot] merged 7 commits intov2-mainfrom May 20, 2022
Merged
Conversation
…ccountKeys twice" (#20427) This PR fails in CDK v2 because the added unit tests that use `testFutureBehavior` fail on the CDK v2 branch. I believe they're failing because the `testFutureBehavior` utility function was written before CDK v2 was released, and so it automatically discards all feature flags - which should not be happening for new feature flags. I'm not sure what the best fix for this is so I'm just reverting it for the time being to unblock the release. Test logs: <details> ``` FAIL test/pipeline.test.js (12.04 s) ● › cross account key alias name tests › cross account key alias is named with stack name instead of ID when feature flag is enabled Template has 1 resources with type AWS::KMS::Alias, but none match as expected. The closest result is: { "Type": "AWS::KMS::Alias", "Properties": { "AliasName": "alias/codepipeline-pipelinestackpipeline9db740af", "TargetKeyId": { "Fn::GetAtt": [ "PipelineArtifactsBucketEncryptionKey01D58D69", "Arn" ] } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" } with the following mismatches: Expected alias/codepipeline-actual-stack-name-pipeline-0a412eb5 but received alias/codepipeline-pipelinestackpipeline9db740af at /Properties/AliasName (using objectLike matcher) 83 | const matchError = hasResourceProperties(this.template, type, props); 84 | if (matchError) { > 85 | throw new Error(matchError); | ^ 86 | } 87 | } 88 | at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) at fn (test/pipeline.test.ts:500:33) at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ● › cross account key alias name tests › cross account key alias is named with generated stack name when stack name is undefined and feature flag is enabled Template has 1 resources with type AWS::KMS::Alias, but none match as expected. The closest result is: { "Type": "AWS::KMS::Alias", "Properties": { "AliasName": "alias/codepipeline-pipelinestackpipeline9db740af", "TargetKeyId": { "Fn::GetAtt": [ "PipelineArtifactsBucketEncryptionKey01D58D69", "Arn" ] } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" } with the following mismatches: Expected alias/codepipeline-pipelinestack-pipeline-9db740af but received alias/codepipeline-pipelinestackpipeline9db740af at /Properties/AliasName (using objectLike matcher) 83 | const matchError = hasResourceProperties(this.template, type, props); 84 | if (matchError) { > 85 | throw new Error(matchError); | ^ 86 | } 87 | } 88 | at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) at fn (test/pipeline.test.ts:525:33) at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ● › cross account key alias name tests › cross account key alias is named with stack name and nested stack ID when feature flag is enabled Template has 1 resources with type AWS::KMS::Alias, but none match as expected. The closest result is: { "Type": "AWS::KMS::Alias", "Properties": { "AliasName": "alias/codepipeline-toplevelstacknestedpipelinestackactualpipeline3161a537", "TargetKeyId": { "Fn::GetAtt": [ "ActualPipelineArtifactsBucketEncryptionKeyDF448A3D", "Arn" ] } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" } with the following mismatches: Expected alias/codepipeline-actual-stack-name-nestedpipelinestack-actualpipeline-23a98110 but received alias/codepipeline-toplevelstacknestedpipelinestackactualpipeline3161a537 at /Properties/AliasName (using objectLike matcher) 83 | const matchError = hasResourceProperties(this.template, type, props); 84 | if (matchError) { > 85 | throw new Error(matchError); | ^ 86 | } 87 | } 88 | at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) at fn (test/pipeline.test.ts:552:46) at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ● › cross account key alias name tests › cross account key alias is named with generated stack name and nested stack ID when stack name is undefined and feature flag is enabled Template has 1 resources with type AWS::KMS::Alias, but none match as expected. The closest result is: { "Type": "AWS::KMS::Alias", "Properties": { "AliasName": "alias/codepipeline-toplevelstacknestedpipelinestackactualpipeline3161a537", "TargetKeyId": { "Fn::GetAtt": [ "ActualPipelineArtifactsBucketEncryptionKeyDF448A3D", "Arn" ] } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" } with the following mismatches: Expected alias/codepipeline-toplevelstack-nestedpipelinestack-actualpipeline-3161a537 but received alias/codepipeline-toplevelstacknestedpipelinestackactualpipeline3161a537 at /Properties/AliasName (using objectLike matcher) 83 | const matchError = hasResourceProperties(this.template, type, props); 84 | if (matchError) { > 85 | throw new Error(matchError); | ^ 86 | } 87 | } 88 | at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) at fn (test/pipeline.test.ts:581:46) at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ● › cross account key alias name tests › cross account key alias is properly shortened to 256 characters when stack name is too long and feature flag is enabled Template has 1 resources with type AWS::KMS::Alias, but none match as expected. The closest result is: { "Type": "AWS::KMS::Alias", "Properties": { "AliasName": "alias/codepipeline-toolongactualpipelinewithextrasuperlongnamethatwillneedtobeshortenedduetothealsoverysuperextralongnameofthestackalsowithsomedifferentcharactersaddedtotheendc9bb503e", "TargetKeyId": { "Fn::GetAtt": [ "ActualPipelineWithExtraSuperLongNameThatWillNeedToBeShortenedDueToTheAlsoVerySuperExtraLongNameOfTheStackAlsoWithSomeDifferentCharactersAddedToTheEndArtifactsBucketEncryptionKeyABD1BD7F", "Arn" ] } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" } with the following mismatches: Expected alias/codepipeline-actual-stack-needstobeshortenedduetothelengthofthisabsurdnamethatnooneshouldusebutitstillmighthappensowemusttestfohatwillneedtobeshortenedduetothealsoverysuperextralongnameofthestack-alsowithsomedifferentcharactersaddedtotheend-384b9343 but received alias/codepipeline-toolongactualpipelinewithextrasuperlongnamethatwillneedtobeshortenedduetothealsoverysuperextralongnameofthestackalsowithsomedifferentcharactersaddedtotheendc9bb503e at /Properties/AliasName (using objectLike matcher) 83 | const matchError = hasResourceProperties(this.template, type, props); 84 | if (matchError) { > 85 | throw new Error(matchError); | ^ 86 | } 87 | } 88 | at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) at fn (test/pipeline.test.ts:609:33) at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ● › cross account key alias name tests › cross account key alias names do not conflict when the stack ID is the same and pipeline ID is the same and feature flag is enabled Template has 1 resources with type AWS::KMS::Alias, but none match as expected. The closest result is: { "Type": "AWS::KMS::Alias", "Properties": { "AliasName": "alias/codepipeline-stackidpipeline32fb88b3", "TargetKeyId": { "Fn::GetAtt": [ "PipelineArtifactsBucketEncryptionKey01D58D69", "Arn" ] } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" } with the following mismatches: Expected alias/codepipeline-actual-stack-1-pipeline-b09fefee but received alias/codepipeline-stackidpipeline32fb88b3 at /Properties/AliasName (using objectLike matcher) 83 | const matchError = hasResourceProperties(this.template, type, props); 84 | if (matchError) { > 85 | throw new Error(matchError); | ^ 86 | } 87 | } 88 | at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) at fn (test/pipeline.test.ts:643:34) at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ● › cross account key alias name tests › cross account key alias names do not conflict for nested stacks when pipeline ID is the same and nested stacks have the same ID when feature flag is enabled Template has 1 resources with type AWS::KMS::Alias, but none match as expected. The closest result is: { "Type": "AWS::KMS::Alias", "Properties": { "AliasName": "alias/codepipeline-stackidnestedpipelineid3e91360a", "TargetKeyId": { "Fn::GetAtt": [ "PIPELINEIDArtifactsBucketEncryptionKeyE292C50C", "Arn" ] } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" } with the following mismatches: Expected alias/codepipeline-actual-stack-name-1-nested-pipeline-id-c8c9f252 but received alias/codepipeline-stackidnestedpipelineid3e91360a at /Properties/AliasName (using objectLike matcher) 83 | const matchError = hasResourceProperties(this.template, type, props); 84 | if (matchError) { > 85 | throw new Error(matchError); | ^ 86 | } 87 | } 88 | at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) at fn (test/pipeline.test.ts:697:47) at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ● › cross account key alias name tests › cross account key alias names do not conflict for nested stacks when in the same stack but nested stacks have different IDs when feature flag is enabled Template has 1 resources with type AWS::KMS::Alias, but none match as expected. The closest result is: { "Type": "AWS::KMS::Alias", "Properties": { "AliasName": "alias/codepipeline-stackidfirstpipelineid5abca693", "TargetKeyId": { "Fn::GetAtt": [ "PIPELINEIDArtifactsBucketEncryptionKeyE292C50C", "Arn" ] } }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" } with the following mismatches: Expected alias/codepipeline-actual-stack-name-1-first-pipeline-id-3c59cb88 but received alias/codepipeline-stackidfirstpipelineid5abca693 at /Properties/AliasName (using objectLike matcher) 83 | const matchError = hasResourceProperties(this.template, type, props); 84 | if (matchError) { > 85 | throw new Error(matchError); | ^ 86 | } 87 | } 88 | at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) at fn (test/pipeline.test.ts:749:46) at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ``` </details> ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
fixes #20388 I'm interested in why `DatabaseClusterFromSnapshot` generates an `admin` username unlike the other snapshot constructs, I'm unfamiliar with why it's be okay to generate a username for that but not an instance or serverless cluster ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…anifest (#20433) Users have encountered an error resulting from the manifest being too large to stringify. This allows users to prevent this metadata from ever being added to the manifest. Fixes the issue that caused the previous iteration of this PR to fail in the v2 pipeline. Fixes #20211. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
When the integ runner fails to validate a snapshot, add an option to retain the tempdir with the "new actual" snapshot so that a human can go look around in it. Also make the `--verbose` flag print out a command that will reproduce the running of the CDK app directly from the command-line, so that it can be debugged more easily. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
… passing container port for target group port (#20284)" (#20430) This reverts #20284 since its tests fail to pass in CDK v2, blocking the next CDK release. The root cause of failure looks as though it may be the same as #20427 - I've included the test logs below: <details> ``` @aws-cdk/aws-ecs-patterns: FAIL test/fargate/load-balanced-fargate-service-v2.test.js (11.703 s) @aws-cdk/aws-ecs-patterns: â—� When Network Load Balancer › Fargate networkloadbalanced construct uses custom Port for target group when feature flag is enabled @aws-cdk/aws-ecs-patterns: Template has 1 resources with type AWS::ElasticLoadBalancingV2::TargetGroup, but none match as expected. @aws-cdk/aws-ecs-patterns: The closest result is: @aws-cdk/aws-ecs-patterns: { @aws-cdk/aws-ecs-patterns: "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", @aws-cdk/aws-ecs-patterns: "Properties": { @aws-cdk/aws-ecs-patterns: "Port": 80, @aws-cdk/aws-ecs-patterns: "Protocol": "TCP", @aws-cdk/aws-ecs-patterns: "TargetType": "ip", @aws-cdk/aws-ecs-patterns: "VpcId": { @aws-cdk/aws-ecs-patterns: "Ref": "VPCB9E5F0B4" @aws-cdk/aws-ecs-patterns: } @aws-cdk/aws-ecs-patterns: } @aws-cdk/aws-ecs-patterns: } @aws-cdk/aws-ecs-patterns: with the following mismatches: @aws-cdk/aws-ecs-patterns: Expected 81 but received 80 at /Properties/Port (using objectLike matcher) @aws-cdk/aws-ecs-patterns: 83 | const matchError = hasResourceProperties(this.template, type, props); @aws-cdk/aws-ecs-patterns: 84 | if (matchError) { @aws-cdk/aws-ecs-patterns: > 85 | throw new Error(matchError); @aws-cdk/aws-ecs-patterns: | ^ @aws-cdk/aws-ecs-patterns: 86 | } @aws-cdk/aws-ecs-patterns: 87 | } @aws-cdk/aws-ecs-patterns: 88 | @aws-cdk/aws-ecs-patterns: at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) @aws-cdk/aws-ecs-patterns: at fn (test/fargate/load-balanced-fargate-service-v2.test.ts:709:31) @aws-cdk/aws-ecs-patterns: at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) @aws-cdk/aws-ecs-patterns: â—� When Network Load Balancer › test Fargate multinetworkloadbalanced construct uses custom Port for target group when feature flag is enabled @aws-cdk/aws-ecs-patterns: Template has 2 resources with type AWS::ElasticLoadBalancingV2::TargetGroup, but none match as expected. @aws-cdk/aws-ecs-patterns: The closest result is: @aws-cdk/aws-ecs-patterns: { @aws-cdk/aws-ecs-patterns: "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", @aws-cdk/aws-ecs-patterns: "Properties": { @aws-cdk/aws-ecs-patterns: "Port": 80, @aws-cdk/aws-ecs-patterns: "Protocol": "TCP", @aws-cdk/aws-ecs-patterns: "TargetType": "ip", @aws-cdk/aws-ecs-patterns: "VpcId": { @aws-cdk/aws-ecs-patterns: "Ref": "VPCB9E5F0B4" @aws-cdk/aws-ecs-patterns: } @aws-cdk/aws-ecs-patterns: } @aws-cdk/aws-ecs-patterns: } @aws-cdk/aws-ecs-patterns: with the following mismatches: @aws-cdk/aws-ecs-patterns: Expected 81 but received 80 at /Properties/Port (using objectLike matcher) @aws-cdk/aws-ecs-patterns: 83 | const matchError = hasResourceProperties(this.template, type, props); @aws-cdk/aws-ecs-patterns: 84 | if (matchError) { @aws-cdk/aws-ecs-patterns: > 85 | throw new Error(matchError); @aws-cdk/aws-ecs-patterns: | ^ @aws-cdk/aws-ecs-patterns: 86 | } @aws-cdk/aws-ecs-patterns: 87 | } @aws-cdk/aws-ecs-patterns: 88 | @aws-cdk/aws-ecs-patterns: at Template.hasResourceProperties (../assertions/lib/template.ts:85:13) @aws-cdk/aws-ecs-patterns: at fn (test/fargate/load-balanced-fargate-service-v2.test.ts:823:31) @aws-cdk/aws-ecs-patterns: at Object.<anonymous> (../../../tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts:34:35) ``` </details> ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Collaborator
Author
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Contributor
|
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). |
This file contains hidden or 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
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