Skip to content

New: [AEA-6523] - Allow unique stack ID as well as stack name #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connoravo-nhs merged 10 commits into from
Apr 16, 2026
Merged

New: [AEA-6523] - Allow unique stack ID as well as stack name #669

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cff8f68
Adjust rest api gateway to work around mTLS naming issues where required
connoravo-nhs Apr 16, 2026
15359f9
Adjust function
connoravo-nhs Apr 16, 2026
dbb6e4f
Add tests
connoravo-nhs Apr 16, 2026
2eda01c
Add tests
connoravo-nhs Apr 16, 2026
5300eb6
Test fixes
connoravo-nhs Apr 16, 2026
e92a0fd
Add contextual understanding comment
connoravo-nhs Apr 16, 2026
9e62720
Add service name prop, adjust tests
connoravo-nhs Apr 16, 2026
e4f9b3b
Make it optional
connoravo-nhs Apr 16, 2026
6819a7a
service name is optional already
connoravo-nhs Apr 16, 2026
0414762
Allow undefined
connoravo-nhs Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/cdkConstructs/src/constructs/RestApiGateway.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import {addSuppressions} from "../utils/helpers"
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
Comment thread
connoravo-nhs marked this conversation as resolved.
Outdated
/** 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. */
Expand All @@ -56,6 +58,14 @@ export interface RestApiGatewayProps {
readonly enableServiceDomain?: boolean
}

const getTrustStoreKeyPrefix = (stackName: string, stackUUID?: string) => {
if (stackUUID) {
return `cpt-api/${stackName}-${stackUUID}-truststore`
} else {
return `cpt-api/${stackName}-truststore`
}
}

/** Creates a regional REST API with standard logging, DNS, and optional mTLS/CSOC integration. */
export class RestApiGateway extends Construct {
/** Created API Gateway instance. */
Expand Down Expand Up @@ -158,7 +168,7 @@ export class RestApiGateway extends Construct {
let mtlsConfig: MTLSConfig | undefined

if (enableServiceDomain && props.mutualTlsTrustStoreKey) {
const trustStoreKeyPrefix = `cpt-api/${props.stackName}-truststore`
const trustStoreKeyPrefix = getTrustStoreKeyPrefix(props.stackName, props.stackUUID)
const logGroup = new LogGroup(this, "LambdaLogGroup", {
Comment thread
connoravo-nhs marked this conversation as resolved.
Comment thread
connoravo-nhs marked this conversation as resolved.
encryptionKey: cloudWatchLogsKmsKey,
logGroupName: `/aws/lambda/${props.stackName}-truststore-deployment`,
Expand Down
Loading