Skip to content

Commit

Permalink
Migrate to gopkg.in/yaml.v3
Browse files Browse the repository at this point in the history
  • Loading branch information
@L3n41c
L3n41c committed Jan 27, 2025
1 parent 980a66f commit ba76cda
Show file tree
Hide file tree
Showing 214 changed files with 489 additions and 557 deletions.
1 change: 0 additions & 1 deletion LICENSE-3rdparty.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,6 @@ core,github.com/freddierice/go-losetup,MIT,Copyright (c) 2017 Freddie Rice
core,github.com/fsnotify/fsnotify,BSD-3-Clause,Copyright (c) 2012 The Go Authors. All rights reserved. | Copyright (c) 2012-2019 fsnotify Authors. All rights reserved.
core,github.com/fsnotify/fsnotify/internal,BSD-3-Clause,Copyright (c) 2012 The Go Authors. All rights reserved. | Copyright (c) 2012-2019 fsnotify Authors. All rights reserved.
core,github.com/fxamacker/cbor/v2,MIT,Copyright (c) 2019-present Faye Amacker | Copyright © 2019-2024 [Faye Amacker](https://github.com/fxamacker)
core,github.com/ghodss/yaml,MIT,Copyright (c) 2012 The Go Authors. All rights reserved | Copyright (c) 2014 Sam Ghods
core,github.com/glaslos/ssdeep,MIT,"Copyright (c) 2015, Arbo von Monkiewitsch All rights reserved | Copyright (c) 2017 Lukas Rist"
core,github.com/go-chi/chi,MIT,"Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc | Copyright (c) 2015-present [Peter Kieltyka](https://github.com/pkieltyka)"
core,github.com/go-chi/chi/middleware,MIT,"Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc | Copyright (c) 2015-present [Peter Kieltyka](https://github.com/pkieltyka)"
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/common/import.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"strings"

"github.com/fatih/color"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"

"github.com/DataDog/datadog-agent/pkg/config/legacy"
pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/common/import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/DataDog/datadog-agent/pkg/config/legacy"
"github.com/DataDog/datadog-agent/pkg/config/mock"
Expand Down
2 changes: 1 addition & 1 deletion cmd/installer/subcommands/installer/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/DataDog/datadog-agent/pkg/fleet/telemetry"
"github.com/DataDog/datadog-agent/pkg/version"
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/security-agent/subcommands/runtime/activity_dump.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

"github.com/spf13/cobra"
"go.uber.org/fx"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/DataDog/datadog-agent/cmd/security-agent/command"
"github.com/DataDog/datadog-agent/comp/core"
Expand Down
2 changes: 1 addition & 1 deletion cmd/trace-agent/test/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"time"

"github.com/DataDog/viper"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
2 changes: 1 addition & 1 deletion comp/api/api/apiimpl/internal/agent/agent_jmx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/DataDog/datadog-agent/pkg/jmxfetch"
jmxStatus "github.com/DataDog/datadog-agent/pkg/status/jmx"

yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"
)

func getJMXConfigs(w http.ResponseWriter, r *http.Request) {
Expand Down
3 changes: 1 addition & 2 deletions comp/api/authtoken/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.60.1 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.59.1 // indirect
github.com/DataDog/viper v1.14.0 // indirect
github.com/DataDog/viper v1.14.1-0.20250127172929-eef46d1fc5ce // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand Down Expand Up @@ -110,6 +110,5 @@ require (
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
9 changes: 2 additions & 7 deletions comp/api/authtoken/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/checks/agentcrashdetect/agentcrashdetectimpl/agentcrashdetect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"go.uber.org/fx"
"golang.org/x/sys/windows/registry"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"

"github.com/DataDog/datadog-agent/comp/checks/agentcrashdetect"
"github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration"
Expand Down
2 changes: 1 addition & 1 deletion comp/checks/windowseventlog/windowseventlogimpl/check/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration"
"github.com/DataDog/datadog-agent/pkg/util/option"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions comp/checks/winregistry/impl/winregistryimpl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ import (
"github.com/DataDog/datadog-agent/pkg/logs/sources"
"github.com/DataDog/datadog-agent/pkg/metrics"
"github.com/DataDog/datadog-agent/pkg/util/fxutil"
yy "github.com/DataDog/datadog-agent/pkg/util/jsonyaml"
agentLog "github.com/DataDog/datadog-agent/pkg/util/log"
"github.com/DataDog/datadog-agent/pkg/util/option"
yy "github.com/ghodss/yaml"
"github.com/swaggest/jsonschema-go"
"github.com/xeipuuv/gojsonschema"
"go.uber.org/fx"
"golang.org/x/sys/windows/registry"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion comp/core/agenttelemetry/impl/agenttelemetry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

dto "github.com/prometheus/client_model/go"
"go.uber.org/fx"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
2 changes: 1 addition & 1 deletion comp/core/agenttelemetry/impl/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"strings"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/DataDog/datadog-agent/comp/core/config"
pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
Expand Down
2 changes: 1 addition & 1 deletion comp/core/autodiscovery/configresolver/configresolver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/DataDog/datadog-agent/pkg/util/containers"
"github.com/DataDog/datadog-agent/pkg/util/log"

yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"
)

type variableGetter func(ctx context.Context, key string, svc listeners.Service) (string, error)
Expand Down
2 changes: 1 addition & 1 deletion comp/core/autodiscovery/integration/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"strings"

"github.com/twmb/murmur3"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"

"github.com/DataDog/datadog-agent/pkg/util/containers"
"github.com/DataDog/datadog-agent/pkg/util/log"
Expand Down
2 changes: 1 addition & 1 deletion comp/core/autodiscovery/integration/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"
)

func TestConfigEqual(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion comp/core/autodiscovery/providers/config_reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/DataDog/datadog-agent/pkg/util/log"

cache "github.com/patrickmn/go-cache"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type configFormat struct {
Expand Down
3 changes: 1 addition & 2 deletions comp/core/config/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/util/option v0.64.0-devel
github.com/DataDog/datadog-agent/pkg/util/winutil v0.60.1
github.com/DataDog/viper v1.14.0
github.com/DataDog/viper v1.14.1-0.20250127172929-eef46d1fc5ce
github.com/stretchr/testify v1.10.0
go.uber.org/fx v1.23.0
)
Expand Down Expand Up @@ -107,7 +107,6 @@ require (
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/protobuf v1.36.3 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
9 changes: 2 additions & 7 deletions comp/core/config/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/core/gui/guiimpl/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"time"

"github.com/gorilla/mux"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"

"github.com/DataDog/datadog-agent/comp/core/config"
"github.com/DataDog/datadog-agent/comp/core/flare"
Expand Down
2 changes: 1 addition & 1 deletion comp/core/gui/guiimpl/checks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

securejoin "github.com/cyphar/filepath-securejoin"
"github.com/gorilla/mux"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"

"github.com/DataDog/datadog-agent/comp/collector/collector"
"github.com/DataDog/datadog-agent/comp/core/autodiscovery"
Expand Down
3 changes: 1 addition & 2 deletions comp/core/log/impl-trace/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.60.1 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.59.1 // indirect
github.com/DataDog/viper v1.14.0 // indirect
github.com/DataDog/viper v1.14.1-0.20250127172929-eef46d1fc5ce // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/ebitengine/purego v0.8.1 // indirect
Expand Down Expand Up @@ -110,7 +110,6 @@ require (
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
9 changes: 2 additions & 7 deletions comp/core/log/impl-trace/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions comp/core/log/impl/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.60.1 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.59.1 // indirect
github.com/DataDog/viper v1.14.0 // indirect
github.com/DataDog/viper v1.14.1-0.20250127172929-eef46d1fc5ce // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand Down Expand Up @@ -101,7 +101,6 @@ require (
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
Loading

0 comments on commit ba76cda

Please sign in to comment.