Use correct client-facing domain name

Author: jacobwinch

cdk/bin/cdk.ts

@@ -73,9 +73,8 @@ export const reportPropsCode: ReportProps = {
 	stack: 'mobile-notifications',
 	stage: 'CODE',
 	app: 'report',
-	domainName: 'report.notifications-aws.code.dev-guardianapis.com.',
+	domainName: 'report.notifications.code.dev-guardianapis.com',
 	instanceMetricGranularity: '5Minute',
-	hostedZoneId: 'Z1KWCH1OWGPZH9',
 	loggingStreamParameterName: '/account/services/logging.stream.name.code',
 	minAsgSize: 1,
 };
@@ -87,8 +86,7 @@ export const reportPropsProd: ReportProps = {
 	stack: 'mobile-notifications',
 	stage: 'PROD',
 	app: 'report',
-	domainName: 'report.notifications-aws.guardianapis.com.',
-	hostedZoneId: 'Z295WGPL9FP7J9',
+	domainName: 'report.notifications.guardianapis.com',
 	instanceMetricGranularity: '1Minute',
 	loggingStreamParameterName: '/account/services/logging.stream.name',
 	minAsgSize: 3,

cdk/lib/__snapshots__/report.test.ts.snap

@@ -237,13 +237,7 @@ exports[`The Report stack matches the snapshot for CODE 1`] = `
     "CertificateReportE388917B": {
       "DeletionPolicy": "Retain",
       "Properties": {
-        "DomainName": "report.notifications-aws.code.dev-guardianapis.com.",
-        "DomainValidationOptions": [
-          {
-            "DomainName": "report.notifications-aws.code.dev-guardianapis.com.",
-            "HostedZoneId": "Z1KWCH1OWGPZH9",
-          },
-        ],
+        "DomainName": "report.notifications.code.dev-guardianapis.com",
         "Tags": [
           {
             "Key": "App",
@@ -1684,13 +1678,7 @@ exports[`The Report stack matches the snapshot for PROD 1`] = `
     "CertificateReportE388917B": {
       "DeletionPolicy": "Retain",
       "Properties": {
-        "DomainName": "report.notifications-aws.guardianapis.com.",
-        "DomainValidationOptions": [
-          {
-            "DomainName": "report.notifications-aws.guardianapis.com.",
-            "HostedZoneId": "Z295WGPL9FP7J9",
-          },
-        ],
+        "DomainName": "report.notifications.guardianapis.com",
         "Tags": [
           {
             "Key": "App",

cdk/lib/report.ts

@@ -15,8 +15,9 @@ import { InstanceClass, InstanceSize, InstanceType } from 'aws-cdk-lib/aws-ec2';
 import { CfnInclude } from 'aws-cdk-lib/cloudformation-include';
 
 export interface ReportProps extends GuStackProps {
-	domainName: string;
-	hostedZoneId: string;
+	domainName:
+		| 'report.notifications.guardianapis.com'
+		| 'report.notifications.code.dev-guardianapis.com';
 	instanceMetricGranularity: '1Minute' | '5Minute';
 	loggingStreamParameterName:
 		| '/account/services/logging.stream.name'
@@ -42,7 +43,6 @@ export class Report extends GuStack {
 			app,
 			certificateProps: {
 				domainName: props.domainName,
-				hostedZoneId: props.hostedZoneId,
 			},
 			instanceMetricGranularity: props.instanceMetricGranularity,
 			instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.MICRO),

report/conf/report.yaml

@@ -59,6 +59,11 @@ Parameters:
     Type: String
     Description: The domain name of the ELB, should contain the trailing dot stuff.zone.example.com.
 Resources:
+  # There is a CNAME in NS1 which is pointing at this record, so we have
+  #   report.notifications.code.dev-guardianapis.com (NS1) >
+  #   report.notifications-aws.code.dev-guardianapis.com (Route53) >
+  #   mobile-no-loadbala-oy9k2af3i5g8-1565189307.eu-west-1.elb.amazonaws.com (ELB DNS name)
+  # Let's just drop this entirely and use GuCname to point NS1 straight at the new load balancer?
   DnsRecord:
     Type: AWS::Route53::RecordSet
     Properties: