Merge pull request #85 from stuartleeks/sl/env-subst-casing

Make env var substitution not case-sensitive
devcontainers · Jul 7, 2021 · b0bf285 · b0bf285
2 parents 0c7bc42 + 99cdf56
commit b0bf285
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/azdo-task/DevContainerBuildRun/dist/index.js b/azdo-task/DevContainerBuildRun/dist/index.js
diff --git a/azdo-task/DevContainerBuildRun/dist/index.js.map b/azdo-task/DevContainerBuildRun/dist/index.js.map
diff --git a/common/__tests__/envvars.test.ts b/common/__tests__/envvars.test.ts
@@ -15,6 +15,14 @@ describe('substituteValues', () => {
 		expect(result).toBe('TEST_ENV1: TestEnvValue1, TEST_ENV2: TestEnvValue2')
 	})
 
+	test("Handles 'Env' substitution placeholders", async () => {
+		process.env.TEST_ENV1 = 'TestEnvValue1'
+		process.env.TEST_ENV2 = 'TestEnvValue2'
+		const input = 'TEST_ENV1: ${Env:TEST_ENV1}, TEST_ENV2: ${Env:TEST_ENV2}'
+		const result = await substituteValues(input)
+		expect(result).toBe('TEST_ENV1: TestEnvValue1, TEST_ENV2: TestEnvValue2')
+	})
+
 	test("ignores substitution placeholders that it doesn't understand", async () => {
 		const input = 'TEST_ENV: ${nothingToSee:TEST_ENV}'
 		const result = await substituteValues(input)

diff --git a/common/src/envvars.ts b/common/src/envvars.ts
@@ -13,7 +13,7 @@ function getSubstitutionValue(regexMatch: string, placeholder: string): string {
 	if (parts.length === 2) {
 		const type = parts[0]
 		const key = parts[1]
-		switch (type) {
+		switch (type.toLowerCase()) {
 			case 'env':
 			case 'localenv':
 				return process.env[key] ?? ''

diff --git a/common_lib/envvars.js b/common_lib/envvars.js
@@ -16,7 +16,7 @@ function getSubstitutionValue(regexMatch, placeholder) {
     if (parts.length === 2) {
         const type = parts[0];
         const key = parts[1];
-        switch (type) {
+        switch (type.toLowerCase()) {
             case 'env':
             case 'localenv':
                 return (_a = process.env[key]) !== null && _a !== void 0 ? _a : '';

diff --git a/github-action/dist/index.js b/github-action/dist/index.js
diff --git a/github-action/dist/index.js.map b/github-action/dist/index.js.map