Update zoneId

coltenkrauter · Sep 6, 2022 · c5c9909 · c5c9909
1 parent ba49890
commit c5c9909
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/cdk/bin.ts b/cdk/bin.ts
@@ -41,6 +41,7 @@ const main = async () => {
     analyticsReporting: true,
     description: 'The Next stack',
     config,
+    zoneId: dNSStack.zoneId,
   }).addDependency(dNSStack);
 };
 

diff --git a/cdk/config.ts b/cdk/config.ts
@@ -97,7 +97,6 @@ export interface Config {
   stage: string;
   topicBounceComplaintEmail: string;
   topicBounceComplaintName: string;
-  zoneId: string;
 }
 
 export const getConfig = () => {
@@ -128,6 +127,5 @@ export const getConfig = () => {
     stage,
     topicBounceComplaintEmail: `${topicBounceComplaintEmail[stage]}`,
     topicBounceComplaintName: `${prefixCamelCase}BounceComplaint`,
-    zoneId: `${codenameCapitalized}HostedZone`,
   };
 };
diff --git a/cdk/stacks/dns.ts b/cdk/stacks/dns.ts
@@ -12,21 +12,22 @@ interface DNSProps extends StackProps {
 }
 
 export class DNS extends Stack {
-  readonly zone;
+  readonly zoneId;
   constructor(scope: Construct, id: string, props: DNSProps) {
     super(scope, id, props);
 
     // DNS & certs
-    this.zone = new HostedZone(this, props.config.zoneId, {
+    const zone = new HostedZone(this, `${props.config.codenameCapitalized}HostedZone`, {
       zoneName: props.config.domainBase,
     });
-    this.zone.applyRemovalPolicy(RemovalPolicy.DESTROY);
-
+    zone.applyRemovalPolicy(RemovalPolicy.DESTROY);
+
+    this.zoneId = zone.hostedZoneId;
     const metric = new Metric({
       namespace: 'AWS/Route53',
       metricName: 'DNSQueries',
       dimensionsMap: {
-        HostedZoneId: this.zone.hostedZoneId,
+        HostedZoneId: zone.hostedZoneId,
       }
     });
 

diff --git a/cdk/stacks/next.ts b/cdk/stacks/next.ts
@@ -14,16 +14,17 @@ import { Config } from '../config';
 
 interface NextProps extends StackProps {
   config: Config;
+  zoneId: string;
 }
 
 export class Next extends Stack {
   constructor(scope: Construct, id: string, props: NextProps) {
     super(scope, id, props);
 
     // DNS & certs
-    const zone = HostedZone.fromHostedZoneAttributes(this, props.config.zoneId, {
+    const zone = HostedZone.fromHostedZoneAttributes(this, props.zoneId, {
       zoneName: props.config.domainBase,
-      hostedZoneId: props.config.zoneId,
+      hostedZoneId: props.zoneId,
     });
 
     const certificate = new Certificate(this, `${id}Certificate`, {