fix: DRY stasck name and mode

Author: tstephen-nhs

.github/workflows/pull_request.yml

@@ -87,7 +87,7 @@ jobs:
       VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
 
-  cdk_release_code:
+  cdk_release_stateless_code:
     needs:
       [get_issue_number, cdk_package_code, get_commit_id, get_config_values, cdk_release_stateful_code]
     uses: ./.github/workflows/cdk_release_code.yml
@@ -97,7 +97,7 @@ jobs:
     with:
       pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
       BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
-      STACK_NAME: psu-cdk-pr-${{needs.get_issue_number.outputs.issue_number}}
+      STACK_NAME: psu-api-pr-${{needs.get_issue_number.outputs.issue_number}}
       AWS_ENVIRONMENT: dev
       VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -109,7 +109,7 @@ jobs:
       FORWARD_CSOC_LOGS: false
       DEPLOY_CHECK_PRESCRIPTION_STATUS_UPDATE: true
       EXPOSE_GET_STATUS_UPDATES: false
-      SAM_STACK_NAME: psu-pr-${{needs.get_issue_number.outputs.issue_number}}
+      SAM_STACK_NAME: psu-api-pr-${{needs.get_issue_number.outputs.issue_number}}
       ENABLE_POST_DATED_NOTIFICATIONS: true
       REQUIRE_APPLICATION_NAME: false
       ENABLE_BACKUP: false
@@ -126,7 +126,7 @@ jobs:
     with:
       pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
       BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
-      STACK_NAME: psu-cdk-pr-${{needs.get_issue_number.outputs.issue_number}}-stateful
+      STACK_NAME: psu-api-pr-${{needs.get_issue_number.outputs.issue_number}}
       AWS_ENVIRONMENT: dev
       VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -222,7 +222,7 @@ jobs:
       pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
       BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
       APP_NAME: PsuApiSandboxApp
-      STACK_NAME: psu-pr-${{needs.get_issue_number.outputs.issue_number}}-sandbox
+      STACK_NAME: psu-api-pr-${{needs.get_issue_number.outputs.issue_number}}-sandbox
       AWS_ENVIRONMENT: dev
       VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}

packages/cdk/bin/PsuApiApp.ts

@@ -10,6 +10,19 @@ import {PsuApiStatefulStack} from "../stacks/PsuApiStatefulStack"
 
 type StackMode = "stateless" | "stateful"
 
+function mergeStackModeIntoStackName(baseStackName: string, stackMode: StackMode): string {
+  const pullRequestSuffixMatch = baseStackName.match(/-pr-\d+$/i)
+
+  if (!pullRequestSuffixMatch) {
+    return `${baseStackName}-${stackMode}`
+  }
+
+  const pullRequestSuffix = pullRequestSuffixMatch[0]
+  const stackNameWithoutPullRequestSuffix = baseStackName.slice(0, -pullRequestSuffix.length)
+
+  return `${stackNameWithoutPullRequestSuffix}-${stackMode}${pullRequestSuffix}`
+}
+
 function getStackMode(): StackMode {
   const stackMode = getConfigFromEnvVar("stackMode", undefined, "stateless")
 
@@ -29,11 +42,13 @@ async function main() {
   })
 
   const stackMode = getStackMode()
+  const baseStackName = getConfigFromEnvVar("stackName")
+  const modeAwareStackName = mergeStackModeIntoStackName(baseStackName, stackMode)
 
   if (stackMode === "stateless") {
     new PsuApiStatelessStack(app, "PsuApiStatelessStack", {
       ...props,
-      stackName: calculateVersionedStackName(getConfigFromEnvVar("stackName"), props),
+      stackName: calculateVersionedStackName(modeAwareStackName, props),
       samStackName: getConfigFromEnvVar("samStackName"), // TODO: REMOVE THE NEED FOR THIS
       logRetentionInDays: getNumberConfigFromEnvVar("logRetentionInDays"),
       logLevel: getConfigFromEnvVar("logLevel"),
@@ -55,7 +70,7 @@ async function main() {
   // creating a new stack per version.
   new PsuApiStatefulStack(app, "PsuApiStatefulStack", {
     ...props,
-    stackName: getConfigFromEnvVar("stackName"),
+    stackName: modeAwareStackName,
     logRetentionInDays: getNumberConfigFromEnvVar("logRetentionInDays"),
     environment: getConfigFromEnvVar("environment"),
     enableDynamoDBAutoScaling: getBooleanConfigFromEnvVar("enableDynamoDBAutoScaling", undefined, "false"),