Skip to content

Commit 19785a0

Browse files
committed
[confmap] use github.com/go-viper/mapstructure/v2
1 parent 08a6922 commit 19785a0

File tree

4 files changed

+29
-3
lines changed

4 files changed

+29
-3
lines changed

.chloggen/update_mapstructure.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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: enhancement
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: Update mapstructure to use a maintained fork, github.com/go-viper/mapstructure/v2.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [9634]
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+
See https://github.com/mitchellh/mapstructure/issues/349 for context.
20+
21+
# Optional: The change log or logs in which this entry should be included.
22+
# e.g. '[user]' or '[user, api]'
23+
# Include 'user' if the change is relevant to end users.
24+
# Include 'api' if there is a change to a library API.
25+
# Default: '[user]'
26+
change_logs: []

confmap/confmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"fmt"
99
"reflect"
1010

11+
"github.com/go-viper/mapstructure/v2"
1112
"github.com/knadh/koanf/maps"
1213
"github.com/knadh/koanf/providers/confmap"
1314
"github.com/knadh/koanf/v2"
14-
"github.com/mitchellh/mapstructure"
1515

1616
encoder "go.opentelemetry.io/collector/confmap/internal/mapstructure"
1717
)

confmap/internal/mapstructure/encoder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"reflect"
1111
"strings"
1212

13-
"github.com/mitchellh/mapstructure"
13+
"github.com/go-viper/mapstructure/v2"
1414
)
1515

1616
const (

confmap/internal/mapstructure/encoder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"strings"
1111
"testing"
1212

13-
"github.com/mitchellh/mapstructure"
13+
"github.com/go-viper/mapstructure/v2"
1414
"github.com/stretchr/testify/require"
1515
)
1616

0 commit comments

Comments
 (0)