[confmap]: add more expand tests (#12175)

open-telemetry · Jan 23, 2025 · 689d43e · 689d43e
1 parent 24f88da
commit 689d43e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/confmap/internal/e2e/expand_test.go b/confmap/internal/e2e/expand_test.go
@@ -21,6 +21,9 @@ func Test_EscapedEnvVars_NoDefaultScheme(t *testing.T) {
 	t.Setenv("ENV_VALUE", expandedValue)
 	t.Setenv("ENV_LIST", "['$$ESCAPE_ME','$${ESCAPE_ME}','$${env:ESCAPE_ME}']")
 	t.Setenv("ENV_MAP", "{'key1':'$$ESCAPE_ME','key2':'$${ESCAPE_ME}','key3':'$${env:ESCAPE_ME}'}")
+	t.Setenv("ENV_NESTED_DOLLARSIGN", "here is 1 $$")
+	t.Setenv("ENV_NESTED_DOLLARSIGN_ESCAPED", "here are 2 $$$")
+	t.Setenv("ENV_EXPAND_NESTED", "${env:ENV_VALUE} came from nested expansion")
 
 	expectedMap := map[string]any{
 		"test_map": map[string]any{
@@ -41,6 +44,9 @@ func Test_EscapedEnvVars_NoDefaultScheme(t *testing.T) {
 			"key15": "$ENV_VALUE",
 			"key16": []any{"$ESCAPE_ME", "${ESCAPE_ME}", "${env:ESCAPE_ME}"},
 			"key17": map[string]any{"key1": "$ESCAPE_ME", "key2": "${ESCAPE_ME}", "key3": "${env:ESCAPE_ME}"},
+			"key18": "here is 1 $",
+			"key19": "here are 2 $$",
+			"key20": "some expanded value came from nested expansion",
 		},
 	}
 
@@ -63,6 +69,9 @@ func Test_EscapedEnvVars_DefaultScheme(t *testing.T) {
 	t.Setenv("ENV_VALUE", expandedValue)
 	t.Setenv("ENV_LIST", "['$$ESCAPE_ME','$${ESCAPE_ME}','$${env:ESCAPE_ME}']")
 	t.Setenv("ENV_MAP", "{'key1':'$$ESCAPE_ME','key2':'$${ESCAPE_ME}','key3':'$${env:ESCAPE_ME}'}")
+	t.Setenv("ENV_NESTED_DOLLARSIGN", "here is 1 $$")
+	t.Setenv("ENV_NESTED_DOLLARSIGN_ESCAPED", "here are 2 $$$")
+	t.Setenv("ENV_EXPAND_NESTED", "${env:ENV_VALUE} came from nested expansion")
 
 	expectedMap := map[string]any{
 		"test_map": map[string]any{
@@ -83,6 +92,9 @@ func Test_EscapedEnvVars_DefaultScheme(t *testing.T) {
 			"key15": "$ENV_VALUE",
 			"key16": []any{"$ESCAPE_ME", "${ESCAPE_ME}", "${env:ESCAPE_ME}"},
 			"key17": map[string]any{"key1": "$ESCAPE_ME", "key2": "${ESCAPE_ME}", "key3": "${env:ESCAPE_ME}"},
+			"key18": "here is 1 $",
+			"key19": "here are 2 $$",
+			"key20": "some expanded value came from nested expansion",
 		},
 	}
 

diff --git a/confmap/internal/e2e/testdata/expand-escaped-env.yaml b/confmap/internal/e2e/testdata/expand-escaped-env.yaml
@@ -33,3 +33,9 @@ test_map:
   key16: "${env:ENV_LIST}"
   # map is escaped
   key17: "${env:ENV_MAP}"
+  # nested $$ -> escaped $
+  key18: "${env:ENV_NESTED_DOLLARSIGN}"
+  # nested $$$ -> escaped $$
+  key19: "${env:ENV_NESTED_DOLLARSIGN_ESCAPED}"
+  # nested env var syntax is expanded
+  key20: "${env:ENV_EXPAND_NESTED}"