From 59b2b5044a03c6bbef0b102ab556f1b364ad400d Mon Sep 17 00:00:00 2001
From: Alice Fage <afage@linz.govt.nz>
Date: Thu, 2 Nov 2023 11:22:38 +1300
Subject: [PATCH] fix: tidy constants names

---
 infra/constants.ts    | 14 +++++++-------
 infra/rds/argo.rds.ts |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/infra/constants.ts b/infra/constants.ts
index d8a2d2f14..31338f643 100644
--- a/infra/constants.ts
+++ b/infra/constants.ts
@@ -7,16 +7,16 @@ export const DbName = 'ArgoDbAF'
 /* CloudFormation Output to access from CDK8s */
 export const CfnOutputKeys = {
   Karpenter: {
-    ServiceAccountName: 'KarpenterServiceAccountNameAF',
-    ServiceAccountRoleArn: 'KarpenterServiceAccountRoleArnAF',
-    ClusterEndpoint: 'ClusterEndpointAF',
-    DefaultInstanceProfile: 'DefaultInstanceProfileAF',
+    ServiceAccountName: 'KarpenterServiceAccountName',
+    ServiceAccountRoleArn: 'KarpenterServiceAccountRoleArn',
+    ClusterEndpoint: 'ClusterEndpoint',
+    DefaultInstanceProfile: 'DefaultInstanceProfile',
   },
   FluentBit: {
-    ServiceAccountName: 'FluentBitServiceAccountNameAF',
+    ServiceAccountName: 'FluentBitServiceAccountName',
   },
   Argo: {
-    RunnerServiceAccountName: 'ArgoRunnerServiceAccountNameAF',
-    TempBucketName: 'TempBucketNameAF',
+    RunnerServiceAccountName: 'ArgoRunnerServiceAccountName',
+    TempBucketName: 'TempBucketName',
   },
 };
diff --git a/infra/rds/argo.rds.ts b/infra/rds/argo.rds.ts
index 234d34d65..b4d01441f 100644
--- a/infra/rds/argo.rds.ts
+++ b/infra/rds/argo.rds.ts
@@ -17,7 +17,7 @@ export class ArgoRdsStack extends Stack {
   constructor(scope: App, id: string, props?: StackProps) {
     super(scope, id, props);
     this.vpc = ec2.Vpc.fromLookup(this, 'Vpc', { tags: { BaseVPC: 'true' } });
-    this.db = new rds.DatabaseInstance(this, 'ArgoDbAF', {
+    this.db = new rds.DatabaseInstance(this, 'ArgoDb', {
       // database encryption is on by default, can be changed using rds.force_ssl=0 in a parameterGroup
       engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_3 }),
       instanceType: ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.MICRO),