Revert "chore: optimise params of getConfigFromEnvVar"

This reverts commit 50be43a.

Author: tstephen-nhs

packages/cdkConstructs/src/config/index.ts

@@ -4,8 +4,8 @@ import {StandardStackProps} from "../apps/createApp"
 
 export function getConfigFromEnvVar(
   varName: string,
-  defaultValue?: string,
-  prefix: string = "CDK_CONFIG_"
+  prefix: string = "CDK_CONFIG_",
+  defaultValue: string | undefined = undefined
 ): string {
   const value = process.env[prefix + varName]
   if (!value) {
@@ -19,19 +19,19 @@ export function getConfigFromEnvVar(
 
 export function getBooleanConfigFromEnvVar(
   varName: string,
-  defaultValue?: string,
-  prefix: string = "CDK_CONFIG_"
+  prefix: string = "CDK_CONFIG_",
+  defaultValue: string | undefined = undefined
 ): boolean {
-  const value = getConfigFromEnvVar(varName, defaultValue, prefix)
+  const value = getConfigFromEnvVar(varName, prefix, defaultValue)
   return value.toLowerCase().trim() === "true"
 }
 
 export function getNumberConfigFromEnvVar(
   varName: string,
-  defaultValue?: string,
-  prefix: string = "CDK_CONFIG_"
+  prefix: string = "CDK_CONFIG_",
+  defaultValue: string | undefined = undefined
 ): number {
-  const value = getConfigFromEnvVar(varName, defaultValue, prefix)
+  const value = getConfigFromEnvVar(varName, prefix, defaultValue)
   return Number(value)
 }
 

packages/cdkConstructs/tests/config/index.test.ts

@@ -96,7 +96,7 @@ describe("config helpers", () => {
   test("getConfigFromEnvVar returns the default value when env var is not set", () => {
     delete process.env.CDK_CONFIG_MISSING
 
-    expect(getConfigFromEnvVar("MISSING", "fallback")).toBe("fallback")
+    expect(getConfigFromEnvVar("MISSING", "CDK_CONFIG_", "fallback")).toBe("fallback")
   })
 
   test("getConfigFromEnvVar throws when value is missing", () => {
@@ -109,7 +109,7 @@ describe("config helpers", () => {
   test("getConfigFromEnvVar supports alternate prefixes", () => {
     process.env.APP_CUSTOM_VALUE = "alt"
 
-    expect(getConfigFromEnvVar("CUSTOM_VALUE", undefined, "APP_")).toBe("alt")
+    expect(getConfigFromEnvVar("CUSTOM_VALUE", "APP_")).toBe("alt")
   })
 
   test("getBooleanConfigFromEnvVar maps string booleans", () => {
@@ -123,8 +123,8 @@ describe("config helpers", () => {
   test("getBooleanConfigFromEnvVar uses default value when env var is not set", () => {
     delete process.env.CDK_CONFIG_BOOL_MISSING
 
-    expect(getBooleanConfigFromEnvVar("BOOL_MISSING", "true")).toBe(true)
-    expect(getBooleanConfigFromEnvVar("BOOL_MISSING", "false")).toBe(false)
+    expect(getBooleanConfigFromEnvVar("BOOL_MISSING", "CDK_CONFIG_", "true")).toBe(true)
+    expect(getBooleanConfigFromEnvVar("BOOL_MISSING", "CDK_CONFIG_", "false")).toBe(false)
   })
 
   test("getNumberConfigFromEnvVar parses numeric strings", () => {
@@ -136,13 +136,13 @@ describe("config helpers", () => {
   test("getNumberConfigFromEnvVar uses default value when env var is not set", () => {
     delete process.env.CDK_CONFIG_NUM_MISSING
 
-    expect(getNumberConfigFromEnvVar("NUM_MISSING", "99")).toBe(99)
+    expect(getNumberConfigFromEnvVar("NUM_MISSING", "CDK_CONFIG_", "99")).toBe(99)
   })
 
   test("getConfigFromEnvVar ignores default value when env var is set", () => {
     process.env.CDK_CONFIG_STACK_NAME = "primary"
 
-    expect(getConfigFromEnvVar("STACK_NAME", "ignored")).toBe("primary")
+    expect(getConfigFromEnvVar("STACK_NAME", "CDK_CONFIG_", "ignored")).toBe("primary")
   })
 
   test("getTrustStoreVersion returns the version ID from S3", async () => {