-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
consul-template: replace config rather than append
- Loading branch information
DerekStrickland
committed
Mar 12, 2022
1 parent
ddbbda6
commit 1ab6236
Showing
10 changed files
with
124 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
```release-note:bug | ||
template: Fixes a bug in config parsing that resulted in the default `function_denylist` | ||
always being appended to whatever the user specified. | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
client { | ||
enabled = true | ||
|
||
template { | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
command/agent/test-resources/client_with_function_denylist.hcl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
client { | ||
enabled = true | ||
|
||
template { | ||
function_denylist = ["foo"] | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
command/agent/test-resources/client_with_function_denylist_empty.hcl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
client { | ||
enabled = true | ||
|
||
template { | ||
function_denylist = [] | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
command/agent/test-resources/client_with_function_denylist_empty_string.hcl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
client { | ||
enabled = true | ||
|
||
template { | ||
disable_file_sandbox = true | ||
function_denylist = [""] | ||
} | ||
} |
11 changes: 11 additions & 0 deletions
11
command/agent/test-resources/client_with_function_denylist_empty_string.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"client": { | ||
"enabled": true, | ||
"template": { | ||
"disable_file_sandbox": true, | ||
"function_denylist": [ | ||
"" | ||
] | ||
} | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
command/agent/test-resources/client_with_function_denylist_nil.hcl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
client { | ||
enabled = true | ||
|
||
template { | ||
disable_file_sandbox = true | ||
} | ||
} |