Skip to content

Commit 8cf853d

Browse files
authored
Merge pull request #591 from mmorel-35/github.com/evanphx/json-patch/v5
deps: use json-patch/v5 instead of incompatible module
2 parents c5e72d7 + aceff34 commit 8cf853d

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
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/v3
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22
55
require (
66
github.com/Masterminds/semver/v3 v3.2.1
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
99
github.com/gonvenience/bunt v1.3.5
1010
github.com/gonvenience/ytbx v1.4.4
1111
github.com/google/go-cmp v0.6.0
@@ -51,6 +51,7 @@ require (
5151
github.com/docker/go-metrics v0.0.1 // indirect
5252
github.com/docker/go-units v0.5.0 // indirect
5353
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
54+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
5455
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
5556
github.com/fatih/color v1.13.0 // indirect
5657
github.com/felixge/httpsnoop v1.0.3 // indirect

go.sum

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

0 commit comments

Comments
 (0)