diff --git a/.golangci.yaml b/.golangci.yaml index d5b01a87..0d08c8e6 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -151,7 +151,7 @@ linters-settings: # List of allowed packages. allow: - $gostd - - github.com/Masterminds/semver + - github.com/Masterminds/semver/v3 - github.com/aryann/difflib - github.com/databus23/helm-diff/v3 - github.com/evanphx/json-patch diff --git a/cmd/helm3.go b/cmd/helm3.go index a2c492f9..ba2d3af2 100644 --- a/cmd/helm3.go +++ b/cmd/helm3.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" ) var ( diff --git a/go.mod b/go.mod index 58fe199e..1a9242d3 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,19 @@ module github.com/databus23/helm-diff/v3 go 1.22 require ( - github.com/Masterminds/semver v1.5.0 + github.com/Masterminds/semver/v3 v3.2.1 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a github.com/evanphx/json-patch v5.9.0+incompatible + github.com/gonvenience/bunt v1.3.5 + github.com/gonvenience/ytbx v1.4.4 + github.com/google/go-cmp v0.6.0 + github.com/homeport/dyff v1.7.1 github.com/json-iterator/go v1.1.12 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d - github.com/pkg/errors v0.9.1 // indirect github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - golang.org/x/crypto v0.19.0 // indirect - google.golang.org/grpc v1.58.3 // indirect + golang.org/x/term v0.19.0 gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.14.3 k8s.io/api v0.29.3 @@ -24,21 +26,12 @@ require ( sigs.k8s.io/yaml v1.4.0 ) -require ( - github.com/gonvenience/bunt v1.3.5 - github.com/gonvenience/ytbx v1.4.4 - github.com/google/go-cmp v0.6.0 - github.com/homeport/dyff v1.7.1 - golang.org/x/term v0.19.0 -) - require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect github.com/Masterminds/squirrel v1.5.4 // indirect github.com/Microsoft/hcsshim v0.11.4 // indirect @@ -120,6 +113,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc5 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect @@ -142,6 +136,7 @@ require ( go.opentelemetry.io/otel/metric v1.19.0 // indirect go.opentelemetry.io/otel/trace v1.19.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect + golang.org/x/crypto v0.19.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sync v0.6.0 // indirect @@ -150,6 +145,7 @@ require ( golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/grpc v1.58.3 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 0a8f2443..472c630e 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,6 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=