do not set stack name in app

Author: anthony-nhs

packages/cdkConstructs/src/apps/createApp.ts

@@ -5,11 +5,9 @@ import {
   StackProps
 } from "aws-cdk-lib"
 import {AwsSolutionsChecks} from "cdk-nag"
-import {getConfigFromEnvVar, getBooleanConfigFromEnvVar, calculateVersionedStackName} from "../config"
+import {getConfigFromEnvVar, getBooleanConfigFromEnvVar} from "../config"
 
 export interface StandardStackProps extends StackProps {
-  /** Fully qualified stack name (potentially versioned). */
-  readonly stackName: string
   /** Semantic version of the deployment (from `versionNumber`). */
   readonly version: string
   /** Git commit identifier baked into the stack. */
@@ -30,7 +28,6 @@ export interface CreateAppParams {
   readonly appName: string
   readonly repoName: string
   readonly driftDetectionGroup: string
-  readonly isStateless?: boolean
   readonly region?: string
   readonly projectType?: string
   readonly publicFacing?: string
@@ -48,7 +45,6 @@ export interface CreateAppParams {
  * @param params.appName - Identifier used for `cdkApp` tagging.
  * @param params.repoName - Repository name stored on the stack tags.
  * @param params.driftDetectionGroup - Baseline drift detection tag (suffixes `-pull-request` when `isPullRequest`).
- * @param params.isStateless - Whether to version the stack name automatically (default `true`).
  * @param params.region - AWS region assigned to the stack environment (default `eu-west-2`).
  * @param params.projectType - Tag describing the project classification (default `Production`).
  * @param params.publicFacing - Public-facing classification tag (default `Y`).
@@ -60,13 +56,11 @@ export function createApp({
   appName,
   repoName,
   driftDetectionGroup,
-  isStateless = true,
   region = "eu-west-2",
   projectType = "Production",
   publicFacing = "Y",
   serviceCategory = "Platinum"
 }: CreateAppParams): { app: App, props: StandardStackProps } {
-  let stackName = getConfigFromEnvVar("stackName")
   const versionNumber = getConfigFromEnvVar("versionNumber")
   const commitId = getConfigFromEnvVar("commitId")
   const isPullRequest = getBooleanConfigFromEnvVar("isPullRequest")
@@ -96,22 +90,16 @@ export function createApp({
   Tags.of(app).add("DeploymentTool", "CDK")
   Tags.of(app).add("version", versionNumber)
   Tags.of(app).add("commit", commitId)
-  Tags.of(app).add("stackName", stackName)
   Tags.of(app).add("cdkApp", appName)
   Tags.of(app).add("repo", repoName)
   Tags.of(app).add("cfnDriftDetectionGroup", cfnDriftDetectionGroup)
 
-  if (isStateless && !isPullRequest) {
-    stackName = calculateVersionedStackName(stackName, versionNumber)
-  }
-
   return {
     app,
     props: {
       env: {
         region
       },
-      stackName,
       version: versionNumber,
       commitId,
       isPullRequest,

packages/cdkConstructs/tests/apps/createApp.test.ts

@@ -51,7 +51,6 @@ describe("createApp", () => {
 
   describe("when all environment variables are set", () => {
     beforeEach(() => {
-      process.env.CDK_CONFIG_stackName = "test-stack"
       process.env.CDK_CONFIG_versionNumber = "1.2.3"
       process.env.CDK_CONFIG_commitId = "abc123def456"
       process.env.CDK_CONFIG_isPullRequest = "false"
@@ -62,19 +61,12 @@ describe("createApp", () => {
       const {app, props} = createApp(buildParams())
 
       expect(app).toBeInstanceOf(App)
-      expect(props.stackName).toBe("test-stack-1-2-3")
       expect(props.version).toBe("1.2.3")
       expect(props.commitId).toBe("abc123def456")
       expect(props.isPullRequest).toBe(false)
       expect(props.env?.region).toBe("eu-west-2")
     })
 
-    test("creates stateful App with correct stackName", () => {
-      const {props} = createApp(buildParams({isStateless: false}))
-
-      expect(props.stackName).toBe("test-stack")
-    })
-
     test("uses custom region when provided", () => {
       const {props} = createApp(buildParams({region: "us-east-1"}))
 
@@ -111,13 +103,12 @@ describe("createApp", () => {
       expect(addTagSpy).toHaveBeenCalledWith("DeploymentTool", "CDK")
       expect(addTagSpy).toHaveBeenCalledWith("version", "1.2.3")
       expect(addTagSpy).toHaveBeenCalledWith("commit", "abc123def456")
-      expect(addTagSpy).toHaveBeenCalledWith("stackName", "test-stack")
       expect(addTagSpy).toHaveBeenCalledWith("cdkApp", "testApp")
       expect(addTagSpy).toHaveBeenCalledWith("repo", "testRepo")
       expect(addTagSpy).toHaveBeenCalledWith("cfnDriftDetectionGroup", "test-drift-group")
 
-      // Verify exactly 20 tags were added
-      expect(addTagSpy).toHaveBeenCalledTimes(20)
+      // Verify exactly 19 tags were added
+      expect(addTagSpy).toHaveBeenCalledTimes(19)
 
       // Restore the spy
       tagsOfSpy.mockRestore()
@@ -133,7 +124,6 @@ describe("createApp", () => {
 
   describe("when isPullRequest is true", () => {
     beforeEach(() => {
-      process.env.CDK_CONFIG_stackName = "pr-stack"
       process.env.CDK_CONFIG_versionNumber = "0.0.1-pr"
       process.env.CDK_CONFIG_commitId = "pr123"
       process.env.CDK_CONFIG_isPullRequest = "true"
@@ -143,19 +133,12 @@ describe("createApp", () => {
     test("correctly modifies props", () => {
       const {props} = createApp(buildParams())
 
-      expect(props.stackName).toBe("pr-stack")
       expect(props.version).toBe("0.0.1-pr")
       expect(props.commitId).toBe("pr123")
       expect(props.isPullRequest).toBe(true)
       expect(props.environment).toBe("test-environment")
     })
 
-    test("creates stateful App with unmodified stackName", () => {
-      const {props} = createApp(buildParams({isStateless: false}))
-
-      expect(props.stackName).toBe("pr-stack")
-    })
-
     test("modifies drift detection group with -pull-request suffix", () => {
       // Spy on Tags.of(app).add to verify tag calls
       const addTagSpy = vi.fn()
@@ -174,19 +157,8 @@ describe("createApp", () => {
   })
 
   describe("when environment variables are missing", () => {
-    test("throws error when stackName is not set", () => {
-      process.env.CDK_CONFIG_versionNumber = "1.0.0"
-      process.env.CDK_CONFIG_commitId = "abc123"
-      process.env.CDK_CONFIG_isPullRequest = "false"
-      process.env.CDK_CONFIG_environment = "test-environment"
-
-      expect(() => {
-        createApp(buildParams())
-      }).toThrow("Environment variable CDK_CONFIG_stackName is not set")
-    })
 
     test("throws error when versionNumber is not set", () => {
-      process.env.CDK_CONFIG_stackName = "test-stack"
       process.env.CDK_CONFIG_commitId = "abc123"
       process.env.CDK_CONFIG_isPullRequest = "false"
       process.env.CDK_CONFIG_environment = "test-environment"
@@ -197,7 +169,6 @@ describe("createApp", () => {
     })
 
     test("throws error when commitId is not set", () => {
-      process.env.CDK_CONFIG_stackName = "test-stack"
       process.env.CDK_CONFIG_versionNumber = "1.0.0"
       process.env.CDK_CONFIG_isPullRequest = "false"
       process.env.CDK_CONFIG_environment = "test-environment"
@@ -208,7 +179,6 @@ describe("createApp", () => {
     })
 
     test("throws error when isPullRequest is not set", () => {
-      process.env.CDK_CONFIG_stackName = "test-stack"
       process.env.CDK_CONFIG_versionNumber = "1.0.0"
       process.env.CDK_CONFIG_commitId = "abc123"
       process.env.CDK_CONFIG_environment = "test-environment"
@@ -218,7 +188,6 @@ describe("createApp", () => {
     })
 
     test("throws error when environment is not set", () => {
-      process.env.CDK_CONFIG_stackName = "test-stack"
       process.env.CDK_CONFIG_versionNumber = "1.0.0"
       process.env.CDK_CONFIG_commitId = "abc123"
       process.env.CDK_CONFIG_isPullRequest = "false"