diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.assets.json index 65773b4fcf8a5..9097a6075ba90 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.assets.json @@ -1,16 +1,16 @@ { - "version": "48.0.0", + "version": "54.0.0", "files": { - "deff5a7208caabf2f50313aa86429d4cb985034ac06ee1f8be414fe481bc8a37": { + "933eb093e7cd4dd9d88c649481e0f3ef55d3ae2fc72d69f2d7f21cba9456bdaa": { "displayName": "ReplicaStack Template", "source": { "path": "ReplicaStack.template.json", "packaging": "file" }, "destinations": { - "222222222222-ca-central-1-f2c7d5fc": { + "222222222222-ca-central-1-aee4076c": { "bucketName": "cdk-hnb659fds-assets-222222222222-ca-central-1", - "objectKey": "deff5a7208caabf2f50313aa86429d4cb985034ac06ee1f8be414fe481bc8a37.json", + "objectKey": "933eb093e7cd4dd9d88c649481e0f3ef55d3ae2fc72d69f2d7f21cba9456bdaa.json", "region": "ca-central-1", "assumeRoleArn": "arn:${AWS::Partition}:iam::222222222222:role/cdk-hnb659fds-file-publishing-role-222222222222-ca-central-1" } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.metadata.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.metadata.json new file mode 100644 index 0000000000000..4b3514b877a9b --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.metadata.json @@ -0,0 +1,133 @@ +{ + "/ReplicaStack": [ + { + "type": "aws:cdk:creationStack", + "data": [ + " (/private/tmp/commandcode-502/-Users-sanya-Documents-opensource/7cdd4ce6-8830-42a4-9259-42d2aca9827f/scratchpad/generate-synth.js:13:22)", + "...node internals..." + ] + } + ], + "/ReplicaStack/Replica": [ + { + "type": "aws:cdk:warning", + "data": "The source table is imported without a resource policy and cannot be granted multi-account replication permissions. You must manually configure multi-account replication permissions on the source table. Call sourceTable.grants.multiAccountReplicationTo('${Token[TOKEN.24]}') on the actual source table stack. [ack: @aws-cdk/aws-dynamodb:multiAccountReplicaSourceWithoutPolicy]", + "trace": [ + "Annotations.addMessage (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/annotations.js:244:29)", + "Annotations.addWarningV2 (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/annotations.js:113:18)", + "new TableV2MultiAccountReplica (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/aws-dynamodb/lib/table-v2.js:1040:47)", + "new TableV2MultiAccountReplica (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/prop-injectable.js:32:13)", + "Object. (/private/tmp/commandcode-502/-Users-sanya-Documents-opensource/7cdd4ce6-8830-42a4-9259-42d2aca9827f/scratchpad/generate-synth.js:18:1)", + "Module._compile (node:internal/modules/cjs/loader:1871:14)", + "Object..js (node:internal/modules/cjs/loader:2002:10)", + "Module.load (node:internal/modules/cjs/loader:1594:32)", + "Module._load (node:internal/modules/cjs/loader:1396:12)", + "wrapModuleLoad (node:internal/modules/cjs/loader:255:19)", + "Module.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:154:5)", + "node:internal/main/run_main_module:33:47" + ] + }, + { + "type": "aws:cdk:hasPhysicalName", + "data": { + "Ref": "ReplicaDDFB2A87" + } + } + ], + "/ReplicaStack/ReplicaPartial": [ + { + "type": "aws:cdk:warning", + "data": "The source table is imported without a resource policy and cannot be granted multi-account replication permissions. You must manually configure multi-account replication permissions on the source table. Call sourceTable.grants.multiAccountReplicationTo('${Token[TOKEN.35]}') on the actual source table stack. [ack: @aws-cdk/aws-dynamodb:multiAccountReplicaSourceWithoutPolicy]", + "trace": [ + "Annotations.addMessage (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/annotations.js:244:29)", + "Annotations.addWarningV2 (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/annotations.js:113:18)", + "new TableV2MultiAccountReplica (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/aws-dynamodb/lib/table-v2.js:1040:47)", + "new TableV2MultiAccountReplica (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/prop-injectable.js:32:13)", + "Object. (/private/tmp/commandcode-502/-Users-sanya-Documents-opensource/7cdd4ce6-8830-42a4-9259-42d2aca9827f/scratchpad/generate-synth.js:27:1)", + "Module._compile (node:internal/modules/cjs/loader:1871:14)", + "Object..js (node:internal/modules/cjs/loader:2002:10)", + "Module.load (node:internal/modules/cjs/loader:1594:32)", + "Module._load (node:internal/modules/cjs/loader:1396:12)", + "wrapModuleLoad (node:internal/modules/cjs/loader:255:19)", + "Module.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:154:5)", + "node:internal/main/run_main_module:33:47" + ] + }, + { + "type": "aws:cdk:hasPhysicalName", + "data": { + "Ref": "ReplicaPartial106191BD" + } + } + ], + "/ReplicaStack/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + }, + { + "type": "aws:cdk:creationStack", + "data": [ + "addBootstrapVersionRule (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/stack-synthesizers/stack-synthesizer.js:302:19)", + "DefaultStackSynthesizer.addBootstrapVersionRule (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/stack-synthesizers/stack-synthesizer.js:202:9)", + "DefaultStackSynthesizer.synthesize (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/stack-synthesizers/default-synthesizer.js:343:18)", + "/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:475: (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:475:3)", + "visit (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:532:9)", + "visit (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:529:9)", + "synthesizeTree (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:468:5)", + "synthesize (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:96:5)", + "App.synth (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/stage.js:220:96)", + "App.synth (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/app.js:208:27)" + ] + } + ], + "/ReplicaStack/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + }, + { + "type": "aws:cdk:creationStack", + "data": [ + "addBootstrapVersionRule (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/stack-synthesizers/stack-synthesizer.js:310:5)", + "DefaultStackSynthesizer.addBootstrapVersionRule (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/stack-synthesizers/stack-synthesizer.js:202:9)", + "DefaultStackSynthesizer.synthesize (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/stack-synthesizers/default-synthesizer.js:343:18)", + "/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:475: (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:475:3)", + "visit (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:532:9)", + "visit (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:529:9)", + "synthesizeTree (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:468:5)", + "synthesize (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/private/synthesis.js:96:5)", + "App.synth (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/stage.js:220:96)", + "App.synth (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/core/lib/app.js:208:27)" + ] + } + ], + "/ReplicaStack/Replica/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ReplicaDDFB2A87" + }, + { + "type": "aws:cdk:creationStack", + "data": [ + "new TableV2MultiAccountReplica (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/aws-dynamodb/lib/table-v2.js:1002:30)", + " (/private/tmp/commandcode-502/-Users-sanya-Documents-opensource/7cdd4ce6-8830-42a4-9259-42d2aca9827f/scratchpad/generate-synth.js:18:1)", + "...node internals..." + ] + } + ], + "/ReplicaStack/ReplicaPartial/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "ReplicaPartial106191BD" + }, + { + "type": "aws:cdk:creationStack", + "data": [ + "new TableV2MultiAccountReplica (/Users/sanya/Documents/opensource/aws-cdk/packages/aws-cdk-lib/aws-dynamodb/lib/table-v2.js:1002:30)", + " (/private/tmp/commandcode-502/-Users-sanya-Documents-opensource/7cdd4ce6-8830-42a4-9259-42d2aca9827f/scratchpad/generate-synth.js:27:1)", + "...node internals..." + ] + } + ] +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.template.json index 79684d5d30e8a..6920358fb26dd 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/ReplicaStack.template.json @@ -14,8 +14,8 @@ { "Action": [ "dynamodb:ReadDataForReplication", - "dynamodb:ReplicateSettings", - "dynamodb:WriteDataForReplication" + "dynamodb:WriteDataForReplication", + "dynamodb:ReplicateSettings" ], "Condition": { "StringEquals": { @@ -42,6 +42,49 @@ }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" + }, + "ReplicaPartial106191BD": { + "Type": "AWS::DynamoDB::GlobalTable", + "Properties": { + "GlobalTableSourceArn": "arn:aws:dynamodb:eu-west-1:12345678:table/dynamic-source-table", + "Replicas": [ + { + "GlobalTableSettingsReplicationMode": "ENABLED", + "Region": "ca-central-1", + "ResourcePolicy": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "dynamodb:ReadDataForReplication", + "dynamodb:WriteDataForReplication", + "dynamodb:ReplicateSettings" + ], + "Condition": { + "StringEquals": { + "aws:SourceAccount": [ + "222222222222", + "12345678" + ] + } + }, + "Effect": "Allow", + "Principal": { + "Service": "replication.dynamodb.amazonaws.com" + }, + "Resource": "*", + "Sid": "AllowReplicationService" + } + ], + "Version": "2012-10-17" + } + } + } + ], + "TableName": "dynamic-source-table" + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" } }, "Parameters": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/cdk.out index 523a9aac37cbf..8b137891791fe 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"48.0.0"} \ No newline at end of file + diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/manifest.json index bd597c9755719..30f1521e7120f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "50.0.0", + "version": "54.0.0", "artifacts": { "ReplicaStack.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::222222222222:role/cdk-hnb659fds-deploy-role-222222222222-ca-central-1", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::222222222222:role/cdk-hnb659fds-cfn-exec-role-222222222222-ca-central-1", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-222222222222-ca-central-1/deff5a7208caabf2f50313aa86429d4cb985034ac06ee1f8be414fe481bc8a37.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-222222222222-ca-central-1/933eb093e7cd4dd9d88c649481e0f3ef55d3ae2fc72d69f2d7f21cba9456bdaa.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -33,88 +33,9 @@ "dependencies": [ "ReplicaStack.assets" ], - "metadata": { - "/ReplicaStack/Replica": [ - { - "type": "aws:cdk:warning", - "data": "The source table is imported without a resource policy and cannot be granted multi-account replication permissions. You must manually configure multi-account replication permissions on the source table. Call sourceTable.grants.multiAccountReplicationTo('${Token[TOKEN.1231]}') on the actual source table stack. [ack: @aws-cdk/aws-dynamodb:multiAccountReplicaSourceWithoutPolicy]" - }, - { - "type": "aws:cdk:hasPhysicalName", - "data": { - "Ref": "ReplicaDDFB2A87" - } - } - ], - "/ReplicaStack/Replica/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "ReplicaDDFB2A87" - } - ], - "/ReplicaStack/BootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" - } - ], - "/ReplicaStack/CheckBootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" - } - ] - }, + "additionalMetadataFile": "ReplicaStack.metadata.json", "displayName": "ReplicaStack" }, - "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.assets": { - "type": "cdk:asset-manifest", - "properties": { - "file": "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.assets.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60": { - "type": "aws:cloudformation:stack", - "environment": "aws://unknown-account/unknown-region", - "properties": { - "templateFile": "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.template.json", - "terminationProtection": false, - "validateOnSynth": false, - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", - "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", - "requiresBootstrapStackVersion": 6, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", - "additionalDependencies": [ - "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.assets" - ], - "lookupRole": { - "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", - "requiresBootstrapStackVersion": 8, - "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" - } - }, - "dependencies": [ - "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.assets" - ], - "metadata": { - "/ImportedReplicaTest/DefaultTest/DeployAssert/BootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" - } - ], - "/ImportedReplicaTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ - { - "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" - } - ] - }, - "displayName": "ImportedReplicaTest/DefaultTest/DeployAssert" - }, "Tree": { "type": "cdk:tree", "properties": { @@ -127,7 +48,6 @@ "module": "aws-cdk-lib", "flags": { "@aws-cdk/aws-signer:signingProfileNamePassedToCfn": { - "userValue": true, "recommendedValue": true, "explanation": "Pass signingProfileName to CfnSigningProfile" }, @@ -146,7 +66,6 @@ } }, "@aws-cdk/aws-ecs-patterns:secGroupsDisablesImplicitOpenListener": { - "userValue": true, "recommendedValue": true, "explanation": "Disable implicit openListener when custom security groups are provided" }, @@ -172,7 +91,6 @@ } }, "@aws-cdk/aws-lambda:recognizeLayerVersion": { - "userValue": true, "recommendedValue": true, "explanation": "Enable this feature flag to opt in to the updated logical id calculation for Lambda Version created using the `fn.currentVersion`." }, @@ -184,7 +102,6 @@ } }, "@aws-cdk/core:checkSecretUsage": { - "userValue": true, "recommendedValue": true, "explanation": "Enable this flag to make it impossible to accidentally use SecretValues in unsafe locations" }, @@ -196,207 +113,166 @@ "explanation": "What regions to include in lookup tables of environment agnostic stacks" }, "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": { - "userValue": true, "recommendedValue": true, "explanation": "ECS extensions will automatically add an `awslogs` driver if no logging is specified" }, "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": { - "userValue": true, "recommendedValue": true, "explanation": "Enable this feature flag to have Launch Templates generated by the `InstanceRequireImdsv2Aspect` use unique names." }, "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": { - "userValue": true, "recommendedValue": true, "explanation": "ARN format used by ECS. In the new ARN format, the cluster name is part of the resource ID." }, "@aws-cdk/aws-iam:minimizePolicies": { - "userValue": true, "recommendedValue": true, "explanation": "Minimize IAM policies by combining Statements" }, "@aws-cdk/core:validateSnapshotRemovalPolicy": { - "userValue": true, "recommendedValue": true, "explanation": "Error on snapshot removal policies on resources that do not support it." }, "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": { - "userValue": true, "recommendedValue": true, "explanation": "Generate key aliases that include the stack name" }, "@aws-cdk/aws-s3:createDefaultLoggingPolicy": { - "userValue": true, "recommendedValue": true, "explanation": "Enable this feature flag to create an S3 bucket policy by default in cases where an AWS service would automatically create the Policy if one does not exist." }, "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": { - "userValue": true, "recommendedValue": true, "explanation": "Restrict KMS key policy for encrypted Queues a bit more" }, "@aws-cdk/aws-apigateway:disableCloudWatchRole": { - "userValue": true, "recommendedValue": true, "explanation": "Make default CloudWatch Role behavior safe for multiple API Gateways in one environment" }, "@aws-cdk/core:enablePartitionLiterals": { - "userValue": true, "recommendedValue": true, "explanation": "Make ARNs concrete if AWS partition is known" }, "@aws-cdk/aws-events:eventsTargetQueueSameAccount": { - "userValue": true, "recommendedValue": true, "explanation": "Event Rules may only push to encrypted SQS queues in the same account" }, "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": { - "userValue": true, "recommendedValue": true, "explanation": "Avoid setting the \"ECS\" deployment controller when adding a circuit breaker" }, "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": { - "userValue": true, "recommendedValue": true, "explanation": "Enable this feature to create default policy names for imported roles that depend on the stack the role is in." }, "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": { - "userValue": true, "recommendedValue": true, "explanation": "Use S3 Bucket Policy instead of ACLs for Server Access Logging" }, "@aws-cdk/aws-route53-patters:useCertificate": { - "userValue": true, "recommendedValue": true, "explanation": "Use the official `Certificate` resource instead of `DnsValidatedCertificate`" }, "@aws-cdk/customresources:installLatestAwsSdkDefault": { - "userValue": false, "recommendedValue": false, "explanation": "Whether to install the latest SDK by default in AwsCustomResource" }, "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": { - "userValue": true, "recommendedValue": true, "explanation": "Use unique resource name for Database Proxy" }, "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": { - "userValue": true, "recommendedValue": true, "explanation": "Remove CloudWatch alarms from deployment group" }, "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": { - "userValue": true, "recommendedValue": true, "explanation": "Include authorizer configuration in the calculation of the API deployment logical ID." }, "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": { - "userValue": true, "recommendedValue": true, "explanation": "Define user data for a launch template by default when a machine image is provided." }, "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": { - "userValue": true, "recommendedValue": true, "explanation": "SecretTargetAttachments uses the ResourcePolicy of the attached Secret." }, "@aws-cdk/aws-redshift:columnId": { - "userValue": true, "recommendedValue": true, "explanation": "Whether to use an ID to track Redshift column changes" }, "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": { - "userValue": true, "recommendedValue": true, "explanation": "Enable AmazonEMRServicePolicy_v2 managed policies" }, "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": { - "userValue": true, "recommendedValue": true, "explanation": "Restrict access to the VPC default security group" }, "@aws-cdk/aws-apigateway:requestValidatorUniqueId": { - "userValue": true, "recommendedValue": true, "explanation": "Generate a unique id for each RequestValidator added to a method" }, "@aws-cdk/aws-kms:aliasNameRef": { - "userValue": true, "recommendedValue": true, "explanation": "KMS Alias name and keyArn will have implicit reference to KMS Key" }, "@aws-cdk/aws-kms:applyImportedAliasPermissionsToPrincipal": { - "userValue": true, "recommendedValue": true, "explanation": "Enable grant methods on Aliases imported by name to use kms:ResourceAliases condition" }, "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": { - "userValue": true, "recommendedValue": true, "explanation": "Generate a launch template when creating an AutoScalingGroup" }, "@aws-cdk/core:includePrefixInUniqueNameGeneration": { - "userValue": true, "recommendedValue": true, "explanation": "Include the stack prefix in the stack name generation process" }, "@aws-cdk/aws-efs:denyAnonymousAccess": { - "userValue": true, "recommendedValue": true, "explanation": "EFS denies anonymous clients accesses" }, "@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby": { - "userValue": true, "recommendedValue": true, "explanation": "Enables support for Multi-AZ with Standby deployment for opensearch domains" }, "@aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion": { - "userValue": true, "recommendedValue": true, "explanation": "Enables aws-lambda-nodejs.Function to use the latest available NodeJs runtime as the default" }, "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, mount targets will have a stable logicalId that is linked to the associated subnet." }, "@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, a scope of InstanceParameterGroup for AuroraClusterInstance with each parameters will change." }, "@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, will always use the arn for identifiers for CfnSourceApiAssociation in the GraphqlApi construct rather than id." }, "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, creating an RDS database cluster from a snapshot will only render credentials for snapshot credentials." }, "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the CodeCommit source action is using the default branch name 'main'." }, "@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the logical ID of a Lambda permission for a Lambda action includes an alarm ID." }, "@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": { - "userValue": true, "recommendedValue": true, "explanation": "Enables Pipeline to set the default value for crossAccountKeys to false." }, "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": { - "userValue": true, "recommendedValue": true, "explanation": "Enables Pipeline to set the default pipeline type to V2." }, "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, IAM Policy created from KMS key grant will reduce the resource scope to this key only." }, @@ -408,7 +284,6 @@ } }, "@aws-cdk/aws-eks:nodegroupNameAttribute": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, nodegroupName attribute of the provisioned EKS NodeGroup will not have the cluster name prefix." }, @@ -417,22 +292,18 @@ "explanation": "When enabled, EKS V2 clusters will use the native OIDC provider resource AWS::IAM::OIDCProvider instead of creating the OIDCProvider with a custom resource (iam.OpenIDConnectProvider)." }, "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the default volume type of the EBS volume will be GP3" }, "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, remove default deployment alarm settings" }, "@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": { - "userValue": false, "recommendedValue": false, "explanation": "When enabled, the custom resource used for `AwsCustomResource` will configure the `logApiResponseData` property as true by default" }, "@aws-cdk/aws-s3:keepNotificationInImportedBucket": { - "userValue": false, "recommendedValue": false, "explanation": "When enabled, Adding notifications to a bucket in the current stack will not remove notification from imported stack." }, @@ -444,52 +315,42 @@ } }, "@aws-cdk/core:explicitStackTags": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, stack tags need to be assigned explicitly on a Stack." }, "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, we will only grant the necessary permissions when users specify cloudwatch log group through logConfiguration" }, "@aws-cdk/aws-dynamodb:resourcePolicyPerReplica": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled will allow you to specify a resource policy per replica, and not copy the source table policy to all replicas" }, "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, initOptions.timeout and resourceSignalTimeout values will be summed together." }, "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, a Lambda authorizer Permission created when using GraphqlApi will be properly scoped with a SourceArn." }, "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the value of property `instanceResourceId` in construct `DatabaseInstanceReadReplica` will be set to the correct value which is `DbiResourceId` instead of currently `DbInstanceArn`" }, "@aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, CFN templates added with `cfn-include` will error if the template contains Resource Update or Create policies with CFN Intrinsics that include non-primitive values." }, "@aws-cdk/aws-lambda-nodejs:sdkV3ExcludeSmithyPackages": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, both `@aws-sdk` and `@smithy` packages will be excluded from the Lambda Node.js 18.x runtime to prevent version mismatches in bundled applications." }, "@aws-cdk/aws-stepfunctions-tasks:fixRunEcsTaskPolicy": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the resource of IAM Run Ecs policy generated by SFN EcsRunTask will reference the definition, instead of constructing ARN." }, "@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the BastionHost construct will use the latest Amazon Linux 2023 AMI, instead of Amazon Linux 2." }, @@ -501,32 +362,26 @@ } }, "@aws-cdk/aws-route53-targets:userPoolDomainNameMethodWithoutCustomResource": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, use a new method for DNS Name of user pool domain target without creating a custom resource." }, "@aws-cdk/aws-elasticloadbalancingV2:albDualstackWithoutPublicIpv4SecurityGroupRulesDefault": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the default security group ingress rules will allow IPv6 ingress from anywhere" }, "@aws-cdk/aws-iam:oidcRejectUnauthorizedConnections": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the default behaviour of OIDC provider will reject unauthorized connections" }, "@aws-cdk/core:enableAdditionalMetadataCollection": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, CDK will expand the scope of usage data collected to better inform CDK development and improve communication for security concerns and emerging issues." }, "@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy": { - "userValue": false, "recommendedValue": false, "explanation": "[Deprecated] When enabled, Lambda will create new inline policies with AddToRolePolicy instead of adding to the Default Policy Statement" }, "@aws-cdk/aws-s3:setUniqueReplicationRoleName": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, CDK will automatically generate a unique role name that is used for s3 object replication." }, @@ -538,17 +393,14 @@ } }, "@aws-cdk/aws-events:requireEventBusPolicySid": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, grantPutEventsTo() will use resource policies with Statement IDs for service principals." }, "@aws-cdk/core:aspectPrioritiesMutating": { - "userValue": true, "recommendedValue": true, "explanation": "When set to true, Aspects added by the construct library on your behalf will be given a priority of MUTATING." }, "@aws-cdk/aws-dynamodb:retainTableReplica": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, table replica will be default to the removal policy of source table unless specified otherwise." }, @@ -564,17 +416,14 @@ } }, "@aws-cdk/aws-stepfunctions:useDistributedMapResultWriterV2": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the resultWriterV2 property of DistributedMap will be used insted of resultWriter" }, "@aws-cdk/s3-notifications:addS3TrustKeyPolicyForSnsSubscriptions": { - "userValue": true, "recommendedValue": true, "explanation": "Add an S3 trust policy to a KMS key resource policy for SNS subscriptions." }, "@aws-cdk/aws-ec2:requirePrivateSubnetsForEgressOnlyInternetGateway": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, the EgressOnlyGateway resource is only created if private subnets are defined in the dual-stack VPC." }, @@ -583,17 +432,14 @@ "explanation": "When enabled, use resource IDs for VPC V2 migration" }, "@aws-cdk/aws-s3:publicAccessBlockedByDefault": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, setting any combination of options for BlockPublicAccess will automatically set true for any options not defined." }, "@aws-cdk/aws-lambda:useCdkManagedLogGroup": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, CDK creates and manages loggroup for the lambda function" }, "@aws-cdk/aws-elasticloadbalancingv2:networkLoadBalancerWithSecurityGroupByDefault": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, Network Load Balancer will be created with a security group by default." }, @@ -605,17 +451,98 @@ } }, "@aws-cdk/aws-ecs-patterns:uniqueTargetGroupId": { - "userValue": true, "recommendedValue": true, "explanation": "When enabled, ECS patterns will generate unique target group IDs to prevent conflicts during load balancer replacement" }, "@aws-cdk/aws-route53-patterns:useDistribution": { "recommendedValue": true, "explanation": "Use the `Distribution` resource instead of `CloudFrontWebDistribution`" + }, + "@aws-cdk/aws-cloudfront:defaultFunctionRuntimeV2_0": { + "recommendedValue": true, + "explanation": "Use cloudfront-js-2.0 as the default runtime for CloudFront Functions" + }, + "@aws-cdk/aws-elasticloadbalancingv2:usePostQuantumTlsPolicy": { + "recommendedValue": true, + "explanation": "When enabled, HTTPS/TLS listeners use post-quantum TLS policy by default" + }, + "@aws-cdk/core:automaticL1Traits": { + "recommendedValue": true, + "explanation": "Automatically use the default L1 traits for L1 constructs`", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-batch:defaultToAL2023": { + "recommendedValue": true, + "explanation": "Use AL2023 as the default imageType for EC2 Batch compute environments instead of the deprecated AL2" + }, + "@aws-cdk/aws-eks:defaultToAL2023": { + "recommendedValue": true, + "explanation": "Use AL2023 as the default AMI type for EKS managed node groups using non-GPU instance types instead of the deprecated AL2" + }, + "@aws-cdk/core:annotationsInValidationReport": { + "recommendedValue": true, + "explanation": "Include construct annotations (warnings and errors) in the policy validation report" + }, + "@aws-cdk/core:defaultCrossStackReferences": { + "recommendedValue": "weak", + "explanation": "Controls whether cross-region stack references are strong, weak, or both", + "unconfiguredBehavesLike": { + "v2": "strong" + } } } } + }, + "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "ImportedReplicaTestDefaultTestDeployAssert1EFA3D60.assets" + ], + "metadata": { + "/ImportedReplicaTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/ImportedReplicaTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "ImportedReplicaTest/DefaultTest/DeployAssert" } }, - "minimumCliVersion": "2.1101.0" -} \ No newline at end of file + "minimumCliVersion": "2.1131.0" +} diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/tree.json index 113e2f76dff80..372f44f49b040 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.js.snapshot/tree.json @@ -1 +1 @@ -{"version":"tree-0.1","tree":{"id":"App","path":"","constructInfo":{"fqn":"aws-cdk-lib.App","version":"0.0.0"},"children":{"ReplicaStack":{"id":"ReplicaStack","path":"ReplicaStack","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"ImportedSource":{"id":"ImportedSource","path":"ReplicaStack/ImportedSource","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.TableBaseV2","version":"0.0.0"}},"Replica":{"id":"Replica","path":"ReplicaStack/Replica","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.TableBaseV2","version":"0.0.0"},"children":{"Resource":{"id":"Resource","path":"ReplicaStack/Replica/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.CfnGlobalTable","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::DynamoDB::GlobalTable","aws:cdk:cloudformation:props":{"globalTableSourceArn":"arn:aws:dynamodb:eu-west-1:12345678:table/MultiAccountGlobalTable","replicas":[{"region":"ca-central-1","resourcePolicy":{"policyDocument":{"Statement":[{"Action":["dynamodb:ReadDataForReplication","dynamodb:ReplicateSettings","dynamodb:WriteDataForReplication"],"Condition":{"StringEquals":{"aws:SourceAccount":["222222222222","12345678"]}},"Effect":"Allow","Principal":{"Service":"replication.dynamodb.amazonaws.com"},"Resource":"*","Sid":"AllowReplicationService"}],"Version":"2012-10-17"}},"globalTableSettingsReplicationMode":"ENABLED"}],"tableName":"MultiAccountGlobalTable"}}}}},"BootstrapVersion":{"id":"BootstrapVersion","path":"ReplicaStack/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"ReplicaStack/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}},"ImportedReplicaTest":{"id":"ImportedReplicaTest","path":"ImportedReplicaTest","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTest","version":"0.0.0"},"children":{"DefaultTest":{"id":"DefaultTest","path":"ImportedReplicaTest/DefaultTest","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTestCase","version":"0.0.0"},"children":{"Default":{"id":"Default","path":"ImportedReplicaTest/DefaultTest/Default","constructInfo":{"fqn":"constructs.Construct","version":"10.4.5"}},"DeployAssert":{"id":"DeployAssert","path":"ImportedReplicaTest/DefaultTest/DeployAssert","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"BootstrapVersion":{"id":"BootstrapVersion","path":"ImportedReplicaTest/DefaultTest/DeployAssert/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"ImportedReplicaTest/DefaultTest/DeployAssert/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}}}}}},"Tree":{"id":"Tree","path":"Tree","constructInfo":{"fqn":"constructs.Construct","version":"10.4.5"}}}}} \ No newline at end of file +{"version":"tree-0.1","tree":{"id":"App","path":"","constructInfo":{"fqn":"aws-cdk-lib.App","version":"0.0.0"},"children":{"ReplicaStack":{"id":"ReplicaStack","path":"ReplicaStack","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"ImportedSource":{"id":"ImportedSource","path":"ReplicaStack/ImportedSource","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.TableBaseV2","version":"0.0.0"}},"Replica":{"id":"Replica","path":"ReplicaStack/Replica","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.TableV2MultiAccountReplica","version":"0.0.0"},"children":{"Resource":{"id":"Resource","path":"ReplicaStack/Replica/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.CfnGlobalTable","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::DynamoDB::GlobalTable","aws:cdk:cloudformation:logicalId":"ReplicaDDFB2A87","aws:cdk:cloudformation:props":{"globalTableSourceArn":"arn:aws:dynamodb:eu-west-1:12345678:table/MultiAccountGlobalTable","replicas":[{"region":"ca-central-1","resourcePolicy":{"policyDocument":{"Statement":[{"Action":["dynamodb:ReadDataForReplication","dynamodb:WriteDataForReplication","dynamodb:ReplicateSettings"],"Condition":{"StringEquals":{"aws:SourceAccount":["222222222222","12345678"]}},"Effect":"Allow","Principal":{"Service":"replication.dynamodb.amazonaws.com"},"Resource":"*","Sid":"AllowReplicationService"}],"Version":"2012-10-17"}},"globalTableSettingsReplicationMode":"ENABLED"}],"tableName":"MultiAccountGlobalTable"}}}}},"ImportedPartial":{"id":"ImportedPartial","path":"ReplicaStack/ImportedPartial","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.TableBaseV2","version":"0.0.0"}},"ReplicaPartial":{"id":"ReplicaPartial","path":"ReplicaStack/ReplicaPartial","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.TableV2MultiAccountReplica","version":"0.0.0"},"children":{"Resource":{"id":"Resource","path":"ReplicaStack/ReplicaPartial/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_dynamodb.CfnGlobalTable","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::DynamoDB::GlobalTable","aws:cdk:cloudformation:logicalId":"ReplicaPartial106191BD","aws:cdk:cloudformation:props":{"globalTableSourceArn":"arn:aws:dynamodb:eu-west-1:12345678:table/dynamic-source-table","replicas":[{"region":"ca-central-1","resourcePolicy":{"policyDocument":{"Statement":[{"Action":["dynamodb:ReadDataForReplication","dynamodb:WriteDataForReplication","dynamodb:ReplicateSettings"],"Condition":{"StringEquals":{"aws:SourceAccount":["222222222222","12345678"]}},"Effect":"Allow","Principal":{"Service":"replication.dynamodb.amazonaws.com"},"Resource":"*","Sid":"AllowReplicationService"}],"Version":"2012-10-17"}},"globalTableSettingsReplicationMode":"ENABLED"}],"tableName":"dynamic-source-table"}}}}},"BootstrapVersion":{"id":"BootstrapVersion","path":"ReplicaStack/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"ReplicaStack/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}},"Tree":{"id":"Tree","path":"Tree","constructInfo":{"fqn":"constructs.Construct","version":"10.6.0"}}}}} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.ts index d4dee93b94f14..02c2204cc1249 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb-v2.cross-account-replica-imported.ts @@ -23,7 +23,7 @@ * 4. Before you commit, set both accounts to dummy values, run integ test in dry run mode, and then push the snapshot. */ -import { App, RemovalPolicy, Stack } from 'aws-cdk-lib'; +import { App, Lazy, RemovalPolicy, Stack } from 'aws-cdk-lib'; import { IntegTest } from '@aws-cdk/integ-tests-alpha'; import * as dynamodb from 'aws-cdk-lib/aws-dynamodb'; @@ -51,6 +51,25 @@ new dynamodb.TableV2MultiAccountReplica(replicaStack, 'Replica', { removalPolicy: RemovalPolicy.DESTROY, }); +// Test: partially tokenized source ARN (concrete account/region, tokenized table name). +// The table name is a Lazy token that resolves at synthesis time, but the account +// and region are concrete. This exercises the fix in TableV2MultiAccountReplica +// that extracts concrete account/region from the ARN even when the resourceName is +// tokenized (rather than falling back to the replica stack's own account/region). +const dynamicTableName = Lazy.string({ produce: () => 'dynamic-source-table' }); +const importedPartial = dynamodb.TableV2.fromTableArn( + replicaStack, + 'ImportedPartial', + `arn:aws:dynamodb:eu-west-1:${account}:table/${dynamicTableName}`, +); + +new dynamodb.TableV2MultiAccountReplica(replicaStack, 'ReplicaPartial', { + tableName: 'MultiAccountGlobalTable', + replicaSourceTable: importedPartial, + globalTableSettingsReplicationMode: dynamodb.GlobalTableSettingsReplicationMode.ALL, + removalPolicy: RemovalPolicy.DESTROY, +}); + new IntegTest(app, 'ImportedReplicaTest', { testCases: [replicaStack], }); diff --git a/packages/aws-cdk-lib/aws-dynamodb/lib/table-v2.ts b/packages/aws-cdk-lib/aws-dynamodb/lib/table-v2.ts index ab04fdc708835..5f865618a707f 100644 --- a/packages/aws-cdk-lib/aws-dynamodb/lib/table-v2.ts +++ b/packages/aws-cdk-lib/aws-dynamodb/lib/table-v2.ts @@ -1603,11 +1603,21 @@ export class TableV2MultiAccountReplica extends TableBaseV2 { let sourceAccount = sourceStack.account; let sourceRegion = sourceStack.region; - // For imported tables, extract account/region from ARN instead of stack - if (!Token.isUnresolved(props.replicaSourceTable!.tableArn)) { - const arnParts = this.stack.splitArn(props.replicaSourceTable!.tableArn, ArnFormat.SLASH_RESOURCE_NAME); - if (arnParts.account) sourceAccount = arnParts.account; - if (arnParts.region) sourceRegion = arnParts.region; + // For imported tables, extract account/region from ARN even when the ARN is + // only partially tokenized (e.g., the resourceName is a token but the + // account and region are concrete). `splitArn` returns concrete values for + // parts that are not tokens and undefined for parts that are tokenized, so + // the per-field `Token.isUnresolved` checks below handle the latter case. + // The previous broad `Token.isUnresolved(tableArn)` guard caused the + // validation to fall back to the stack that owns the imported resource, + // leading to false-positive "must be in a different account/region" errors + // when the source and replica stacks happened to share an environment. + const arnParts = this.stack.splitArn(props.replicaSourceTable!.tableArn, ArnFormat.SLASH_RESOURCE_NAME); + if (arnParts.account && !Token.isUnresolved(arnParts.account)) { + sourceAccount = arnParts.account; + } + if (arnParts.region && !Token.isUnresolved(arnParts.region)) { + sourceRegion = arnParts.region; } // Validate different account (skip if token) diff --git a/packages/aws-cdk-lib/aws-dynamodb/test/table-v2.test.ts b/packages/aws-cdk-lib/aws-dynamodb/test/table-v2.test.ts index b78409b4c2f73..cb947bb72bbe9 100644 --- a/packages/aws-cdk-lib/aws-dynamodb/test/table-v2.test.ts +++ b/packages/aws-cdk-lib/aws-dynamodb/test/table-v2.test.ts @@ -4116,6 +4116,32 @@ test('TableV2MultiAccountReplica on imported table does not throw', () => { expect(warnings[0].entry.data).toContain('manually configure multi-account replication permissions'); }); +test('TableV2MultiAccountReplica does not throw with partially tokenized source ARN', () => { + const app = new App(); + const replicaStack = new Stack(app, 'ReplicaStack', { env: { account: '222222222222', region: 'us-east-1' } }); + + // Source ARN has concrete account (`111111111111`) and region (`us-east-2`), + // but a tokenized table name. `Token.isUnresolved(tableArn)` returns true for + // the whole ARN (because the resourceName is a token), but `splitArn` + // correctly extracts the concrete account/region components. The + // validation must use those extracted components, not fall back to the + // replica stack's own account/region — that fallback would falsely trigger + // "must be in a different account" because the fallback equals + // `this.stack.account`. + const dynamicTableName = Lazy.string({ produce: () => 'dynamic-source-table' }); + const importedTable = TableV2.fromTableArn( + replicaStack, + 'ImportedTable', + `arn:aws:dynamodb:us-east-2:111111111111:table/${dynamicTableName}`, + ); + + expect(() => { + new TableV2MultiAccountReplica(replicaStack, 'ReplicaTable', { + replicaSourceTable: importedTable, + }); + }).not.toThrow(); +}); + test('TableV2MultiAccountReplica works with fromTableArn without key schema', () => { const app = new App(); const replicaStack = new Stack(app, 'ReplicaStack', { env: { account: '222222222222', region: 'us-east-1' } });