Skip to content

Commit 20d1619

Browse files
codebotencodeboten
committed
update yaml dependency
This updates replace gopkg.in/yaml.v3 with sigs.k8s.io/yaml Signed-off-by: Alex Boten <[email protected]>
1 parent cf18559 commit 20d1619

File tree

80 files changed

+150
-15
lines changed

Some content is hidden

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

80 files changed

+150
-15
lines changed

‎cmd/mdatagen/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ require (
7575
google.golang.org/grpc v1.71.1 // indirect
7676
google.golang.org/protobuf v1.36.6 // indirect
7777
gopkg.in/yaml.v3 v3.0.1 // indirect
78+
sigs.k8s.io/yaml v1.4.0 // indirect
7879
)
7980

8081
replace go.opentelemetry.io/collector/component => ../../component

‎cmd/mdatagen/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcorecol/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ require (
165165
google.golang.org/grpc v1.71.1 // indirect
166166
google.golang.org/protobuf v1.36.6 // indirect
167167
gopkg.in/yaml.v3 v3.0.1 // indirect
168+
sigs.k8s.io/yaml v1.4.0 // indirect
168169
)
169170

170171
replace go.opentelemetry.io/collector => ../../

‎cmd/otelcorecol/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configgrpc/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/confighttp/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/confighttp/xconfighttp/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configopaque/__debug_bin2781401423

7.04 MB
Binary file not shown.

‎config/configopaque/doc_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"encoding/json"
88
"fmt"
99

10-
"gopkg.in/yaml.v3"
10+
yaml "sigs.k8s.io/yaml/goyaml.v3"
1111

1212
"go.opentelemetry.io/collector/config/configopaque"
1313
)

‎config/configopaque/go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
require (
66
github.com/stretchr/testify v1.10.0
77
go.uber.org/goleak v1.3.0
8-
gopkg.in/yaml.v3 v3.0.1
8+
sigs.k8s.io/yaml v1.4.0
99
)
1010

1111
require (
@@ -14,4 +14,5 @@ require (
1414
github.com/pmezard/go-difflib v1.0.0 // indirect
1515
github.com/rogpeppe/go-internal v1.10.0 // indirect
1616
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
17+
gopkg.in/yaml.v3 v3.0.1 // indirect
1718
)

‎config/configopaque/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configtls/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/confmap_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"github.com/stretchr/testify/assert"
1717
"github.com/stretchr/testify/require"
18-
"gopkg.in/yaml.v3"
18+
yaml "sigs.k8s.io/yaml/goyaml.v3"
1919
)
2020

2121
func TestToStringMapFlatten(t *testing.T) {

‎confmap/confmaptest/configtest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"path/filepath"
1010
"regexp"
1111

12-
"gopkg.in/yaml.v3"
12+
yaml "sigs.k8s.io/yaml/goyaml.v3"
1313

1414
"go.opentelemetry.io/collector/confmap"
1515
)

‎confmap/go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
go.uber.org/goleak v1.3.0
1313
go.uber.org/multierr v1.11.0
1414
go.uber.org/zap v1.27.0
15-
gopkg.in/yaml.v3 v3.0.1
15+
sigs.k8s.io/yaml v1.4.0
1616
)
1717

1818
require (
@@ -21,6 +21,7 @@ require (
2121
github.com/mitchellh/copystructure v1.2.0 // indirect
2222
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2323
github.com/pmezard/go-difflib v1.0.0 // indirect
24+
gopkg.in/yaml.v3 v3.0.1 // indirect
2425
)
2526

2627
retract (

‎confmap/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/internal/e2e/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ require (
2424
go.uber.org/multierr v1.11.0 // indirect
2525
go.uber.org/zap v1.27.0 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
27+
sigs.k8s.io/yaml v1.4.0 // indirect
2728
)
2829

2930
replace go.opentelemetry.io/collector/confmap => ../../

‎confmap/internal/e2e/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/internal/mapstructure/encoder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212

1313
"github.com/go-viper/mapstructure/v2"
14-
"gopkg.in/yaml.v3"
14+
yaml "sigs.k8s.io/yaml/goyaml.v3"
1515
)
1616

1717
const (

‎confmap/provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"time"
1010

1111
"go.uber.org/zap"
12-
"gopkg.in/yaml.v3"
12+
yaml "sigs.k8s.io/yaml/goyaml.v3"
1313
)
1414

1515
// ProviderSettings are the settings to initialize a Provider.

‎confmap/provider/envprovider/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
go.opentelemetry.io/collector/featuregate v1.30.0 // indirect
2323
go.uber.org/multierr v1.11.0 // indirect
2424
gopkg.in/yaml.v3 v3.0.1 // indirect
25+
sigs.k8s.io/yaml v1.4.0 // indirect
2526
)
2627

2728
replace go.opentelemetry.io/collector/confmap => ../../

‎confmap/provider/envprovider/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/provider/fileprovider/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
go.uber.org/multierr v1.11.0 // indirect
2323
go.uber.org/zap v1.27.0 // indirect
2424
gopkg.in/yaml.v3 v3.0.1 // indirect
25+
sigs.k8s.io/yaml v1.4.0 // indirect
2526
)
2627

2728
replace go.opentelemetry.io/collector/confmap => ../../

‎confmap/provider/fileprovider/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/provider/httpprovider/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
go.uber.org/multierr v1.11.0 // indirect
2323
go.uber.org/zap v1.27.0 // indirect
2424
gopkg.in/yaml.v3 v3.0.1 // indirect
25+
sigs.k8s.io/yaml v1.4.0 // indirect
2526
)
2627

2728
replace go.opentelemetry.io/collector/confmap => ../../

‎confmap/provider/httpprovider/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/provider/httpsprovider/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
go.uber.org/multierr v1.11.0 // indirect
2323
go.uber.org/zap v1.27.0 // indirect
2424
gopkg.in/yaml.v3 v3.0.1 // indirect
25+
sigs.k8s.io/yaml v1.4.0 // indirect
2526
)
2627

2728
replace go.opentelemetry.io/collector/confmap => ../../

‎confmap/provider/httpsprovider/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/provider/yamlprovider/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
go.uber.org/multierr v1.11.0 // indirect
2323
go.uber.org/zap v1.27.0 // indirect
2424
gopkg.in/yaml.v3 v3.0.1 // indirect
25+
sigs.k8s.io/yaml v1.4.0 // indirect
2526
)
2627

2728
replace go.opentelemetry.io/collector/confmap => ../../

‎confmap/provider/yamlprovider/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/resolver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/stretchr/testify/assert"
1818
"github.com/stretchr/testify/require"
1919
"go.uber.org/zap"
20-
"gopkg.in/yaml.v3"
20+
yaml "sigs.k8s.io/yaml/goyaml.v3"
2121

2222
"go.opentelemetry.io/collector/featuregate"
2323
)

‎confmap/xconfmap/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ require (
2121
go.uber.org/multierr v1.11.0 // indirect
2222
go.uber.org/zap v1.27.0 // indirect
2323
gopkg.in/yaml.v3 v3.0.1 // indirect
24+
sigs.k8s.io/yaml v1.4.0 // indirect
2425
)
2526

2627
replace go.opentelemetry.io/collector/confmap => ../

‎confmap/xconfmap/go.sum

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/forwardconnector/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ require (
5757
google.golang.org/grpc v1.71.1 // indirect
5858
google.golang.org/protobuf v1.36.6 // indirect
5959
gopkg.in/yaml.v3 v3.0.1 // indirect
60+
sigs.k8s.io/yaml v1.4.0 // indirect
6061
)
6162

6263
replace go.opentelemetry.io/collector/component => ../../component

0 commit comments

Comments
 (0)