Skip to content

Commit 9f4268d

Browse files
committed
deps: use json-patch/v5 instead of incompatible module
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 0f97fe5 commit 9f4268d

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ linters-settings:
154154
- github.com/Masterminds/semver
155155
- github.com/aryann/difflib
156156
- github.com/databus23/helm-diff/v3
157-
- github.com/evanphx/json-patch
157+
- github.com/evanphx/json-patch/v5
158158
- github.com/gonvenience/bunt
159159
- github.com/gonvenience/ytbx
160160
- github.com/google/go-cmp/cmp

cmd/upgrade.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strconv"
1212
"strings"
1313

14-
jsonpatch "github.com/evanphx/json-patch"
14+
jsonpatch "github.com/evanphx/json-patch/v5"
1515
jsoniterator "github.com/json-iterator/go"
1616
"github.com/spf13/cobra"
1717
"helm.sh/helm/v3/pkg/action"

go.mod

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ go 1.22
55
require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a
8-
github.com/evanphx/json-patch v5.9.0+incompatible
8+
github.com/evanphx/json-patch/v5 v5.9.0
9+
github.com/gonvenience/bunt v1.3.5
10+
github.com/gonvenience/ytbx v1.4.4
11+
github.com/google/go-cmp v0.6.0
12+
github.com/homeport/dyff v1.7.1
913
github.com/json-iterator/go v1.1.12
1014
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
11-
github.com/pkg/errors v0.9.1 // indirect
1215
github.com/spf13/cobra v1.8.0
1316
github.com/spf13/pflag v1.0.5
1417
github.com/stretchr/testify v1.9.0
15-
golang.org/x/crypto v0.19.0 // indirect
16-
google.golang.org/grpc v1.58.3 // indirect
18+
golang.org/x/term v0.19.0
1719
gopkg.in/yaml.v2 v2.4.0
1820
helm.sh/helm/v3 v3.14.3
1921
k8s.io/api v0.29.3
@@ -24,14 +26,6 @@ require (
2426
sigs.k8s.io/yaml v1.4.0
2527
)
2628

27-
require (
28-
github.com/gonvenience/bunt v1.3.5
29-
github.com/gonvenience/ytbx v1.4.4
30-
github.com/google/go-cmp v0.6.0
31-
github.com/homeport/dyff v1.7.1
32-
golang.org/x/term v0.19.0
33-
)
34-
3529
require (
3630
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
3731
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
@@ -58,6 +52,7 @@ require (
5852
github.com/docker/go-metrics v0.0.1 // indirect
5953
github.com/docker/go-units v0.5.0 // indirect
6054
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
55+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
6156
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
6257
github.com/fatih/color v1.13.0 // indirect
6358
github.com/felixge/httpsnoop v1.0.3 // indirect
@@ -120,6 +115,7 @@ require (
120115
github.com/opencontainers/go-digest v1.0.0 // indirect
121116
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
122117
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
118+
github.com/pkg/errors v0.9.1 // indirect
123119
github.com/pmezard/go-difflib v1.0.0 // indirect
124120
github.com/prometheus/client_golang v1.16.0 // indirect
125121
github.com/prometheus/client_model v0.4.0 // indirect
@@ -142,6 +138,7 @@ require (
142138
go.opentelemetry.io/otel/metric v1.19.0 // indirect
143139
go.opentelemetry.io/otel/trace v1.19.0 // indirect
144140
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
141+
golang.org/x/crypto v0.19.0 // indirect
145142
golang.org/x/net v0.21.0 // indirect
146143
golang.org/x/oauth2 v0.10.0 // indirect
147144
golang.org/x/sync v0.6.0 // indirect
@@ -150,6 +147,7 @@ require (
150147
golang.org/x/time v0.3.0 // indirect
151148
google.golang.org/appengine v1.6.7 // indirect
152149
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
150+
google.golang.org/grpc v1.58.3 // indirect
153151
google.golang.org/protobuf v1.33.0 // indirect
154152
gopkg.in/inf.v0 v0.9.1 // indirect
155153
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
9999
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
100100
github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=
101101
github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
102+
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
103+
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
102104
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
103105
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
104106
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=

0 commit comments

Comments
 (0)