Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[confmap]: add more expand tests #12175

Merged
merged 5 commits into from
Jan 23, 2025
Merged

[confmap]: add more expand tests #12175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36cc5d4
[confmap]: add more expand tests
TylerHelmuth Jan 23, 2025
2da7239
another test
TylerHelmuth Jan 23, 2025
0b72a13
Merge branch 'main' into add-confmap-tests
TylerHelmuth Jan 23, 2025
9476346
add comments
TylerHelmuth Jan 23, 2025
fb158c2
Missed a test
TylerHelmuth Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions confmap/internal/e2e/expand_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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",
},
}

Expand All @@ -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{
Expand All @@ -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",
},
}

Expand Down
6 changes: 6 additions & 0 deletions confmap/internal/e2e/testdata/expand-escaped-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Loading