From 0d4038722b9e4aa953753149aa077ee3eac09cb6 Mon Sep 17 00:00:00 2001 From: Samson Keung Date: Thu, 20 Jun 2024 18:51:26 -0700 Subject: [PATCH] Revert "fix: route53 CrossAccountZoneDelegationRecord fails at deployment time with imported `delegatedZone` (#30440)" This reverts commit a3d9b10ad9036486961f74e852493aa9684cfdb4. --- packages/aws-cdk-lib/aws-route53/README.md | 2 +- .../aws-cdk-lib/aws-route53/lib/record-set.ts | 4 ---- .../aws-route53/test/record-set.test.ts | 21 ------------------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/packages/aws-cdk-lib/aws-route53/README.md b/packages/aws-cdk-lib/aws-route53/README.md index 6fd275a2eb478..1c26a12541242 100644 --- a/packages/aws-cdk-lib/aws-route53/README.md +++ b/packages/aws-cdk-lib/aws-route53/README.md @@ -313,7 +313,7 @@ const delegationRole = iam.Role.fromRoleArn(this, 'DelegationRole', delegationRo // create the record new route53.CrossAccountZoneDelegationRecord(this, 'delegate', { - delegatedZone: subZone, // Note that an imported HostedZone is not supported as Name Servers info will not be available + delegatedZone: subZone, parentHostedZoneName: 'someexample.com', // or you can use parentHostedZoneId delegationRole, }); diff --git a/packages/aws-cdk-lib/aws-route53/lib/record-set.ts b/packages/aws-cdk-lib/aws-route53/lib/record-set.ts index 3ee6f4aee669c..6706443b1f260 100644 --- a/packages/aws-cdk-lib/aws-route53/lib/record-set.ts +++ b/packages/aws-cdk-lib/aws-route53/lib/record-set.ts @@ -929,10 +929,6 @@ export class CrossAccountZoneDelegationRecord extends Construct { throw Error('Only one of parentHostedZoneName and parentHostedZoneId is supported'); } - if (!props.delegatedZone.hostedZoneNameServers) { - throw Error(`Not able to retrieve Name Servers for ${props.delegatedZone.zoneName} due to it being imported.`); - } - const provider = CrossAccountZoneDelegationProvider.getOrCreateProvider(this, CROSS_ACCOUNT_ZONE_DELEGATION_RESOURCE_TYPE); const role = iam.Role.fromRoleArn(this, 'cross-account-zone-delegation-handler-role', provider.roleArn); diff --git a/packages/aws-cdk-lib/aws-route53/test/record-set.test.ts b/packages/aws-cdk-lib/aws-route53/test/record-set.test.ts index 9974237f6292c..20abd698ee68b 100644 --- a/packages/aws-cdk-lib/aws-route53/test/record-set.test.ts +++ b/packages/aws-cdk-lib/aws-route53/test/record-set.test.ts @@ -893,27 +893,6 @@ describe('record set', () => { }); }); - test('CrossAccountZoneDelegationRecord should throw if delegatedZone is imported', () => { - // GIVEN - const stack = new Stack(); - const parentZone = new route53.PublicHostedZone(stack, 'ParentHostedZone', { - zoneName: 'myzone.com', - }); - - // WHEN - const childZone = route53.PublicHostedZone.fromPublicHostedZoneAttributes(stack, 'ChildHostedZone', { - hostedZoneId: 'fake-id', - zoneName: 'fake-name', - }); - - //THEN - expect(() => new route53.CrossAccountZoneDelegationRecord(stack, 'Delegation', { - delegatedZone: childZone, - parentHostedZoneId: parentZone.hostedZoneId, - delegationRole: parentZone.crossAccountZoneDelegationRole!, - })).toThrow(/Not able to retrieve Name Servers for fake-name due to it being imported./); - }); - testDeprecated('Cross account zone delegation record with parentHostedZoneName', () => { // GIVEN const stack = new Stack();