From 08fd96bc77428a7bb1df09b8c1d7d943475fc54f Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Thu, 28 Mar 2024 21:15:27 +0000 Subject: [PATCH] build(deps): bump json-patch to v5.8.0 --- go.mod | 4 ++-- internal/resourcemodifiers/json_merge_patch.go | 2 +- internal/resourcemodifiers/json_patch.go | 2 +- internal/resourcemodifiers/resource_modifiers.go | 2 +- pkg/cmd/cli/plugin/add.go | 2 +- pkg/cmd/cli/plugin/remove.go | 2 +- pkg/controller/backup_deletion_controller.go | 2 +- pkg/restore/merge_service_account.go | 2 +- pkg/util/csi/volume_snapshot.go | 2 +- pkg/util/kube/pvc_pv.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 418ae44c93..dbed665f83 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0 github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 github.com/bombsimon/logrusr/v3 v3.0.0 - github.com/evanphx/json-patch v5.6.0+incompatible + github.com/evanphx/json-patch/v5 v5.8.0 github.com/fatih/color v1.16.0 github.com/gobwas/glob v0.2.3 github.com/golang/protobuf v1.5.4 @@ -105,7 +105,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/edsrzf/mmap-go v1.1.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/evanphx/json-patch/v5 v5.8.0 // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/internal/resourcemodifiers/json_merge_patch.go b/internal/resourcemodifiers/json_merge_patch.go index 5082e2cf59..ea6882f0b2 100644 --- a/internal/resourcemodifiers/json_merge_patch.go +++ b/internal/resourcemodifiers/json_merge_patch.go @@ -3,7 +3,7 @@ package resourcemodifiers import ( "fmt" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "sigs.k8s.io/yaml" diff --git a/internal/resourcemodifiers/json_patch.go b/internal/resourcemodifiers/json_patch.go index d137d40be9..30563f8d90 100644 --- a/internal/resourcemodifiers/json_patch.go +++ b/internal/resourcemodifiers/json_patch.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/resourcemodifiers/resource_modifiers.go b/internal/resourcemodifiers/resource_modifiers.go index d4ae93e717..c11b99cd8b 100644 --- a/internal/resourcemodifiers/resource_modifiers.go +++ b/internal/resourcemodifiers/resource_modifiers.go @@ -19,7 +19,7 @@ import ( "fmt" "regexp" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/gobwas/glob" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/cmd/cli/plugin/add.go b/pkg/cmd/cli/plugin/add.go index 7c0b98929c..4abc6c5bbf 100644 --- a/pkg/cmd/cli/plugin/add.go +++ b/pkg/cmd/cli/plugin/add.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/pkg/errors" "github.com/spf13/cobra" corev1api "k8s.io/api/core/v1" diff --git a/pkg/cmd/cli/plugin/remove.go b/pkg/cmd/cli/plugin/remove.go index 41543ad9b7..ed25dc680a 100644 --- a/pkg/cmd/cli/plugin/remove.go +++ b/pkg/cmd/cli/plugin/remove.go @@ -20,7 +20,7 @@ import ( "context" "encoding/json" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/pkg/errors" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/backup_deletion_controller.go b/pkg/controller/backup_deletion_controller.go index 03a9e379a6..a37f1f9e82 100644 --- a/pkg/controller/backup_deletion_controller.go +++ b/pkg/controller/backup_deletion_controller.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/pkg/errors" "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" diff --git a/pkg/restore/merge_service_account.go b/pkg/restore/merge_service_account.go index a5eddb3b42..f77a7730aa 100644 --- a/pkg/restore/merge_service_account.go +++ b/pkg/restore/merge_service_account.go @@ -19,7 +19,7 @@ package restore import ( "encoding/json" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/pkg/errors" corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/util/csi/volume_snapshot.go b/pkg/util/csi/volume_snapshot.go index a9a88fd32b..1abafaa356 100644 --- a/pkg/util/csi/volume_snapshot.go +++ b/pkg/util/csi/volume_snapshot.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/pkg/errors" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/util/kube/pvc_pv.go b/pkg/util/kube/pvc_pv.go index 32551334b8..6395302d61 100644 --- a/pkg/util/kube/pvc_pv.go +++ b/pkg/util/kube/pvc_pv.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "github.com/pkg/errors" "github.com/sirupsen/logrus" corev1api "k8s.io/api/core/v1"