Skip to content

Commit c81e10e

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

File tree

75 files changed

+30
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+30
-111
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: []

‎cmd/mdatagen/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ require (
3232
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
3333
github.com/knadh/koanf/v2 v2.1.0 // indirect
3434
github.com/mitchellh/copystructure v1.2.0 // indirect
35-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
3635
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3736
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3837
github.com/modern-go/reflect2 v1.0.2 // indirect

‎cmd/mdatagen/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcorecol/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ require (
5555
github.com/knadh/koanf/v2 v2.1.0 // indirect
5656
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
5757
github.com/mitchellh/copystructure v1.2.0 // indirect
58-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
5958
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6059
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6160
github.com/modern-go/reflect2 v1.0.2 // indirect

‎cmd/otelcorecol/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎component/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ require (
3434
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
3535
github.com/knadh/koanf/v2 v2.1.0 // indirect
3636
github.com/mitchellh/copystructure v1.2.0 // indirect
37-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
3837
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3938
github.com/pmezard/go-difflib v1.0.0 // indirect
4039
github.com/prometheus/procfs v0.12.0 // indirect

‎component/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configauth/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ require (
1919
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
2020
github.com/knadh/koanf/v2 v2.1.0 // indirect
2121
github.com/mitchellh/copystructure v1.2.0 // indirect
22-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
2322
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2423
github.com/pmezard/go-difflib v1.0.0 // indirect
2524
go.opentelemetry.io/collector/config/configtelemetry v0.95.0 // indirect

‎config/configauth/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configgrpc/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ require (
4141
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
4242
github.com/knadh/koanf/v2 v2.1.0 // indirect
4343
github.com/mitchellh/copystructure v1.2.0 // indirect
44-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
4544
github.com/mitchellh/reflectwalk v1.0.2 // indirect
4645
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4746
github.com/modern-go/reflect2 v1.0.2 // indirect

‎config/configgrpc/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/confighttp/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ require (
3939
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
4040
github.com/knadh/koanf/v2 v2.1.0 // indirect
4141
github.com/mitchellh/copystructure v1.2.0 // indirect
42-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
4342
github.com/mitchellh/reflectwalk v1.0.2 // indirect
4443
github.com/pmezard/go-difflib v1.0.0 // indirect
4544
github.com/prometheus/client_golang v1.18.0 // indirect

‎config/confighttp/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configopaque/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ require (
1717
github.com/knadh/koanf/v2 v2.1.0 // indirect
1818
github.com/kr/pretty v0.3.1 // indirect
1919
github.com/mitchellh/copystructure v1.2.0 // indirect
20-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
2120
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2221
github.com/pmezard/go-difflib v1.0.0 // indirect
2322
github.com/rogpeppe/go-internal v1.10.0 // indirect

‎config/configopaque/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configtls/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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/converter/expandconverter/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
1616
github.com/knadh/koanf/v2 v2.1.0 // indirect
1717
github.com/mitchellh/copystructure v1.2.0 // indirect
18-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
1918
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2019
github.com/pmezard/go-difflib v1.0.0 // indirect
2120
go.uber.org/multierr v1.11.0 // indirect

‎confmap/converter/expandconverter/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module go.opentelemetry.io/collector/confmap
33
go 1.21
44

55
require (
6+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1
67
github.com/knadh/koanf/maps v0.1.1
78
github.com/knadh/koanf/providers/confmap v0.1.0
89
github.com/knadh/koanf/v2 v2.1.0
9-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
1010
github.com/stretchr/testify v1.8.4
1111
go.uber.org/goleak v1.3.0
1212
go.uber.org/multierr v1.11.0
@@ -15,7 +15,6 @@ require (
1515

1616
require (
1717
github.com/davecgh/go-spew v1.1.1 // indirect
18-
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
1918
github.com/kr/text v0.2.0 // indirect
2019
github.com/mitchellh/copystructure v1.2.0 // indirect
2120
github.com/mitchellh/reflectwalk v1.0.2 // indirect

‎confmap/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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

‎confmap/provider/envprovider/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
1616
github.com/knadh/koanf/v2 v2.1.0 // indirect
1717
github.com/mitchellh/copystructure v1.2.0 // indirect
18-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
1918
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2019
github.com/pmezard/go-difflib v1.0.0 // indirect
2120
go.uber.org/multierr v1.11.0 // indirect

‎confmap/provider/envprovider/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/provider/fileprovider/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
1616
github.com/knadh/koanf/v2 v2.1.0 // indirect
1717
github.com/mitchellh/copystructure v1.2.0 // indirect
18-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
1918
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2019
github.com/pmezard/go-difflib v1.0.0 // indirect
2120
go.uber.org/multierr v1.11.0 // indirect

‎confmap/provider/fileprovider/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/provider/httpprovider/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
1616
github.com/knadh/koanf/v2 v2.1.0 // indirect
1717
github.com/mitchellh/copystructure v1.2.0 // indirect
18-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
1918
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2019
github.com/pmezard/go-difflib v1.0.0 // indirect
2120
go.uber.org/multierr v1.11.0 // indirect

‎confmap/provider/httpprovider/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/provider/httpsprovider/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
1616
github.com/knadh/koanf/v2 v2.1.0 // indirect
1717
github.com/mitchellh/copystructure v1.2.0 // indirect
18-
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
1918
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2019
github.com/pmezard/go-difflib v1.0.0 // indirect
2120
go.uber.org/multierr v1.11.0 // indirect

‎confmap/provider/httpsprovider/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)