From 713b7e79c0b33e1589ddfc1000632ea5cb8b37f3 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 16 Feb 2024 13:57:24 +0100 Subject: [PATCH] Use canonical json-patch v4 import The canonical import for json-patch v4 is gopkg.in/evanphx/json-patch.v4 (see https://github.com/evanphx/json-patch/blob/master/README.md#get-it for reference). Using the v4-specific path should also reduce the risk of unwanted v5 upgrade attempts, because they won't be offered as automated upgrades by dependency upgrade management tools, and they won't happen through indirect dependencies (see https://github.com/kubernetes/kubernetes/pull/120327 for context). Signed-off-by: Stephen Kitt Kubernetes-commit: 5300466a5c8988b479a151ceb77f49dd00065c83 --- go.mod | 3 +-- go.sum | 2 -- pkg/cmd/annotate/annotate.go | 2 +- pkg/cmd/label/label.go | 2 +- pkg/cmd/patch/patch.go | 2 +- pkg/cmd/util/editor/editoptions.go | 2 +- pkg/cmd/util/helpers.go | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index a4c18546..ca894a20 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/chai2010/gettext-go v1.0.2 github.com/daviddengcn/go-colortext v1.0.0 github.com/distribution/reference v0.5.0 - github.com/evanphx/json-patch v4.12.0+incompatible github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d github.com/fatih/camelcase v1.0.0 github.com/go-openapi/jsonreference v0.20.2 @@ -28,6 +27,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 golang.org/x/sys v0.20.0 + gopkg.in/evanphx/json-patch.v4 v4.12.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 @@ -89,7 +89,6 @@ require ( golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.21.0 // indirect google.golang.org/protobuf v1.33.0 // indirect - gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect sigs.k8s.io/kustomize/api v0.17.2 // indirect diff --git a/go.sum b/go.sum index 230e6338..60518119 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,6 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= 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/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8= diff --git a/pkg/cmd/annotate/annotate.go b/pkg/cmd/annotate/annotate.go index aeeb5cea..63aa86bd 100644 --- a/pkg/cmd/annotate/annotate.go +++ b/pkg/cmd/annotate/annotate.go @@ -21,8 +21,8 @@ import ( "fmt" "io" - jsonpatch "github.com/evanphx/json-patch" "github.com/spf13/cobra" + jsonpatch "gopkg.in/evanphx/json-patch.v4" "k8s.io/klog/v2" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/cmd/label/label.go b/pkg/cmd/label/label.go index 39ef03f0..269e8e1a 100644 --- a/pkg/cmd/label/label.go +++ b/pkg/cmd/label/label.go @@ -21,8 +21,8 @@ import ( "reflect" "strings" - jsonpatch "github.com/evanphx/json-patch" "github.com/spf13/cobra" + jsonpatch "gopkg.in/evanphx/json-patch.v4" "k8s.io/klog/v2" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/cmd/patch/patch.go b/pkg/cmd/patch/patch.go index be303a53..594e9d08 100644 --- a/pkg/cmd/patch/patch.go +++ b/pkg/cmd/patch/patch.go @@ -22,9 +22,9 @@ import ( "reflect" "strings" - jsonpatch "github.com/evanphx/json-patch" "github.com/pkg/errors" "github.com/spf13/cobra" + jsonpatch "gopkg.in/evanphx/json-patch.v4" "k8s.io/klog/v2" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/cmd/util/editor/editoptions.go b/pkg/cmd/util/editor/editoptions.go index 6ac8117e..2f60808f 100644 --- a/pkg/cmd/util/editor/editoptions.go +++ b/pkg/cmd/util/editor/editoptions.go @@ -29,8 +29,8 @@ import ( goruntime "runtime" "strings" - jsonpatch "github.com/evanphx/json-patch" "github.com/spf13/cobra" + jsonpatch "gopkg.in/evanphx/json-patch.v4" "k8s.io/klog/v2" corev1 "k8s.io/api/core/v1" diff --git a/pkg/cmd/util/helpers.go b/pkg/cmd/util/helpers.go index 2218b9f5..bd291a8c 100644 --- a/pkg/cmd/util/helpers.go +++ b/pkg/cmd/util/helpers.go @@ -27,9 +27,9 @@ import ( "strings" "time" - jsonpatch "github.com/evanphx/json-patch" "github.com/spf13/cobra" "github.com/spf13/pflag" + jsonpatch "gopkg.in/evanphx/json-patch.v4" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta"