refactor: centralise constants

Author: tstephen-nhs

packages/cdkConstructs/src/constants.ts

@@ -0,0 +1,16 @@
+import {Fn} from "aws-cdk-lib"
+
+export const ACCOUNT_RESOURCES = {
+  CloudwatchEncryptionKMSPolicyArn: Fn.importValue("account-resources:CloudwatchEncryptionKMSPolicyArn"),
+  CloudwatchLogsKmsKeyArn: Fn.importValue("account-resources:CloudwatchLogsKmsKeyArn"),
+  EpsDomainName: Fn.importValue("eps-route53-resources:EPS-domain"),
+  EpsZoneId: Fn.importValue("eps-route53-resources:EPS-ZoneID"),
+  TrustStoreBucket: Fn.importValue("account-resources:TrustStoreBucket"),
+  TrustStoreBucketKMSKey: Fn.importValue("account-resources:TrustStoreBucketKMSKey"),
+  TrustStoreDeploymentBucket: Fn.importValue("account-resources:TrustStoreDeploymentBucket")
+}
+export const LAMBDA_RESOURCES = {
+  LambdaInsightsLogGroupPolicy: Fn.importValue("lambda-resources:LambdaInsightsLogGroupPolicy"),
+  SplunkDeliveryStream: Fn.importValue("lambda-resources:SplunkDeliveryStream"),
+  SplunkSubscriptionFilterRole: Fn.importValue("lambda-resources:SplunkSubscriptionFilterRole")
+}

packages/cdkConstructs/src/constructs/RestApiGateway.ts

@@ -1,4 +1,4 @@
-import {Fn, RemovalPolicy} from "aws-cdk-lib"
+import {RemovalPolicy} from "aws-cdk-lib"
 import {
   CfnStage,
   EndpointType,
@@ -27,6 +27,7 @@ import {BucketDeployment, Source} from "aws-cdk-lib/aws-s3-deployment"
 import {ARecord, HostedZone, RecordTarget} from "aws-cdk-lib/aws-route53"
 import {ApiGateway as ApiGatewayTarget} from "aws-cdk-lib/aws-route53-targets"
 import {NagSuppressions} from "cdk-nag"
+import {ACCOUNT_RESOURCES, LAMBDA_RESOURCES} from "../constants"
 
 export interface RestApiGatewayProps {
   /** Stack name, used as prefix for resource naming and DNS records. */
@@ -72,26 +73,26 @@ export class RestApiGateway extends Construct {
 
     // Imports
     const cloudWatchLogsKmsKey = Key.fromKeyArn(
-      this, "cloudWatchLogsKmsKey", Fn.importValue("account-resources:CloudwatchLogsKmsKeyArn"))
+      this, "cloudWatchLogsKmsKey", ACCOUNT_RESOURCES.CloudwatchLogsKmsKeyArn)
 
     const splunkDeliveryStream = Stream.fromStreamArn(
-      this, "SplunkDeliveryStream", Fn.importValue("lambda-resources:SplunkDeliveryStream"))
+      this, "SplunkDeliveryStream", LAMBDA_RESOURCES.SplunkDeliveryStream)
 
     const splunkSubscriptionFilterRole = Role.fromRoleArn(
-      this, "splunkSubscriptionFilterRole", Fn.importValue("lambda-resources:SplunkSubscriptionFilterRole"))
+      this, "splunkSubscriptionFilterRole", LAMBDA_RESOURCES.SplunkSubscriptionFilterRole)
 
     const trustStoreBucket = Bucket.fromBucketArn(
-      this, "TrustStoreBucket", Fn.importValue("account-resources:TrustStoreBucket"))
+      this, "TrustStoreBucket", ACCOUNT_RESOURCES.TrustStoreBucket)
 
     const trustStoreDeploymentBucket = Bucket.fromBucketArn(
-      this, "TrustStoreDeploymentBucket", Fn.importValue("account-resources:TrustStoreDeploymentBucket"))
+      this, "TrustStoreDeploymentBucket", ACCOUNT_RESOURCES.TrustStoreDeploymentBucket)
 
     const trustStoreBucketKmsKey = Key.fromKeyArn(
-      this, "TrustStoreBucketKmsKey", Fn.importValue("account-resources:TrustStoreBucketKMSKey"))
+      this, "TrustStoreBucketKmsKey", ACCOUNT_RESOURCES.TrustStoreBucketKMSKey)
 
-    const epsDomainName: string = Fn.importValue("eps-route53-resources:EPS-domain")
+    const epsDomainName: string = ACCOUNT_RESOURCES.EpsDomainName
     const hostedZone = HostedZone.fromHostedZoneAttributes(this, "HostedZone", {
-      hostedZoneId: Fn.importValue("eps-route53-resources:EPS-ZoneID"),
+      hostedZoneId: ACCOUNT_RESOURCES.EpsZoneId,
       zoneName: epsDomainName
     })
     const serviceDomainName = `${props.stackName}.${epsDomainName}`

packages/cdkConstructs/src/constructs/lambdaSharedResources.ts

@@ -1,5 +1,5 @@
 import {Construct} from "constructs"
-import {Fn, RemovalPolicy} from "aws-cdk-lib"
+import {RemovalPolicy} from "aws-cdk-lib"
 import {Architecture, ILayerVersion, LayerVersion} from "aws-cdk-lib/aws-lambda"
 import {IKey, Key} from "aws-cdk-lib/aws-kms"
 import {CfnLogGroup, CfnSubscriptionFilter, LogGroup} from "aws-cdk-lib/aws-logs"
@@ -13,6 +13,7 @@ import {
 } from "aws-cdk-lib/aws-iam"
 import {NagSuppressions} from "cdk-nag"
 import {LAMBDA_INSIGHTS_LAYER_ARNS} from "../config"
+import {ACCOUNT_RESOURCES, LAMBDA_RESOURCES} from "../constants"
 import {addSuppressions} from "../utils/helpers"
 import {CfnDeliveryStream} from "aws-cdk-lib/aws-kinesisfirehose"
 import {Stream} from "aws-cdk-lib/aws-kinesis"
@@ -46,14 +47,17 @@ export const createSharedLambdaResources = (
     additionalPolicies,
     architecture,
     cloudWatchLogsKmsKey = Key.fromKeyArn(
-      scope, "cloudWatchLogsKmsKey", Fn.importValue("account-resources:CloudwatchLogsKmsKeyArn")),
+      scope, "cloudWatchLogsKmsKey", ACCOUNT_RESOURCES.CloudwatchLogsKmsKeyArn),
     cloudwatchEncryptionKMSPolicy = ManagedPolicy.fromManagedPolicyArn(
-      scope, "cloudwatchEncryptionKMSPolicyArn", Fn.importValue("account-resources:CloudwatchEncryptionKMSPolicyArn")),
+      scope,
+      "cloudwatchEncryptionKMSPolicyArn",
+      ACCOUNT_RESOURCES.CloudwatchEncryptionKMSPolicyArn
+    ),
     splunkDeliveryStream,
     splunkSubscriptionFilterRole = Role.fromRoleArn(
-      scope, "splunkSubscriptionFilterRole", Fn.importValue("lambda-resources:SplunkSubscriptionFilterRole")),
+      scope, "splunkSubscriptionFilterRole", LAMBDA_RESOURCES.SplunkSubscriptionFilterRole),
     lambdaInsightsLogGroupPolicy = ManagedPolicy.fromManagedPolicyArn(
-      scope, "lambdaInsightsLogGroupPolicy", Fn.importValue("lambda-resources:LambdaInsightsLogGroupPolicy")),
+      scope, "lambdaInsightsLogGroupPolicy", LAMBDA_RESOURCES.LambdaInsightsLogGroupPolicy),
     addSplunkSubscriptionFilter = true
   } = props
   const insightsLambdaLayerArn = architecture === Architecture.ARM_64
@@ -84,7 +88,7 @@ export const createSharedLambdaResources = (
       })
     } else {
       const splunkDeliveryStreamImport = Stream.fromStreamArn(
-        scope, "SplunkDeliveryStream", Fn.importValue("lambda-resources:SplunkDeliveryStream"))
+        scope, "SplunkDeliveryStream", LAMBDA_RESOURCES.SplunkDeliveryStream)
       new CfnSubscriptionFilter(scope, "LambdaLogsSplunkSubscriptionFilter", {
         destinationArn: splunkDeliveryStreamImport.streamArn,
         filterPattern: "",