Skip to content

Commit

Permalink
[confmap] Allow more recursion and URI expansions (#10712)
Browse files Browse the repository at this point in the history
#### 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
  • Loading branch information
TylerHelmuth authored Jul 24, 2024
1 parent 4e44e32 commit 3caaf16
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
25 changes: 25 additions & 0 deletions .chloggen/confmap-increase-recursive-count.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: confmap

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Increase the amount of recursion and URI expansions allowed in a single line

# One or more tracking issues or pull requests related to the change
issues: [10712]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
2 changes: 1 addition & 1 deletion confmap/expand.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var (
)

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

0 comments on commit 3caaf16

Please sign in to comment.