diff --git a/go.mod b/go.mod index 44a67910..3c0eaccd 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( go.uber.org/ratelimit v0.3.1 golang.org/x/crypto v0.25.0 golang.org/x/net v0.27.0 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 gotest.tools v2.2.0+incompatible ) @@ -106,6 +106,5 @@ require ( golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect howett.net/plist v1.0.0 // indirect ) diff --git a/go.sum b/go.sum index 1c02e8df..483faa73 100644 --- a/go.sum +++ b/go.sum @@ -198,8 +198,6 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= -github.com/sijms/go-ora/v2 v2.8.19 h1:7LoKZatDYGi18mkpQTR/gQvG9yOdtc7hPAex96Bqisc= -github.com/sijms/go-ora/v2 v2.8.19/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sijms/go-ora/v2 v2.8.20 h1:VeJ97pwuIesYCeMgFmw60IiYZDst98annQCtxbLP7qU= github.com/sijms/go-ora/v2 v2.8.20/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= diff --git a/internal/config/config.go b/internal/config/config.go index 7c5ade2d..50ca240e 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -22,7 +22,7 @@ import ( "github.com/sirupsen/logrus" "go.uber.org/ratelimit" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) var ( diff --git a/internal/config/fetch.go b/internal/config/fetch.go index d079a4d3..bffaf083 100644 --- a/internal/config/fetch.go +++ b/internal/config/fetch.go @@ -13,7 +13,7 @@ import ( "github.com/newrelic/nri-flex/internal/inputs" "github.com/newrelic/nri-flex/internal/load" "github.com/sirupsen/logrus" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" ) var lookupsRegex = regexp.MustCompile(`\${lookup\.([^:]+):([^}]+)}`) diff --git a/internal/config/secrets.go b/internal/config/secrets.go index 8f8c23a2..d39c6db0 100644 --- a/internal/config/secrets.go +++ b/internal/config/secrets.go @@ -21,7 +21,7 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/kms" "github.com/sirupsen/logrus" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/newrelic/nri-flex/internal/load" "github.com/newrelic/nri-flex/internal/utils" diff --git a/internal/config/substitutions.go b/internal/config/substitutions.go index 20c61afe..2190b911 100644 --- a/internal/config/substitutions.go +++ b/internal/config/substitutions.go @@ -18,7 +18,7 @@ import ( "github.com/newrelic/nri-flex/internal/formatter" "github.com/newrelic/nri-flex/internal/load" "github.com/sirupsen/logrus" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" ) // SubLookupFileData substitutes data from lookup files into config diff --git a/internal/discovery/fargate.go b/internal/discovery/fargate.go index 1234da16..2fda18c6 100644 --- a/internal/discovery/fargate.go +++ b/internal/discovery/fargate.go @@ -16,7 +16,7 @@ import ( "github.com/newrelic/nri-flex/internal/formatter" "github.com/newrelic/nri-flex/internal/load" "github.com/sirupsen/logrus" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" ) // runFargateDiscovery check aws metadata endpoint for containers