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.

Sign up for GitHub

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

Jump to bottom

fix(route53): fix cross account delegation deployment dependency #19047

Merged
merged 3 commits into from Feb 21, 2022
Merged

fix(route53): fix cross account delegation deployment dependency #19047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c4ab54
fix(route53): fix cross account delegation deployment dependency
phoefflin Feb 18, 2022
cf44b31
Merge branch 'master' into route53-dependency-error
phoefflin Feb 18, 2022
d11da35
Merge branch 'master' into route53-dependency-error
mergify[bot] Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/@aws-cdk/aws-route53/lib/record-set.ts
View file
Open in desktop
Expand Up @@ -690,13 +690,13 @@ export class CrossAccountZoneDelegationRecord extends CoreConstruct {

const role = iam.Role.fromRoleArn(this, 'cross-account-zone-delegation-handler-role', provider.roleArn);

role.addToPrincipalPolicy(new iam.PolicyStatement({
const addToPrinciplePolicyResult = role.addToPrincipalPolicy(new iam.PolicyStatement({
effect: iam.Effect.ALLOW,
actions: ['sts:AssumeRole'],
resources: [props.delegationRole.roleArn],
}));

new CustomResource(this, 'CrossAccountZoneDelegationCustomResource', {
const customResource = new CustomResource(this, 'CrossAccountZoneDelegationCustomResource', {
resourceType: CROSS_ACCOUNT_ZONE_DELEGATION_RESOURCE_TYPE,
serviceToken: provider.serviceToken,
removalPolicy: props.removalPolicy,
Expand All @@ -709,5 +709,9 @@ export class CrossAccountZoneDelegationRecord extends CoreConstruct {
TTL: (props.ttl || Duration.days(2)).toSeconds(),
},
});

if (addToPrinciplePolicyResult.policyDependable) {
customResource.node.addDependency(addToPrinciplePolicyResult.policyDependable);
}
}
}
24 changes: 15 additions & 9 deletions packages/@aws-cdk/aws-route53/test/integ.cross-account-zone-delegation.expected.json
View file
Open in desktop
Expand Up @@ -154,6 +154,9 @@
},
"TTL": 172800
},
"DependsOn": [
"DelegationWithZoneIdcrossaccountzonedelegationhandlerrolePolicy5170A69B"
],
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
Expand Down Expand Up @@ -184,7 +187,7 @@
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "AssetParametersd17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602S3Bucket200D9216"
"Ref": "AssetParameters7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8aS3BucketC1366C27"
},
"S3Key": {
"Fn::Join": [
Expand All @@ -197,7 +200,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParametersd17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602S3VersionKey0E5C26F0"
"Ref": "AssetParameters7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8aS3VersionKeyEE72CEF8"
}
]
}
Expand All @@ -210,7 +213,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParametersd17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602S3VersionKey0E5C26F0"
"Ref": "AssetParameters7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8aS3VersionKeyEE72CEF8"
}
]
}
Expand Down Expand Up @@ -315,22 +318,25 @@
},
"TTL": 172800
},
"DependsOn": [
"DelegationWithZoneNamecrossaccountzonedelegationhandlerrolePolicy86996882"
],
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
}
},
"Parameters": {
"AssetParametersd17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602S3Bucket200D9216": {
"AssetParameters7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8aS3BucketC1366C27": {
"Type": "String",
"Description": "S3 bucket for asset \"d17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602\""
"Description": "S3 bucket for asset \"7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8a\""
},
"AssetParametersd17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602S3VersionKey0E5C26F0": {
"AssetParameters7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8aS3VersionKeyEE72CEF8": {
"Type": "String",
"Description": "S3 key for asset version \"d17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602\""
"Description": "S3 key for asset version \"7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8a\""
},
"AssetParametersd17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602ArtifactHash37FB4D0C": {
"AssetParameters7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8aArtifactHashAADF3168": {
"Type": "String",
"Description": "Artifact hash for asset \"d17df4f90e07a972e8f7b00dddbae8e3eba45a212226d2b714dcd28dded69602\""
"Description": "Artifact hash for asset \"7625bcc3bbd65c490a92d42790a563e31dc02c18006ef272338c8c788849bb8a\""
}
}
}
51 changes: 28 additions & 23 deletions packages/@aws-cdk/aws-route53/test/record-set.test.ts
View file
Open in desktop
Expand Up @@ -737,33 +737,38 @@ describe('record set', () => {

// THEN
const childHostedZones = [
{ name: 'sub.myzone.com', id: 'ChildHostedZone4B14AC71' },
{ name: 'anothersub.myzone.com', id: 'ChildHostedZone2A37198F0' },
{ name: 'sub.myzone.com', id: 'ChildHostedZone4B14AC71', dependsOn: 'DelegationcrossaccountzonedelegationhandlerrolePolicy1E157602' },
{ name: 'anothersub.myzone.com', id: 'ChildHostedZone2A37198F0', dependsOn: 'Delegation2crossaccountzonedelegationhandlerrolePolicy713BEAC3' },
];

for (var childHostedZone of childHostedZones) {
Template.fromStack(stack).hasResourceProperties('Custom::CrossAccountZoneDelegation', {
ServiceToken: {
'Fn::GetAtt': [
'CustomCrossAccountZoneDelegationCustomResourceProviderHandler44A84265',
'Arn',
],
},
AssumeRoleArn: {
'Fn::GetAtt': [
'ParentHostedZoneCrossAccountZoneDelegationRole95B1C36E',
'Arn',
],
},
ParentZoneName: 'myzone.com',
DelegatedZoneName: childHostedZone.name,
DelegatedZoneNameServers: {
'Fn::GetAtt': [
childHostedZone.id,
'NameServers',
],
Template.fromStack(stack).hasResource('Custom::CrossAccountZoneDelegation', {
Properties: {
ServiceToken: {
'Fn::GetAtt': [
'CustomCrossAccountZoneDelegationCustomResourceProviderHandler44A84265',
'Arn',
],
},
AssumeRoleArn: {
'Fn::GetAtt': [
'ParentHostedZoneCrossAccountZoneDelegationRole95B1C36E',
'Arn',
],
},
ParentZoneName: 'myzone.com',
DelegatedZoneName: childHostedZone.name,
DelegatedZoneNameServers: {
'Fn::GetAtt': [
childHostedZone.id,
'NameServers',
],
},
TTL: 60,
},
TTL: 60,
DependsOn: [
childHostedZone.dependsOn,
],
});
}
});
Expand Down