Cleanup stacks and lookups

NiallJoeMaher · web-flow · commit 05ac04542290 · 2023-01-19T19:46:40.000Z
diff --git a/cdk/cdk.context.json b/cdk/cdk.context.json
@@ -4,7 +4,5 @@
     "eu-west-1a",
     "eu-west-1b",
     "eu-west-1c"
-  ],
-  "ssm:account=764918915129:parameterName=/env/dev/domainName:region=eu-west-1": "dev1.codu.co",
-  "ssm:account=764918915129:parameterName=/env/dev/hostedZoneId:region=eu-west-1": "Z09797183E6CQSVU1LFVP"
+  ]
 }
diff --git a/cdk/lib/app-stack.ts b/cdk/lib/app-stack.ts
@@ -14,8 +14,6 @@ import * as acm from "aws-cdk-lib/aws-certificatemanager";
 import { HttpsRedirect } from "aws-cdk-lib/aws-route53-patterns";
 
 interface Props extends cdk.StageProps {
-  domainName: string;
-  hostedZoneId: string;
   db: cdk.aws_rds.DatabaseInstance;
   production?: boolean;
 }
@@ -27,7 +25,19 @@ export class AppStack extends cdk.Stack {
 
   constructor(scope: Construct, id: string, props: Props) {
     super(scope, id, props);
-    const { domainName, hostedZoneId, db } = props;
+    const { db } = props;
+
+    const domainName = ssm.StringParameter.valueForStringParameter(
+      this,
+      `/env/domainName`,
+      1
+    );
+
+    const hostedZoneId = ssm.StringParameter.valueForStringParameter(
+      this,
+      `/env/hostedZoneId`,
+      1
+    );
 
     const cluster = new ecs.Cluster(this, "ServiceCluster");
 
diff --git a/cdk/lib/app-stage.ts b/cdk/lib/app-stage.ts
@@ -3,21 +3,12 @@ import type { Construct } from "constructs";
 import { StorageStack } from "./storage-stack";
 import { AppStack } from "./app-stack";
 
-interface Props extends cdk.StageProps {
-  domainName: string;
-  hostedZoneId: string;
-}
-
 export class AppStage extends cdk.Stage {
-  constructor(scope: Construct, id: string, props: Props) {
+  constructor(scope: Construct, id: string, props: cdk.StageProps) {
     super(scope, id, props);
 
-    const { domainName, hostedZoneId } = props;
-
     const storageStack = new StorageStack(this, "StorageStack");
     new AppStack(this, "AppStack", {
-      domainName,
-      hostedZoneId,
       db: storageStack.db,
     }).addDependency(storageStack);
   }
diff --git a/cdk/lib/pipeline-stack.ts b/cdk/lib/pipeline-stack.ts
@@ -30,24 +30,12 @@ export class PipelineStack extends cdk.Stack {
         `/env/${env}/accountId`
       );
 
-      const domainName = ssm.StringParameter.valueFromLookup(
-        this,
-        `/env/${env}/domainName`
-      );
-
-      const hostedZoneId = ssm.StringParameter.valueFromLookup(
-        this,
-        `/env/${env}/hostedZoneId`
-      );
-
       return {
         env: {
           // Dummy value on synth prep that causes fail
           account: accountId.includes("dummy-value") ? "123456789" : accountId,
           region: "eu-west-1",
         },
-        domainName: domainName,
-        hostedZoneId: hostedZoneId,
       };
     };
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,5 @@`
`4`	`4`	`"eu-west-1a",`
`5`	`5`	`"eu-west-1b",`
`6`	`6`	`"eu-west-1c"`
`7`		`- ],`
`8`		`- "ssm:account=764918915129:parameterName=/env/dev/domainName:region=eu-west-1": "dev1.codu.co",`
`9`		`- "ssm:account=764918915129:parameterName=/env/dev/hostedZoneId:region=eu-west-1": "Z09797183E6CQSVU1LFVP"`
	`7`	`+ ]`
`10`	`8`	`}`