Skip to content

fix(core): Fixing Log Group creation for Public Hosted Zone logging #406

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

Merged
merged 3 commits into from
Sep 28, 2020
Merged

fix(core): Fixing Log Group creation for Public Hosted Zone logging #406

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
1d2f9b3
fix(core): Fixing multiplep public hsoted zones
naveenkoppula Sep 28, 2020
a64b743
Ignore previous Domain while disassociate in Update action
naveenkoppula Sep 28, 2020
57bf3cd
adding hosted zone check on delete action also
naveenkoppula Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/deployments/cdk/src/apps/phase-1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ export async function deploy({ acceleratorConfig, accountStacks, accounts, conte
acceleratorPrefix: context.acceleratorPrefix,
domain: phz,
});
return new LogGroup(zonesStack, `Route53HostedZoneLogGroup`, {
return new LogGroup(zonesStack, `Route53HostedZoneLogGroup${pascalCase(phz)}`, {
logGroupName,
roleArn: logGroupLambdaRoleOutput.roleArn,
});
Expand Down
19 changes: 17 additions & 2 deletions src/lib/custom-resources/cdk-associate-hosted-zones/runtime/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,16 @@ async function onUpdate(event: CloudFormationCustomResourceUpdateEvent) {
};
// authorize association of VPC with Hosted zones when VPC and Hosted Zones are defined in two different accounts
if (vpcAccountId !== hostedZoneAccountId) {
await throttlingBackOff(() => hostedZoneRoute53.createVPCAssociationAuthorization(hostedZoneProps).promise());
try {
await throttlingBackOff(() => hostedZoneRoute53.createVPCAssociationAuthorization(hostedZoneProps).promise());
} catch (e) {
if (e.code === 'NoSuchHostedZone') {
console.info(`No Domain exists with ID "${hostedZoneId}"; ignore this error and continue`);
continue;
} else {
throw new Error(e);
}
}
}

// associate VPC with Hosted zones
Expand Down Expand Up @@ -273,7 +282,13 @@ async function onDelete(event: CloudFormationCustomResourceDeleteEvent) {
};
// authorize association of VPC with Hosted zones when VPC and Hosted Zones are defined in two different accounts
if (vpcAccountId !== hostedZoneAccountId) {
await throttlingBackOff(() => hostedZoneRoute53.createVPCAssociationAuthorization(hostedZoneProps).promise());
try {
await throttlingBackOff(() => hostedZoneRoute53.createVPCAssociationAuthorization(hostedZoneProps).promise());
} catch (e) {
console.error(`Ignoring error while deleting Association and stack ${hostedZoneId} to VPC "${vpcName}"`);
console.error(e);
continue;
}
}

// associate VPC with Hosted zones
Expand Down