Skip to content

Commit 3caaf16

Browse files
authored
[confmap] Allow more recursion and URI expansions (#10712)
#### Description Bumps the limit of how much recursion we allow. This check is also gating non-recursive expansions. We probably could separate these concerns, but thats work that isn't really worthwhile, a simple constant bump is simple and will cover most users. For the rest, there are workarounds. <!-- Issue number if applicable --> #### Link to tracking issue Fixes #10617
1 parent 4e44e32 commit 3caaf16

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: confmap
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Increase the amount of recursion and URI expansions allowed in a single line
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [10712]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

confmap/expand.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var (
2828
)
2929

3030
func (mr *Resolver) expandValueRecursively(ctx context.Context, value any) (any, error) {
31-
for i := 0; i < 100; i++ {
31+
for i := 0; i < 1000; i++ {
3232
val, changed, err := mr.expandValue(ctx, value)
3333
if err != nil {
3434
return nil, err

0 commit comments

Comments
 (0)