Test fixes

Author: connoravo-nhs

packages/cdkConstructs/src/constructs/RestApiGateway.ts

@@ -41,7 +41,7 @@ export interface RestApiGatewayProps {
   /** Stack name, used as prefix for resource naming and DNS records. */
   readonly stackName: string
   /** Stack UUID, used as a unique identifier for the stack. Optional */
-  readonly stackUUID?: string
+  readonly stackUuid?: string
   /** Shared retention period for API and deployment-related log groups. */
   readonly logRetentionInDays: number
   /** Truststore object key to enable mTLS; leave undefined to disable mTLS or when enableServiceDomain is false. */
@@ -58,9 +58,9 @@ export interface RestApiGatewayProps {
   readonly enableServiceDomain?: boolean
 }
 
-const getTrustStoreKeyPrefix = (stackName: string, stackUUID?: string) => {
-  if (stackUUID) {
-    return `cpt-api/${stackName}-${stackUUID}-truststore`
+const getTrustStoreKeyPrefix = (stackName: string, stackUuid?: string) => {
+  if (stackUuid) {
+    return `cpt-api/${stackName}-${stackUuid}-truststore`
   } else {
     return `cpt-api/${stackName}-truststore`
   }

packages/cdkConstructs/tests/constructs/RestApiGateway.test.ts

@@ -351,7 +351,7 @@ describe("RestApiGateway with mTLS and stackUUID", () => {
         PolicyDocument?: {
           Statement?: Array<{
             Action?: Array<string>
-            Resource?: string | Array<string>
+            Resource?: unknown | Array<unknown>
           }>
         }
       }
@@ -372,7 +372,7 @@ describe("RestApiGateway with mTLS and stackUUID", () => {
 
     const apiGateway = new RestApiGateway(stack, "TestApiGateway", {
       stackName: "test-stack",
-      stackUUID: "f47ac10b",
+      stackUUID: "f47ac10b-58cc-4372-a567-0e02b2c3d479",
       logRetentionInDays: 30,
       mutualTlsTrustStoreKey: "truststore.pem",
       forwardCsocLogs: false,
@@ -385,7 +385,7 @@ describe("RestApiGateway with mTLS and stackUUID", () => {
 
     const template = Template.fromStack(stack)
     template.hasResourceProperties("Custom::CDKBucketDeployment", {
-      DestinationKeyPrefix: "cpt-api/test-stack-f47ac10b-truststore"
+      DestinationBucketKeyPrefix: "cpt-api/test-stack-f47ac10b-58cc-4372-a567-0e02b2c3d479-truststore"
     })
 
     const policies = template.findResources("AWS::IAM::ManagedPolicy")
@@ -403,7 +403,13 @@ describe("RestApiGateway with mTLS and stackUUID", () => {
           ? statement.Resource
           : (statement.Resource ? [statement.Resource] : [])
 
-        return resources.some((resource) => resource.includes(expectedTrustStoreObjectPath))
+        return resources.some((resource) => {
+          if (typeof resource === "string") {
+            return resource.includes(expectedTrustStoreObjectPath)
+          }
+
+          return JSON.stringify(resource).includes(expectedTrustStoreObjectPath)
+        })
       })
     })