Skip to content

Commit 85c4dac

Browse files
authored
[chore][confmap] Add test for edge case with escaped default value (#14720)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Relates to open-telemetry/opentelemetry-go-contrib#8342 (comment)
1 parent c85224a commit 85c4dac

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

confmap/internal/e2e/expand_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ func Test_EscapedEnvVars_NoDefaultScheme(t *testing.T) {
4949
"key18": "here is 1 $",
5050
"key19": "here are 2 $$",
5151
"key20": "some expanded value came from nested expansion",
52+
"key21": "default_value",
53+
"key22": "${env:UNDEFINED_KEY:-${env:UNDEFINED_KEY}}",
5254
},
5355
}
5456

@@ -97,6 +99,8 @@ func Test_EscapedEnvVars_DefaultScheme(t *testing.T) {
9799
"key18": "here is 1 $",
98100
"key19": "here are 2 $$",
99101
"key20": "some expanded value came from nested expansion",
102+
"key21": "default_value",
103+
"key22": "${env:UNDEFINED_KEY:-${env:UNDEFINED_KEY}}",
100104
},
101105
}
102106

confmap/internal/e2e/testdata/expand-escaped-env.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@ test_map:
3939
key19: "${env:ENV_NESTED_DOLLARSIGN_ESCAPED}"
4040
# nested env var syntax is expanded
4141
key20: "${env:ENV_EXPAND_NESTED}"
42+
# default value
43+
key21: "${env:UNDEFINED_KEY:-default_value}"
44+
# escaped default value
45+
key22: "${env:UNDEFINED_KEY:-$${env:UNDEFINED_KEY}}"

0 commit comments

Comments
 (0)