diff --git a/.golangci.yaml b/.golangci.yaml index 0d08c8e6..78657f61 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -154,7 +154,7 @@ linters-settings: - github.com/Masterminds/semver/v3 - github.com/aryann/difflib - github.com/databus23/helm-diff/v3 - - github.com/evanphx/json-patch + - github.com/evanphx/json-patch/v5 - github.com/gonvenience/bunt - github.com/gonvenience/ytbx - github.com/google/go-cmp/cmp diff --git a/cmd/upgrade.go b/cmd/upgrade.go index 2f8ebe3c..6874189e 100644 --- a/cmd/upgrade.go +++ b/cmd/upgrade.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" jsoniterator "github.com/json-iterator/go" "github.com/spf13/cobra" "helm.sh/helm/v3/pkg/action" diff --git a/go.mod b/go.mod index dcf7c3a7..b0a3e5d3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( 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/evanphx/json-patch/v5 v5.9.0 github.com/gonvenience/bunt v1.3.5 github.com/gonvenience/ytbx v1.4.4 github.com/google/go-cmp v0.6.0 @@ -51,6 +51,7 @@ require ( github.com/docker/go-metrics v0.0.1 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/evanphx/json-patch v5.9.0+incompatible // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect diff --git a/go.sum b/go.sum index 2a118b39..661451d3 100644 --- a/go.sum +++ b/go.sum @@ -97,6 +97,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= +github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=