From d83864f550ccc6ad5956527423397322615e33a3 Mon Sep 17 00:00:00 2001 From: Chunyi Lyu Date: Tue, 30 May 2023 17:21:00 +0100 Subject: [PATCH] Bump controller runtime to k8s api 1.27 - controller runtime v0.15 contains breaking changes where Validator interfaces have been modified to include warning in return types: https://github.com/kubernetes-sigs/controller-runtime/pull/2014 other breaking changes do not affect us --- api/v1alpha1/superstream_webhook.go | 23 +- api/v1alpha1/superstream_webhook_test.go | 33 +- api/v1beta1/binding_webhook.go | 19 +- api/v1beta1/binding_webhook_test.go | 21 +- api/v1beta1/exchange_webhook.go | 21 +- api/v1beta1/exchange_webhook_test.go | 20 +- api/v1beta1/federation_webhook.go | 19 +- api/v1beta1/federation_webhook_test.go | 58 +-- api/v1beta1/permission_webhook.go | 29 +- api/v1beta1/permission_webhook_test.go | 28 +- api/v1beta1/policy_webhook.go | 19 +- api/v1beta1/policy_webhook_test.go | 20 +- api/v1beta1/queue_webhook.go | 23 +- api/v1beta1/queue_webhook_test.go | 22 +- api/v1beta1/rabbitmq_cluster_reference.go | 9 +- .../rabbitmq_cluster_reference_test.go | 8 +- api/v1beta1/schemareplication_webhook.go | 17 +- api/v1beta1/schemareplication_webhook_test.go | 22 +- api/v1beta1/shovel_webhook.go | 23 +- api/v1beta1/shovel_webhook_test.go | 151 +------ api/v1beta1/suite_test.go | 10 + api/v1beta1/topicpermission_webhook.go | 31 +- api/v1beta1/topicpermission_webhook_test.go | 28 +- api/v1beta1/user_webhook.go | 15 +- api/v1beta1/user_webhook_test.go | 10 +- api/v1beta1/vhost_webhook.go | 17 +- api/v1beta1/vhost_webhook_test.go | 16 +- config/crd/bases/rabbitmq.com_bindings.yaml | 2 +- config/crd/bases/rabbitmq.com_exchanges.yaml | 2 +- .../crd/bases/rabbitmq.com_federations.yaml | 2 +- .../crd/bases/rabbitmq.com_permissions.yaml | 2 +- config/crd/bases/rabbitmq.com_policies.yaml | 2 +- config/crd/bases/rabbitmq.com_queues.yaml | 2 +- .../rabbitmq.com_schemareplications.yaml | 2 +- config/crd/bases/rabbitmq.com_shovels.yaml | 2 +- .../crd/bases/rabbitmq.com_superstreams.yaml | 2 +- .../bases/rabbitmq.com_topicpermissions.yaml | 2 +- config/crd/bases/rabbitmq.com_users.yaml | 2 +- config/crd/bases/rabbitmq.com_vhosts.yaml | 2 +- go.mod | 47 +- go.sum | 424 +++--------------- 41 files changed, 377 insertions(+), 830 deletions(-) diff --git a/api/v1alpha1/superstream_webhook.go b/api/v1alpha1/superstream_webhook.go index a22a8eba..91f73449 100644 --- a/api/v1alpha1/superstream_webhook.go +++ b/api/v1alpha1/superstream_webhook.go @@ -16,6 +16,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (s *SuperStream) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -30,48 +31,48 @@ var _ webhook.Validator = &SuperStream{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (s *SuperStream) ValidateCreate() error { +func (s *SuperStream) ValidateCreate() (admission.Warnings, error) { return s.Spec.RabbitmqClusterReference.ValidateOnCreate(s.GroupResource(), s.Name) } // ValidateUpdate returns error type 'forbidden' for updates on superstream name, vhost and rabbitmqClusterReference -func (s *SuperStream) ValidateUpdate(old runtime.Object) error { +func (s *SuperStream) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldSuperStream, ok := old.(*SuperStream) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a superstream but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a superstream but got a %T", old)) } detailMsg := "updates on name, vhost and rabbitmqClusterReference are all forbidden" if s.Spec.Name != oldSuperStream.Spec.Name { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "name"), detailMsg)) } if s.Spec.Vhost != oldSuperStream.Spec.Vhost { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldSuperStream.Spec.RabbitmqClusterReference.Matches(&s.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } if !routingKeyUpdatePermitted(oldSuperStream.Spec.RoutingKeys, s.Spec.RoutingKeys) { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "routingKeys"), "updates may only add to the existing list of routing keys")) } if s.Spec.Partitions < oldSuperStream.Spec.Partitions { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "partitions"), "updates may only increase the partition count, and may not decrease it")) } - return nil + return nil, nil } // ValidateDelete no validation on delete -func (s *SuperStream) ValidateDelete() error { - return nil +func (s *SuperStream) ValidateDelete() (admission.Warnings, error) { + return nil, nil } // routingKeyUpdatePermitted allows updates only if adding additional keys at the end of the list of keys diff --git a/api/v1alpha1/superstream_webhook_test.go b/api/v1alpha1/superstream_webhook_test.go index a48eb92d..7e063225 100644 --- a/api/v1alpha1/superstream_webhook_test.go +++ b/api/v1alpha1/superstream_webhook_test.go @@ -31,14 +31,16 @@ var _ = Describe("superstream webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := superstream.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + _, err := notAllowed.ValidateCreate() + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := superstream.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + _, err := notAllowed.ValidateCreate() + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) }) @@ -46,13 +48,15 @@ var _ = Describe("superstream webhook", func() { It("does not allow updates on superstream name", func() { newSuperStream := superstream.DeepCopy() newSuperStream.Spec.Name = "new-name" - Expect(apierrors.IsForbidden(newSuperStream.ValidateUpdate(&superstream))).To(BeTrue()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) It("does not allow updates on superstream vhost", func() { newSuperStream := superstream.DeepCopy() newSuperStream.Spec.Vhost = "new-vhost" - Expect(apierrors.IsForbidden(newSuperStream.ValidateUpdate(&superstream))).To(BeTrue()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -60,44 +64,51 @@ var _ = Describe("superstream webhook", func() { newSuperStream.Spec.RabbitmqClusterReference = topologyv1beta1.RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newSuperStream.ValidateUpdate(&superstream))).To(BeTrue()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { newSuperStream := superstream.DeepCopy() newSuperStream.Spec.RabbitmqClusterReference = topologyv1beta1.RabbitmqClusterReference{ConnectionSecret: &corev1.LocalObjectReference{Name: "a-secret"}} - Expect(apierrors.IsForbidden(newSuperStream.ValidateUpdate(&superstream))).To(BeTrue()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) It("does not allow updates on superstream.spec.routingKeys", func() { newSuperStream := superstream.DeepCopy() newSuperStream.Spec.RoutingKeys = []string{"a1", "d6"} - Expect(apierrors.IsForbidden(newSuperStream.ValidateUpdate(&superstream))).To(BeTrue()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) It("if the superstream previously had routing keys and the update only appends, the update succeeds", func() { newSuperStream := superstream.DeepCopy() newSuperStream.Spec.RoutingKeys = []string{"a1", "b2", "f17", "z66"} - Expect(newSuperStream.ValidateUpdate(&superstream)).To(Succeed()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(err).NotTo(HaveOccurred()) }) It("if the superstream previously had no routing keys but now does, the update fails", func() { superstream.Spec.RoutingKeys = nil newSuperStream := superstream.DeepCopy() newSuperStream.Spec.RoutingKeys = []string{"a1", "b2", "f17"} - Expect(apierrors.IsForbidden(newSuperStream.ValidateUpdate(&superstream))).To(BeTrue()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) It("allows superstream.spec.partitions to be increased", func() { newSuperStream := superstream.DeepCopy() newSuperStream.Spec.Partitions = 1000 - Expect(newSuperStream.ValidateUpdate(&superstream)).To(Succeed()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(err).NotTo(HaveOccurred()) }) It("does not allow superstream.spec.partitions to be decreased", func() { newSuperStream := superstream.DeepCopy() newSuperStream.Spec.Partitions = 1 - Expect(apierrors.IsForbidden(newSuperStream.ValidateUpdate(&superstream))).To(BeTrue()) + _, err := newSuperStream.ValidateUpdate(&superstream) + Expect(apierrors.IsForbidden(err)).To(BeTrue()) }) }) }) diff --git a/api/v1beta1/binding_webhook.go b/api/v1beta1/binding_webhook.go index 975b8518..f6a2de2c 100644 --- a/api/v1beta1/binding_webhook.go +++ b/api/v1beta1/binding_webhook.go @@ -8,6 +8,7 @@ import ( "reflect" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (b *Binding) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -22,27 +23,27 @@ var _ webhook.Validator = &Binding{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (b *Binding) ValidateCreate() error { +func (b *Binding) ValidateCreate() (admission.Warnings, error) { return b.Spec.RabbitmqClusterReference.ValidateOnCreate(b.GroupResource(), b.Name) } // ValidateUpdate updates on vhost and rabbitmqClusterReference are forbidden -func (b *Binding) ValidateUpdate(old runtime.Object) error { +func (b *Binding) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldBinding, ok := old.(*Binding) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a binding but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a binding but got a %T", old)) } var allErrs field.ErrorList detailMsg := "updates on vhost and rabbitmqClusterReference are all forbidden" if b.Spec.Vhost != oldBinding.Spec.Vhost { - return apierrors.NewForbidden(b.GroupResource(), b.Name, + return nil, apierrors.NewForbidden(b.GroupResource(), b.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldBinding.Spec.RabbitmqClusterReference.Matches(&b.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(b.GroupResource(), b.Name, + return nil, apierrors.NewForbidden(b.GroupResource(), b.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } @@ -87,12 +88,12 @@ func (b *Binding) ValidateUpdate(old runtime.Object) error { } if len(allErrs) == 0 { - return nil + return nil, nil } - return apierrors.NewInvalid(GroupVersion.WithKind("Binding").GroupKind(), b.Name, allErrs) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Binding").GroupKind(), b.Name, allErrs) } -func (b *Binding) ValidateDelete() error { - return nil +func (b *Binding) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/binding_webhook_test.go b/api/v1beta1/binding_webhook_test.go index d9b2b659..fcf7bc4e 100644 --- a/api/v1beta1/binding_webhook_test.go +++ b/api/v1beta1/binding_webhook_test.go @@ -30,14 +30,14 @@ var _ = Describe("Binding webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := oldBinding.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := oldBinding.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -45,7 +45,7 @@ var _ = Describe("Binding webhook", func() { It("does not allow updates on vhost", func() { newBinding := oldBinding.DeepCopy() newBinding.Spec.Vhost = "/new-vhost" - Expect(apierrors.IsForbidden(newBinding.ValidateUpdate(&oldBinding))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newBinding.ValidateUpdate(&oldBinding)))).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -53,7 +53,7 @@ var _ = Describe("Binding webhook", func() { newBinding.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newBinding.ValidateUpdate(&oldBinding))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newBinding.ValidateUpdate(&oldBinding)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -71,38 +71,37 @@ var _ = Describe("Binding webhook", func() { } new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "new-secret" - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) It("does not allow updates on source", func() { newBinding := oldBinding.DeepCopy() newBinding.Spec.Source = "updated-source" - Expect(apierrors.IsInvalid(newBinding.ValidateUpdate(&oldBinding))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newBinding.ValidateUpdate(&oldBinding)))).To(BeTrue()) }) It("does not allow updates on destination", func() { newBinding := oldBinding.DeepCopy() newBinding.Spec.Destination = "updated-des" - Expect(apierrors.IsInvalid(newBinding.ValidateUpdate(&oldBinding))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newBinding.ValidateUpdate(&oldBinding)))).To(BeTrue()) }) It("does not allow updates on destination type", func() { newBinding := oldBinding.DeepCopy() newBinding.Spec.DestinationType = "exchange" - Expect(apierrors.IsInvalid(newBinding.ValidateUpdate(&oldBinding))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newBinding.ValidateUpdate(&oldBinding)))).To(BeTrue()) }) It("does not allow updates on routing key", func() { newBinding := oldBinding.DeepCopy() newBinding.Spec.RoutingKey = "not-allowed" - Expect(apierrors.IsInvalid(newBinding.ValidateUpdate(&oldBinding))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newBinding.ValidateUpdate(&oldBinding)))).To(BeTrue()) }) It("does not allow updates on binding arguments", func() { newBinding := oldBinding.DeepCopy() newBinding.Spec.Arguments = &runtime.RawExtension{Raw: []byte(`{"new":"new-value"}`)} - Expect(apierrors.IsInvalid(newBinding.ValidateUpdate(&oldBinding))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newBinding.ValidateUpdate(&oldBinding)))).To(BeTrue()) }) }) - }) diff --git a/api/v1beta1/exchange_webhook.go b/api/v1beta1/exchange_webhook.go index 8a7f6cee..ab545f7a 100644 --- a/api/v1beta1/exchange_webhook.go +++ b/api/v1beta1/exchange_webhook.go @@ -7,6 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (r *Exchange) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -21,7 +22,7 @@ var _ webhook.Validator = &Exchange{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (e *Exchange) ValidateCreate() error { +func (e *Exchange) ValidateCreate() (admission.Warnings, error) { return e.Spec.RabbitmqClusterReference.ValidateOnCreate(e.GroupResource(), e.Name) } @@ -29,26 +30,26 @@ func (e *Exchange) ValidateCreate() error { // returns error type 'forbidden' for updates that the controller chooses to disallow: exchange name/vhost/rabbitmqClusterReference // returns error type 'invalid' for updates that will be rejected by rabbitmq server: exchange types/autoDelete/durable // exchange.spec.arguments can be updated -func (e *Exchange) ValidateUpdate(old runtime.Object) error { +func (e *Exchange) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldExchange, ok := old.(*Exchange) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected an exchange but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected an exchange but got a %T", old)) } var allErrs field.ErrorList detailMsg := "updates on name, vhost, and rabbitmqClusterReference are all forbidden" if e.Spec.Name != oldExchange.Spec.Name { - return apierrors.NewForbidden(e.GroupResource(), e.Name, + return nil, apierrors.NewForbidden(e.GroupResource(), e.Name, field.Forbidden(field.NewPath("spec", "name"), detailMsg)) } if e.Spec.Vhost != oldExchange.Spec.Vhost { - return apierrors.NewForbidden(e.GroupResource(), e.Name, + return nil, apierrors.NewForbidden(e.GroupResource(), e.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldExchange.Spec.RabbitmqClusterReference.Matches(&e.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(e.GroupResource(), e.Name, + return nil, apierrors.NewForbidden(e.GroupResource(), e.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } @@ -77,12 +78,12 @@ func (e *Exchange) ValidateUpdate(old runtime.Object) error { } if len(allErrs) == 0 { - return nil + return nil, nil } - return apierrors.NewInvalid(GroupVersion.WithKind("Exchange").GroupKind(), e.Name, allErrs) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Exchange").GroupKind(), e.Name, allErrs) } -func (e *Exchange) ValidateDelete() error { - return nil +func (e *Exchange) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/exchange_webhook_test.go b/api/v1beta1/exchange_webhook_test.go index 2c08cace..047fcffe 100644 --- a/api/v1beta1/exchange_webhook_test.go +++ b/api/v1beta1/exchange_webhook_test.go @@ -31,14 +31,14 @@ var _ = Describe("exchange webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := exchange.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := exchange.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -46,13 +46,13 @@ var _ = Describe("exchange webhook", func() { It("does not allow updates on exchange name", func() { newExchange := exchange.DeepCopy() newExchange.Spec.Name = "new-name" - Expect(apierrors.IsForbidden(newExchange.ValidateUpdate(&exchange))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newExchange.ValidateUpdate(&exchange)))).To(BeTrue()) }) It("does not allow updates on vhost", func() { newExchange := exchange.DeepCopy() newExchange.Spec.Vhost = "/a-new-vhost" - Expect(apierrors.IsForbidden(newExchange.ValidateUpdate(&exchange))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newExchange.ValidateUpdate(&exchange)))).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -60,7 +60,7 @@ var _ = Describe("exchange webhook", func() { newExchange.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newExchange.ValidateUpdate(&exchange))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newExchange.ValidateUpdate(&exchange)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -81,31 +81,31 @@ var _ = Describe("exchange webhook", func() { } new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "new-secret" - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) It("does not allow updates on exchange type", func() { newExchange := exchange.DeepCopy() newExchange.Spec.Type = "direct" - Expect(apierrors.IsInvalid(newExchange.ValidateUpdate(&exchange))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newExchange.ValidateUpdate(&exchange)))).To(BeTrue()) }) It("does not allow updates on durable", func() { newExchange := exchange.DeepCopy() newExchange.Spec.Durable = true - Expect(apierrors.IsInvalid(newExchange.ValidateUpdate(&exchange))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newExchange.ValidateUpdate(&exchange)))).To(BeTrue()) }) It("does not allow updates on autoDelete", func() { newExchange := exchange.DeepCopy() newExchange.Spec.AutoDelete = false - Expect(apierrors.IsInvalid(newExchange.ValidateUpdate(&exchange))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newExchange.ValidateUpdate(&exchange)))).To(BeTrue()) }) It("allows updates on arguments", func() { newExchange := exchange.DeepCopy() newExchange.Spec.Arguments = &runtime.RawExtension{Raw: []byte(`{"new":"new-value"}`)} - Expect(newExchange.ValidateUpdate(&exchange)).To(Succeed()) + Expect(ignoreNilWarning(newExchange.ValidateUpdate(&exchange))).To(Succeed()) }) }) }) diff --git a/api/v1beta1/federation_webhook.go b/api/v1beta1/federation_webhook.go index cd961def..9c4b1fd4 100644 --- a/api/v1beta1/federation_webhook.go +++ b/api/v1beta1/federation_webhook.go @@ -6,6 +6,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (f *Federation) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -18,35 +19,35 @@ func (f *Federation) SetupWebhookWithManager(mgr ctrl.Manager) error { // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (f *Federation) ValidateCreate() error { +func (f *Federation) ValidateCreate() (admission.Warnings, error) { return f.Spec.RabbitmqClusterReference.ValidateOnCreate(f.GroupResource(), f.Name) } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type -func (f *Federation) ValidateUpdate(old runtime.Object) error { +func (f *Federation) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldFederation, ok := old.(*Federation) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a federation but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a federation but got a %T", old)) } detailMsg := "updates on name, vhost and rabbitmqClusterReference are all forbidden" if f.Spec.Name != oldFederation.Spec.Name { - return apierrors.NewForbidden(f.GroupResource(), f.Name, + return nil, apierrors.NewForbidden(f.GroupResource(), f.Name, field.Forbidden(field.NewPath("spec", "name"), detailMsg)) } if f.Spec.Vhost != oldFederation.Spec.Vhost { - return apierrors.NewForbidden(f.GroupResource(), f.Name, + return nil, apierrors.NewForbidden(f.GroupResource(), f.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldFederation.Spec.RabbitmqClusterReference.Matches(&f.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(f.GroupResource(), f.Name, + return nil, apierrors.NewForbidden(f.GroupResource(), f.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } - return nil + return nil, nil } -func (f *Federation) ValidateDelete() error { - return nil +func (f *Federation) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/federation_webhook_test.go b/api/v1beta1/federation_webhook_test.go index 9adb3096..654c6f4a 100644 --- a/api/v1beta1/federation_webhook_test.go +++ b/api/v1beta1/federation_webhook_test.go @@ -36,14 +36,14 @@ var _ = Describe("federation webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := federation.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := federation.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -51,13 +51,13 @@ var _ = Describe("federation webhook", func() { It("does not allow updates on name", func() { newFederation := federation.DeepCopy() newFederation.Spec.Name = "new-upstream" - Expect(apierrors.IsForbidden(newFederation.ValidateUpdate(&federation))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newFederation.ValidateUpdate(&federation)))).To(BeTrue()) }) It("does not allow updates on vhost", func() { newFederation := federation.DeepCopy() newFederation.Spec.Vhost = "new-vhost" - Expect(apierrors.IsForbidden(newFederation.ValidateUpdate(&federation))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newFederation.ValidateUpdate(&federation)))).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -65,7 +65,7 @@ var _ = Describe("federation webhook", func() { newFederation.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newFederation.ValidateUpdate(&federation))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newFederation.ValidateUpdate(&federation)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -88,61 +88,21 @@ var _ = Describe("federation webhook", func() { } new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "new-secret" - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) - It("allows updates on federation.spec.uriSecret", func() { + It("allows updates on federation configurations", func() { newFederation := federation.DeepCopy() newFederation.Spec.UriSecret = &corev1.LocalObjectReference{Name: "a-new-secret"} - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) - }) - - It("allows updates on federation.spec.expires", func() { - newFederation := federation.DeepCopy() newFederation.Spec.Expires = 10 - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) - }) - - It("allows updates on federation.spec.messageTTL", func() { - newFederation := federation.DeepCopy() newFederation.Spec.MessageTTL = 10 - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) - }) - - It("allows updates on federation.spec.maxHops", func() { - newFederation := federation.DeepCopy() newFederation.Spec.MaxHops = 10 - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) - }) - - It("allows updates on federation.spec.prefetchCount", func() { - newFederation := federation.DeepCopy() newFederation.Spec.PrefetchCount = 10 - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) - }) - - It("allows updates on federation.spec.reconnectDelay", func() { - newFederation := federation.DeepCopy() - newFederation.Spec.PrefetchCount = 10000 - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) - }) - - It("allows updates on federation.spec.trustUserId", func() { - newFederation := federation.DeepCopy() + newFederation.Spec.ReconnectDelay = 10000 newFederation.Spec.TrustUserId = false - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) - }) - - It("allows updates on federation.spec.exchange", func() { - newFederation := federation.DeepCopy() newFederation.Spec.Exchange = "new-exchange" - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) - }) - - It("allows updates on federation.spec.ackMode", func() { - newFederation := federation.DeepCopy() newFederation.Spec.AckMode = "no-ack" - Expect(newFederation.ValidateUpdate(&federation)).To(Succeed()) + Expect(ignoreNilWarning(newFederation.ValidateUpdate(&federation))).To(Succeed()) }) }) }) diff --git a/api/v1beta1/permission_webhook.go b/api/v1beta1/permission_webhook.go index 9df03b28..bb26de08 100644 --- a/api/v1beta1/permission_webhook.go +++ b/api/v1beta1/permission_webhook.go @@ -8,6 +8,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (p *Permission) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -22,18 +23,18 @@ var _ webhook.Validator = &Permission{} // ValidateCreate checks if only one of spec.user and spec.userReference is specified // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (p *Permission) ValidateCreate() error { +func (p *Permission) ValidateCreate() (admission.Warnings, error) { var errorList field.ErrorList if p.Spec.User == "" && p.Spec.UserReference == nil { errorList = append(errorList, field.Required(field.NewPath("spec", "user and userReference"), "must specify either spec.user or spec.userReference")) - return apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) } if p.Spec.User != "" && p.Spec.UserReference != nil { errorList = append(errorList, field.Required(field.NewPath("spec", "user and userReference"), "cannot specify spec.user and spec.userReference at the same time")) - return apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) } return p.Spec.RabbitmqClusterReference.ValidateOnCreate(p.GroupResource(), p.Name) @@ -42,46 +43,46 @@ func (p *Permission) ValidateCreate() error { // ValidateUpdate do not allow updates on spec.vhost, spec.user, spec.userReference, and spec.rabbitmqClusterReference // updates on spec.permissions are allowed // only one of spec.user and spec.userReference can be specified -func (p *Permission) ValidateUpdate(old runtime.Object) error { +func (p *Permission) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldPermission, ok := old.(*Permission) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a permission but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a permission but got a %T", old)) } var errorList field.ErrorList if p.Spec.User == "" && p.Spec.UserReference == nil { errorList = append(errorList, field.Required(field.NewPath("spec", "user and userReference"), "must specify either spec.user or spec.userReference")) - return apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) } if p.Spec.User != "" && p.Spec.UserReference != nil { errorList = append(errorList, field.Required(field.NewPath("spec", "user and userReference"), "cannot specify spec.user and spec.userReference at the same time")) - return apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) } detailMsg := "updates on user, userReference, vhost and rabbitmqClusterReference are all forbidden" if p.Spec.User != oldPermission.Spec.User { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "user"), detailMsg)) } if userReferenceUpdated(p.Spec.UserReference, oldPermission.Spec.UserReference) { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "userReference"), detailMsg)) } if p.Spec.Vhost != oldPermission.Spec.Vhost { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldPermission.Spec.RabbitmqClusterReference.Matches(&p.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } - return nil + return nil, nil } // returns true if userReference, which is a pointer to corev1.LocalObjectReference, has changed @@ -100,6 +101,6 @@ func userReferenceUpdated(new, old *corev1.LocalObjectReference) bool { } // ValidateDelete no validation on delete -func (p *Permission) ValidateDelete() error { - return nil +func (p *Permission) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/permission_webhook_test.go b/api/v1beta1/permission_webhook_test.go index 90bd9e1b..1a5152ac 100644 --- a/api/v1beta1/permission_webhook_test.go +++ b/api/v1beta1/permission_webhook_test.go @@ -32,26 +32,26 @@ var _ = Describe("permission webhook", func() { invalidPermission := permission.DeepCopy() invalidPermission.Spec.UserReference = &corev1.LocalObjectReference{Name: "invalid"} invalidPermission.Spec.User = "test-user" - Expect(apierrors.IsInvalid(invalidPermission.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(invalidPermission.ValidateCreate()))).To(BeTrue()) }) It("does not allow both user and userReference to be unset", func() { invalidPermission := permission.DeepCopy() invalidPermission.Spec.UserReference = nil invalidPermission.Spec.User = "" - Expect(apierrors.IsInvalid(invalidPermission.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(invalidPermission.ValidateCreate()))).To(BeTrue()) }) It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := permission.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := permission.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -59,7 +59,7 @@ var _ = Describe("permission webhook", func() { It("does not allow updates on user", func() { newPermission := permission.DeepCopy() newPermission.Spec.User = "new-user" - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("does not allow updates on userReference", func() { @@ -68,13 +68,13 @@ var _ = Describe("permission webhook", func() { permissionWithUserRef.Spec.UserReference = &corev1.LocalObjectReference{Name: "a-user"} newPermission := permissionWithUserRef.DeepCopy() newPermission.Spec.UserReference = &corev1.LocalObjectReference{Name: "a-new-user"} - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(permissionWithUserRef))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(permissionWithUserRef)))).To(BeTrue()) }) It("does not allow updates on vhost", func() { newPermission := permission.DeepCopy() newPermission.Spec.Vhost = "new-vhost" - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -82,7 +82,7 @@ var _ = Describe("permission webhook", func() { newPermission.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -107,38 +107,38 @@ var _ = Describe("permission webhook", func() { } new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "new-secret" - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) It("allows updates on permission.spec.permissions.configure", func() { newPermission := permission.DeepCopy() newPermission.Spec.Permissions.Configure = "?" - Expect(newPermission.ValidateUpdate(&permission)).To(Succeed()) + Expect(ignoreNilWarning(newPermission.ValidateUpdate(&permission))).To(Succeed()) }) It("allows updates on permission.spec.permissions.read", func() { newPermission := permission.DeepCopy() newPermission.Spec.Permissions.Read = "?" - Expect(newPermission.ValidateUpdate(&permission)).To(Succeed()) + Expect(ignoreNilWarning(newPermission.ValidateUpdate(&permission))).To(Succeed()) }) It("allows updates on permission.spec.permissions.write", func() { newPermission := permission.DeepCopy() newPermission.Spec.Permissions.Write = "?" - Expect(newPermission.ValidateUpdate(&permission)).To(Succeed()) + Expect(ignoreNilWarning(newPermission.ValidateUpdate(&permission))).To(Succeed()) }) It("does not allow user and userReference to be specified at the same time", func() { newPermission := permission.DeepCopy() newPermission.Spec.UserReference = &corev1.LocalObjectReference{Name: "invalid"} - Expect(apierrors.IsInvalid(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("does not allow both user and userReference to be unset", func() { newPermission := permission.DeepCopy() newPermission.Spec.User = "" newPermission.Spec.UserReference = nil - Expect(apierrors.IsInvalid(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) }) }) diff --git a/api/v1beta1/policy_webhook.go b/api/v1beta1/policy_webhook.go index 15ef6eb3..deefc6cb 100644 --- a/api/v1beta1/policy_webhook.go +++ b/api/v1beta1/policy_webhook.go @@ -7,6 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (p *Policy) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -21,35 +22,35 @@ var _ webhook.Validator = &Policy{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (p *Policy) ValidateCreate() error { +func (p *Policy) ValidateCreate() (admission.Warnings, error) { return p.Spec.RabbitmqClusterReference.ValidateOnCreate(p.GroupResource(), p.Name) } // ValidateUpdate returns error type 'forbidden' for updates on policy name, vhost and rabbitmqClusterReference -func (p *Policy) ValidateUpdate(old runtime.Object) error { +func (p *Policy) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldPolicy, ok := old.(*Policy) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a policy but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a policy but got a %T", old)) } detailMsg := "updates on name, vhost and rabbitmqClusterReference are all forbidden" if p.Spec.Name != oldPolicy.Spec.Name { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "name"), detailMsg)) } if p.Spec.Vhost != oldPolicy.Spec.Vhost { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldPolicy.Spec.RabbitmqClusterReference.Matches(&p.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } - return nil + return nil, nil } -func (p *Policy) ValidateDelete() error { - return nil +func (p *Policy) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/policy_webhook_test.go b/api/v1beta1/policy_webhook_test.go index be41c58d..bcb895b8 100644 --- a/api/v1beta1/policy_webhook_test.go +++ b/api/v1beta1/policy_webhook_test.go @@ -30,14 +30,14 @@ var _ = Describe("policy webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := policy.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := policy.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -45,13 +45,13 @@ var _ = Describe("policy webhook", func() { It("does not allow updates on policy name", func() { newPolicy := policy.DeepCopy() newPolicy.Spec.Name = "new-name" - Expect(apierrors.IsForbidden(newPolicy.ValidateUpdate(&policy))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPolicy.ValidateUpdate(&policy)))).To(BeTrue()) }) It("does not allow updates on vhost", func() { newPolicy := policy.DeepCopy() newPolicy.Spec.Vhost = "new-vhost" - Expect(apierrors.IsForbidden(newPolicy.ValidateUpdate(&policy))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPolicy.ValidateUpdate(&policy)))).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -59,7 +59,7 @@ var _ = Describe("policy webhook", func() { newPolicy.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newPolicy.ValidateUpdate(&policy))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPolicy.ValidateUpdate(&policy)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -82,31 +82,31 @@ var _ = Describe("policy webhook", func() { } new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "new-secret" - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) It("allows updates on policy.spec.pattern", func() { newPolicy := policy.DeepCopy() newPolicy.Spec.Pattern = "new-pattern" - Expect(newPolicy.ValidateUpdate(&policy)).To(Succeed()) + Expect(ignoreNilWarning(newPolicy.ValidateUpdate(&policy))).To(Succeed()) }) It("allows updates on policy.spec.applyTo", func() { newPolicy := policy.DeepCopy() newPolicy.Spec.ApplyTo = "queues" - Expect(newPolicy.ValidateUpdate(&policy)).To(Succeed()) + Expect(ignoreNilWarning(newPolicy.ValidateUpdate(&policy))).To(Succeed()) }) It("allows updates on policy.spec.priority", func() { newPolicy := policy.DeepCopy() newPolicy.Spec.Priority = 1000 - Expect(newPolicy.ValidateUpdate(&policy)).To(Succeed()) + Expect(ignoreNilWarning(newPolicy.ValidateUpdate(&policy))).To(Succeed()) }) It("allows updates on policy.spec.definition", func() { newPolicy := policy.DeepCopy() newPolicy.Spec.Definition = &runtime.RawExtension{Raw: []byte(`{"key":"new-definition-value"}`)} - Expect(newPolicy.ValidateUpdate(&policy)).To(Succeed()) + Expect(ignoreNilWarning(newPolicy.ValidateUpdate(&policy))).To(Succeed()) }) }) }) diff --git a/api/v1beta1/queue_webhook.go b/api/v1beta1/queue_webhook.go index fe277d93..f9c94d97 100644 --- a/api/v1beta1/queue_webhook.go +++ b/api/v1beta1/queue_webhook.go @@ -7,6 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (q *Queue) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -21,9 +22,9 @@ var _ webhook.Validator = &Queue{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (q *Queue) ValidateCreate() error { +func (q *Queue) ValidateCreate() (admission.Warnings, error) { if q.Spec.Type == "quorum" && q.Spec.Durable == false { - return apierrors.NewForbidden(q.GroupResource(), q.Name, + return nil, apierrors.NewForbidden(q.GroupResource(), q.Name, field.Forbidden(field.NewPath("spec", "durable"), "Quorum queues must have durable set to true")) } @@ -34,26 +35,26 @@ func (q *Queue) ValidateCreate() error { // returns error type 'forbidden' for updates that the controller chooses to disallow: queue name/vhost/rabbitmqClusterReference // returns error type 'invalid' for updates that will be rejected by rabbitmq server: queue types/autoDelete/durable // queue arguments not handled because implementation couldn't change -func (q *Queue) ValidateUpdate(old runtime.Object) error { +func (q *Queue) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldQueue, ok := old.(*Queue) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a queue but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a queue but got a %T", old)) } var allErrs field.ErrorList detailMsg := "updates on name, vhost, and rabbitmqClusterReference are all forbidden" if q.Spec.Name != oldQueue.Spec.Name { - return apierrors.NewForbidden(q.GroupResource(), q.Name, + return nil, apierrors.NewForbidden(q.GroupResource(), q.Name, field.Forbidden(field.NewPath("spec", "name"), detailMsg)) } if q.Spec.Vhost != oldQueue.Spec.Vhost { - return apierrors.NewForbidden(q.GroupResource(), q.Name, + return nil, apierrors.NewForbidden(q.GroupResource(), q.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldQueue.Spec.RabbitmqClusterReference.Matches(&q.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(q.GroupResource(), q.Name, + return nil, apierrors.NewForbidden(q.GroupResource(), q.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } @@ -82,12 +83,12 @@ func (q *Queue) ValidateUpdate(old runtime.Object) error { } if len(allErrs) == 0 { - return nil + return nil, nil } - return apierrors.NewInvalid(GroupVersion.WithKind("Queue").GroupKind(), q.Name, allErrs) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Queue").GroupKind(), q.Name, allErrs) } -func (q *Queue) ValidateDelete() error { - return nil +func (q *Queue) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/queue_webhook_test.go b/api/v1beta1/queue_webhook_test.go index 457eb1f7..09ba709b 100644 --- a/api/v1beta1/queue_webhook_test.go +++ b/api/v1beta1/queue_webhook_test.go @@ -30,20 +30,20 @@ var _ = Describe("queue webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowedQ := queue.DeepCopy() notAllowedQ.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowedQ.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowedQ.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowedQ := queue.DeepCopy() notAllowedQ.Spec.RabbitmqClusterReference.Name = "" notAllowedQ.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowedQ.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowedQ.ValidateCreate()))).To(BeTrue()) }) It("does not allow non-durable quorum queues", func() { notAllowedQ := queue.DeepCopy() notAllowedQ.Spec.AutoDelete = false - Expect(apierrors.IsForbidden(notAllowedQ.ValidateCreate())).To(BeTrue(), "Expected 'forbidden' response for non-durable quorum queue") + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowedQ.ValidateCreate()))).To(BeTrue(), "Expected 'forbidden' response for non-durable quorum queue") }) }) @@ -51,13 +51,13 @@ var _ = Describe("queue webhook", func() { It("does not allow updates on queue name", func() { newQueue := queue.DeepCopy() newQueue.Spec.Name = "new-name" - Expect(apierrors.IsForbidden(newQueue.ValidateUpdate(&queue))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newQueue.ValidateUpdate(&queue)))).To(BeTrue()) }) It("does not allow updates on vhost", func() { newQueue := queue.DeepCopy() newQueue.Spec.Vhost = "/new-vhost" - Expect(apierrors.IsForbidden(newQueue.ValidateUpdate(&queue))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newQueue.ValidateUpdate(&queue)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.name", func() { @@ -65,7 +65,7 @@ var _ = Describe("queue webhook", func() { newQueue.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newQueue.ValidateUpdate(&queue))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newQueue.ValidateUpdate(&queue)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.namespace", func() { @@ -73,7 +73,7 @@ var _ = Describe("queue webhook", func() { newQueue.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Namespace: "new-ns", } - Expect(apierrors.IsForbidden(newQueue.ValidateUpdate(&queue))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newQueue.ValidateUpdate(&queue)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -92,25 +92,25 @@ var _ = Describe("queue webhook", func() { } newQueue := connectionScrQ.DeepCopy() newQueue.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "new-secret" - Expect(apierrors.IsForbidden(newQueue.ValidateUpdate(&connectionScrQ))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newQueue.ValidateUpdate(&connectionScrQ)))).To(BeTrue()) }) It("does not allow updates on queue type", func() { newQueue := queue.DeepCopy() newQueue.Spec.Type = "classic" - Expect(apierrors.IsInvalid(newQueue.ValidateUpdate(&queue))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newQueue.ValidateUpdate(&queue)))).To(BeTrue()) }) It("does not allow updates on durable", func() { newQueue := queue.DeepCopy() newQueue.Spec.Durable = true - Expect(apierrors.IsInvalid(newQueue.ValidateUpdate(&queue))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newQueue.ValidateUpdate(&queue)))).To(BeTrue()) }) It("does not allow updates on autoDelete", func() { newQueue := queue.DeepCopy() newQueue.Spec.AutoDelete = false - Expect(apierrors.IsInvalid(newQueue.ValidateUpdate(&queue))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newQueue.ValidateUpdate(&queue)))).To(BeTrue()) }) }) }) diff --git a/api/v1beta1/rabbitmq_cluster_reference.go b/api/v1beta1/rabbitmq_cluster_reference.go index 129b4070..50c45f61 100644 --- a/api/v1beta1/rabbitmq_cluster_reference.go +++ b/api/v1beta1/rabbitmq_cluster_reference.go @@ -5,6 +5,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) type RabbitmqClusterReference struct { @@ -48,17 +49,17 @@ func (r *RabbitmqClusterReference) Matches(new *RabbitmqClusterReference) bool { // ValidateOnCreate validates RabbitmqClusterReference on resources create // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both; else it errors -func (ref *RabbitmqClusterReference) ValidateOnCreate(groupResource schema.GroupResource, name string) error { +func (ref *RabbitmqClusterReference) ValidateOnCreate(groupResource schema.GroupResource, name string) (admission.Warnings, error) { if ref.Name != "" && ref.ConnectionSecret != nil { - return apierrors.NewForbidden(groupResource, name, + return nil, apierrors.NewForbidden(groupResource, name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), "do not provide both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret")) } if ref.Name == "" && ref.ConnectionSecret == nil { - return apierrors.NewForbidden(groupResource, name, + return nil, apierrors.NewForbidden(groupResource, name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), "must provide either spec.rabbitmqClusterReference.name or spec.rabbitmqClusterReference.connectionSecret")) } - return nil + return nil, nil } diff --git a/api/v1beta1/rabbitmq_cluster_reference_test.go b/api/v1beta1/rabbitmq_cluster_reference_test.go index bc2114be..79c98a91 100644 --- a/api/v1beta1/rabbitmq_cluster_reference_test.go +++ b/api/v1beta1/rabbitmq_cluster_reference_test.go @@ -78,7 +78,7 @@ var _ = Describe("RabbitmqClusterReference", func() { It("returns no error", func() { reference.ConnectionSecret = nil reference.Name = "a-name" - Expect(reference.ValidateOnCreate(schema.GroupResource{}, "a-resource")).To(Succeed()) + Expect(ignoreNilWarning(reference.ValidateOnCreate(schema.GroupResource{}, "a-resource"))).To(Succeed()) }) }) @@ -86,7 +86,7 @@ var _ = Describe("RabbitmqClusterReference", func() { It("returns no error", func() { reference.ConnectionSecret = &v1.LocalObjectReference{Name: "a-secret-name"} reference.Name = "" - Expect(reference.ValidateOnCreate(schema.GroupResource{}, "a-resource")).To(Succeed()) + Expect(ignoreNilWarning(reference.ValidateOnCreate(schema.GroupResource{}, "a-resource"))).To(Succeed()) }) }) @@ -94,7 +94,7 @@ var _ = Describe("RabbitmqClusterReference", func() { It("returns a forbidden api error", func() { reference.Name = "a-cluster" reference.ConnectionSecret = &v1.LocalObjectReference{Name: "a-secret-name"} - Expect(apierrors.IsForbidden(reference.ValidateOnCreate(schema.GroupResource{}, "a-resource"))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(reference.ValidateOnCreate(schema.GroupResource{}, "a-resource")))).To(BeTrue()) }) }) @@ -102,7 +102,7 @@ var _ = Describe("RabbitmqClusterReference", func() { It("returns a forbidden api error", func() { reference.ConnectionSecret = nil reference.Name = "" - Expect(apierrors.IsForbidden(reference.ValidateOnCreate(schema.GroupResource{}, "a-resource"))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(reference.ValidateOnCreate(schema.GroupResource{}, "a-resource")))).To(BeTrue()) }) }) }) diff --git a/api/v1beta1/schemareplication_webhook.go b/api/v1beta1/schemareplication_webhook.go index b004b660..609af3b3 100644 --- a/api/v1beta1/schemareplication_webhook.go +++ b/api/v1beta1/schemareplication_webhook.go @@ -7,6 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (s *SchemaReplication) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -22,31 +23,31 @@ var _ webhook.Validator = &SchemaReplication{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. // either secretBackend.vault.secretPath or upstreamSecret must be provided but not both. // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both. -func (s *SchemaReplication) ValidateCreate() error { +func (s *SchemaReplication) ValidateCreate() (admission.Warnings, error) { if err := s.validateSecret(); err != nil { - return err + return nil, err } return s.Spec.RabbitmqClusterReference.ValidateOnCreate(s.GroupResource(), s.Name) } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. // either secretBackend.vault.secretPath or upstreamSecret must be provided but not both. -func (s *SchemaReplication) ValidateUpdate(old runtime.Object) error { +func (s *SchemaReplication) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldReplication, ok := old.(*SchemaReplication) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a schema replication type but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a schema replication type but got a %T", old)) } if !oldReplication.Spec.RabbitmqClusterReference.Matches(&s.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), "update on rabbitmqClusterReference is forbidden")) } - return s.validateSecret() + return nil, s.validateSecret() } // ValidateDelete no validation on delete -func (s *SchemaReplication) ValidateDelete() error { - return nil +func (s *SchemaReplication) ValidateDelete() (admission.Warnings, error) { + return nil, nil } func (s *SchemaReplication) validateSecret() error { diff --git a/api/v1beta1/schemareplication_webhook_test.go b/api/v1beta1/schemareplication_webhook_test.go index fc353cb1..192e9fde 100644 --- a/api/v1beta1/schemareplication_webhook_test.go +++ b/api/v1beta1/schemareplication_webhook_test.go @@ -28,14 +28,14 @@ var _ = Describe("schema-replication webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := replication.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := replication.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("does not allow both spec.upstreamSecret and spec.secretBackend.vault.userPath be configured", func() { @@ -45,7 +45,7 @@ var _ = Describe("schema-replication webhook", func() { SecretPath: "not-good", }, } - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.upstreamSecret and spec.secretBackend.vault.userPath cannot both be not configured", func() { @@ -54,7 +54,7 @@ var _ = Describe("schema-replication webhook", func() { Vault: &VaultSpec{}, } notAllowed.Spec.UpstreamSecret.Name = "" - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -64,7 +64,7 @@ var _ = Describe("schema-replication webhook", func() { updated.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "different-cluster", } - Expect(apierrors.IsForbidden(updated.ValidateUpdate(&replication))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(updated.ValidateUpdate(&replication)))).To(BeTrue()) }) It("does not allow both spec.upstreamSecret and spec.secretBackend.vault.userPath be configured", func() { @@ -74,7 +74,7 @@ var _ = Describe("schema-replication webhook", func() { SecretPath: "not-good", }, } - Expect(apierrors.IsForbidden(updated.ValidateUpdate(&replication))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(updated.ValidateUpdate(&replication)))).To(BeTrue()) }) It("spec.upstreamSecret and spec.secretBackend.vault.userPath cannot both be not configured", func() { @@ -83,7 +83,7 @@ var _ = Describe("schema-replication webhook", func() { Vault: &VaultSpec{}, } updated.Spec.UpstreamSecret.Name = "" - Expect(apierrors.IsForbidden(updated.ValidateUpdate(&replication))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(updated.ValidateUpdate(&replication)))).To(BeTrue()) }) It("allows update on spec.secretBackend.vault.userPath", func() { @@ -94,7 +94,7 @@ var _ = Describe("schema-replication webhook", func() { }, } updated.Spec.UpstreamSecret.Name = "" - Expect(updated.ValidateUpdate(&replication)).To(Succeed()) + Expect(ignoreNilWarning(updated.ValidateUpdate(&replication))).To(Succeed()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -116,7 +116,7 @@ var _ = Describe("schema-replication webhook", func() { } newObj := connectionScr.DeepCopy() newObj.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "newObj-secret" - Expect(apierrors.IsForbidden(newObj.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newObj.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) It("allows updates on spec.upstreamSecret", func() { @@ -124,13 +124,13 @@ var _ = Describe("schema-replication webhook", func() { updated.Spec.UpstreamSecret = &corev1.LocalObjectReference{ Name: "a-different-secret", } - Expect(updated.ValidateUpdate(&replication)).To(Succeed()) + Expect(ignoreNilWarning(updated.ValidateUpdate(&replication))).To(Succeed()) }) It("allows updates on spec.endpoints", func() { updated := replication.DeepCopy() updated.Spec.Endpoints = "abc.new-rmq:1111" - Expect(updated.ValidateUpdate(&replication)).To(Succeed()) + Expect(ignoreNilWarning(updated.ValidateUpdate(&replication))).To(Succeed()) }) }) }) diff --git a/api/v1beta1/shovel_webhook.go b/api/v1beta1/shovel_webhook.go index c55af6fe..247c8b8b 100644 --- a/api/v1beta1/shovel_webhook.go +++ b/api/v1beta1/shovel_webhook.go @@ -7,6 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (s *Shovel) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -21,44 +22,44 @@ var _ webhook.Validator = &Shovel{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (s *Shovel) ValidateCreate() error { +func (s *Shovel) ValidateCreate() (admission.Warnings, error) { if err := s.amqp10Validate(); err != nil { - return err + return nil, err } return s.Spec.RabbitmqClusterReference.ValidateOnCreate(s.GroupResource(), s.Name) } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type -func (s *Shovel) ValidateUpdate(old runtime.Object) error { +func (s *Shovel) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldShovel, ok := old.(*Shovel) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a shovel but got a %T", oldShovel)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a shovel but got a %T", oldShovel)) } if err := s.amqp10Validate(); err != nil { - return err + return nil, err } detailMsg := "updates on name, vhost and rabbitmqClusterReference are all forbidden" if s.Spec.Name != oldShovel.Spec.Name { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "name"), detailMsg)) } if s.Spec.Vhost != oldShovel.Spec.Vhost { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldShovel.Spec.RabbitmqClusterReference.Matches(&s.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(s.GroupResource(), s.Name, + return nil, apierrors.NewForbidden(s.GroupResource(), s.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } - return nil + return nil, nil } -func (s *Shovel) ValidateDelete() error { - return nil +func (s *Shovel) ValidateDelete() (admission.Warnings, error) { + return nil, nil } func (s *Shovel) amqp10Validate() error { diff --git a/api/v1beta1/shovel_webhook_test.go b/api/v1beta1/shovel_webhook_test.go index 2f2508ab..47d769b9 100644 --- a/api/v1beta1/shovel_webhook_test.go +++ b/api/v1beta1/shovel_webhook_test.go @@ -54,28 +54,28 @@ var _ = Describe("shovel webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := shovel.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := shovel.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.srcAddress must be set if spec.srcProtocol is amqp10", func() { notValid := shovel.DeepCopy() notValid.Spec.SourceProtocol = "amqp10" notValid.Spec.SourceAddress = "" - Expect(apierrors.IsInvalid(notValid.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(notValid.ValidateCreate()))).To(BeTrue()) }) It("spec.destAddress must be set if spec.destProtocol is amqp10", func() { notValid := shovel.DeepCopy() notValid.Spec.DestinationProtocol = "amqp10" notValid.Spec.DestinationAddress = "" - Expect(apierrors.IsInvalid(notValid.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(notValid.ValidateCreate()))).To(BeTrue()) }) }) @@ -83,13 +83,13 @@ var _ = Describe("shovel webhook", func() { It("does not allow updates on name", func() { newShovel := shovel.DeepCopy() newShovel.Spec.Name = "another-shovel" - Expect(apierrors.IsForbidden(newShovel.ValidateUpdate(&shovel))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newShovel.ValidateUpdate(&shovel)))).To(BeTrue()) }) It("does not allow updates on vhost", func() { newShovel := shovel.DeepCopy() newShovel.Spec.Vhost = "another-vhost" - Expect(apierrors.IsForbidden(newShovel.ValidateUpdate(&shovel))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newShovel.ValidateUpdate(&shovel)))).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -97,21 +97,21 @@ var _ = Describe("shovel webhook", func() { newShovel.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "another-cluster", } - Expect(apierrors.IsForbidden(newShovel.ValidateUpdate(&shovel))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newShovel.ValidateUpdate(&shovel)))).To(BeTrue()) }) It("spec.srcAddress must be set if spec.srcProtocol is amqp10", func() { newShovel := shovel.DeepCopy() newShovel.Spec.SourceProtocol = "amqp10" newShovel.Spec.SourceAddress = "" - Expect(apierrors.IsInvalid(newShovel.ValidateUpdate(&shovel))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newShovel.ValidateUpdate(&shovel)))).To(BeTrue()) }) It("spec.destAddress must be set if spec.destProtocol is amqp10", func() { newShovel := shovel.DeepCopy() newShovel.Spec.DestinationProtocol = "amqp10" newShovel.Spec.DestinationAddress = "" - Expect(apierrors.IsInvalid(newShovel.ValidateUpdate(&shovel))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newShovel.ValidateUpdate(&shovel)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -134,163 +134,36 @@ var _ = Describe("shovel webhook", func() { } new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "new-secret" - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) - It("allows updates on shovel.spec.uriSecret", func() { + It("allows updates on shovel configurations", func() { newShovel := shovel.DeepCopy() newShovel.Spec.UriSecret = &corev1.LocalObjectReference{Name: "another-secret"} - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on AckMode", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.AckMode = "on-confirm" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on AddForwardHeaders", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.AddForwardHeaders = false - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DeleteAfter", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DeleteAfter = "100" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on AddForwardHeaders", func() { - newShovel := shovel.DeepCopy() - newShovel.Spec.AddForwardHeaders = false - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationAddForwardHeaders", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationAddForwardHeaders = false - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationAddTimestampHeader", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationAddTimestampHeader = false - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationAddress", func() { - newShovel := shovel.DeepCopy() - newShovel.Spec.DeleteAfter = "another" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationApplicationProperties", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationApplicationProperties = &runtime.RawExtension{Raw: []byte(`{"key": "new"}`)} - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationExchange", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationExchange = "new-exchange" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationExchangeKey", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationExchangeKey = "new-key" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationProperties", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationProperties = &runtime.RawExtension{Raw: []byte(`{"key": "new"}`)} - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationProtocol", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationProtocol = "new" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationPublishProperties", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationPublishProperties = &runtime.RawExtension{Raw: []byte(`{"key": "new"}`)} - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationMessageAnnotations", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationMessageAnnotations = &runtime.RawExtension{Raw: []byte(`{"key": "new-annotation"}`)} - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on DestinationQueue", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.DestinationQueue = "another-queue" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on shovel.spec.PrefetchCount", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.PrefetchCount = 20 - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on shovel.spec.reconnectDelay", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.PrefetchCount = 10000 - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on SourceAddress", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.SourceAddress = "another-queue" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on SourceDeleteAfter", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.SourceDeleteAfter = "100" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on SourceExchange", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.SourceExchange = "another-exchange" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on SourceExchangeKey", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.SourceExchangeKey = "another-key" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on SourcePrefetchCount", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.SourcePrefetchCount = 50 - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on SourceProtocol", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.SourceProtocol = "another-protocol" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on SourceQueue", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.SourceQueue = "another-queue" - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) - }) - - It("allows updates on SourceConsumerArgs", func() { - newShovel := shovel.DeepCopy() newShovel.Spec.SourceConsumerArgs = &runtime.RawExtension{Raw: []byte(`{"x-priority": 10}`)} - Expect(newShovel.ValidateUpdate(&shovel)).To(Succeed()) + Expect(ignoreNilWarning(newShovel.ValidateUpdate(&shovel))).To(Succeed()) }) }) }) diff --git a/api/v1beta1/suite_test.go b/api/v1beta1/suite_test.go index 69e86a45..cb841c2b 100644 --- a/api/v1beta1/suite_test.go +++ b/api/v1beta1/suite_test.go @@ -1,7 +1,9 @@ package v1beta1 import ( + "errors" "path/filepath" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" "testing" . "github.com/onsi/ginkgo/v2" @@ -52,3 +54,11 @@ var _ = AfterSuite(func() { err := testEnv.Stop() Expect(err).ToNot(HaveOccurred()) }) + +func ignoreNilWarning(w admission.Warnings, e error) error { + if w != nil { + return errors.New("warning should be nil") + + } + return e +} diff --git a/api/v1beta1/topicpermission_webhook.go b/api/v1beta1/topicpermission_webhook.go index 3f954541..8f8066ad 100644 --- a/api/v1beta1/topicpermission_webhook.go +++ b/api/v1beta1/topicpermission_webhook.go @@ -2,6 +2,7 @@ package v1beta1 import ( "fmt" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" @@ -21,71 +22,71 @@ func (r *TopicPermission) SetupWebhookWithManager(mgr ctrl.Manager) error { var _ webhook.Validator = &TopicPermission{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type -func (p *TopicPermission) ValidateCreate() error { +func (p *TopicPermission) ValidateCreate() (admission.Warnings, error) { var errorList field.ErrorList if p.Spec.User == "" && p.Spec.UserReference == nil { errorList = append(errorList, field.Required(field.NewPath("spec", "user and userReference"), "must specify either spec.user or spec.userReference")) - return apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) } if p.Spec.User != "" && p.Spec.UserReference != nil { errorList = append(errorList, field.Required(field.NewPath("spec", "user and userReference"), "cannot specify spec.user and spec.userReference at the same time")) - return apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("Permission").GroupKind(), p.Name, errorList) } return p.Spec.RabbitmqClusterReference.ValidateOnCreate(p.GroupResource(), p.Name) } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type -func (p *TopicPermission) ValidateUpdate(old runtime.Object) error { +func (p *TopicPermission) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldPermission, ok := old.(*TopicPermission) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a permission but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a permission but got a %T", old)) } var errorList field.ErrorList if p.Spec.User == "" && p.Spec.UserReference == nil { errorList = append(errorList, field.Required(field.NewPath("spec", "user and userReference"), "must specify either spec.user or spec.userReference")) - return apierrors.NewInvalid(GroupVersion.WithKind("TopicPermission").GroupKind(), p.Name, errorList) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("TopicPermission").GroupKind(), p.Name, errorList) } if p.Spec.User != "" && p.Spec.UserReference != nil { errorList = append(errorList, field.Required(field.NewPath("spec", "user and userReference"), "cannot specify spec.user and spec.userReference at the same time")) - return apierrors.NewInvalid(GroupVersion.WithKind("TopicPermission").GroupKind(), p.Name, errorList) + return nil, apierrors.NewInvalid(GroupVersion.WithKind("TopicPermission").GroupKind(), p.Name, errorList) } detailMsg := "updates on exchange, user, userReference, vhost and rabbitmqClusterReference are all forbidden" if p.Spec.Permissions.Exchange != oldPermission.Spec.Permissions.Exchange { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "permissions", "exchange"), detailMsg)) } if p.Spec.User != oldPermission.Spec.User { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "user"), detailMsg)) } if userReferenceUpdated(p.Spec.UserReference, oldPermission.Spec.UserReference) { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "userReference"), detailMsg)) } if p.Spec.Vhost != oldPermission.Spec.Vhost { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "vhost"), detailMsg)) } if !oldPermission.Spec.RabbitmqClusterReference.Matches(&p.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(p.GroupResource(), p.Name, + return nil, apierrors.NewForbidden(p.GroupResource(), p.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } - return nil + return nil, nil } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type -func (r *TopicPermission) ValidateDelete() error { - return nil +func (r *TopicPermission) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/topicpermission_webhook_test.go b/api/v1beta1/topicpermission_webhook_test.go index 4584c9ea..ee70d62a 100644 --- a/api/v1beta1/topicpermission_webhook_test.go +++ b/api/v1beta1/topicpermission_webhook_test.go @@ -32,26 +32,26 @@ var _ = Describe("topic permission webhook", func() { invalidPermission := permission.DeepCopy() invalidPermission.Spec.UserReference = &corev1.LocalObjectReference{Name: "invalid"} invalidPermission.Spec.User = "test-user" - Expect(apierrors.IsInvalid(invalidPermission.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(invalidPermission.ValidateCreate()))).To(BeTrue()) }) It("does not allow both user and userReference to be unset", func() { invalidPermission := permission.DeepCopy() invalidPermission.Spec.UserReference = nil invalidPermission.Spec.User = "" - Expect(apierrors.IsInvalid(invalidPermission.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(invalidPermission.ValidateCreate()))).To(BeTrue()) }) It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := permission.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := permission.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -59,7 +59,7 @@ var _ = Describe("topic permission webhook", func() { It("does not allow updates on user", func() { newPermission := permission.DeepCopy() newPermission.Spec.User = "new-user" - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("does not allow updates on userReference", func() { @@ -68,13 +68,13 @@ var _ = Describe("topic permission webhook", func() { permissionWithUserRef.Spec.UserReference = &corev1.LocalObjectReference{Name: "a-user"} newPermission := permissionWithUserRef.DeepCopy() newPermission.Spec.UserReference = &corev1.LocalObjectReference{Name: "a-new-user"} - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(permissionWithUserRef))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(permissionWithUserRef)))).To(BeTrue()) }) It("does not allow updates on vhost", func() { newPermission := permission.DeepCopy() newPermission.Spec.Vhost = "new-vhost" - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -82,7 +82,7 @@ var _ = Describe("topic permission webhook", func() { newPermission.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -107,38 +107,38 @@ var _ = Describe("topic permission webhook", func() { } new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.ConnectionSecret.Name = "new-secret" - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) It("does not allow updates on spec.permissions.exchange", func() { newPermission := permission.DeepCopy() newPermission.Spec.Permissions.Exchange = "a-different-exchange" - Expect(apierrors.IsForbidden(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("allows updates on permission.spec.permissions.read", func() { newPermission := permission.DeepCopy() newPermission.Spec.Permissions.Read = "?" - Expect(newPermission.ValidateUpdate(&permission)).To(Succeed()) + Expect(ignoreNilWarning(newPermission.ValidateUpdate(&permission))).To(Succeed()) }) It("allows updates on permission.spec.permissions.write", func() { newPermission := permission.DeepCopy() newPermission.Spec.Permissions.Write = "?" - Expect(newPermission.ValidateUpdate(&permission)).To(Succeed()) + Expect(ignoreNilWarning(newPermission.ValidateUpdate(&permission))).To(Succeed()) }) It("does not allow user and userReference to be specified at the same time", func() { newPermission := permission.DeepCopy() newPermission.Spec.UserReference = &corev1.LocalObjectReference{Name: "invalid"} - Expect(apierrors.IsInvalid(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) It("does not allow both user and userReference to be unset", func() { newPermission := permission.DeepCopy() newPermission.Spec.User = "" newPermission.Spec.UserReference = nil - Expect(apierrors.IsInvalid(newPermission.ValidateUpdate(&permission))).To(BeTrue()) + Expect(apierrors.IsInvalid(ignoreNilWarning(newPermission.ValidateUpdate(&permission)))).To(BeTrue()) }) }) }) diff --git a/api/v1beta1/user_webhook.go b/api/v1beta1/user_webhook.go index 36ef6ea0..04315d6e 100644 --- a/api/v1beta1/user_webhook.go +++ b/api/v1beta1/user_webhook.go @@ -7,6 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (u *User) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -21,25 +22,25 @@ var _ webhook.Validator = &User{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (u *User) ValidateCreate() error { +func (u *User) ValidateCreate() (admission.Warnings, error) { return u.Spec.RabbitmqClusterReference.ValidateOnCreate(u.GroupResource(), u.Name) } // ValidateUpdate returns error type 'forbidden' for updates on rabbitmqClusterReference // user.spec.tags can be updated -func (u *User) ValidateUpdate(old runtime.Object) error { +func (u *User) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldUser, ok := old.(*User) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a user but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a user but got a %T", old)) } if !oldUser.Spec.RabbitmqClusterReference.Matches(&u.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(u.GroupResource(), u.Name, + return nil, apierrors.NewForbidden(u.GroupResource(), u.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), "update on rabbitmqClusterReference is forbidden")) } - return nil + return nil, nil } -func (u *User) ValidateDelete() error { - return nil +func (u *User) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/user_webhook_test.go b/api/v1beta1/user_webhook_test.go index 4cf9d874..f67c1b87 100644 --- a/api/v1beta1/user_webhook_test.go +++ b/api/v1beta1/user_webhook_test.go @@ -25,14 +25,14 @@ var _ = Describe("user webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := user.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := user.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -42,7 +42,7 @@ var _ = Describe("user webhook", func() { newUser.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "newUser-cluster", } - Expect(apierrors.IsForbidden(newUser.ValidateUpdate(&user))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newUser.ValidateUpdate(&user)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -62,13 +62,13 @@ var _ = Describe("user webhook", func() { new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.Name = "a-name" new.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) It("allows update on tags", func() { newUser := user.DeepCopy() newUser.Spec.Tags = []UserTag{"monitoring"} - Expect(newUser.ValidateUpdate(&user)).To(Succeed()) + Expect(ignoreNilWarning(newUser.ValidateUpdate(&user))).To(Succeed()) }) }) }) diff --git a/api/v1beta1/vhost_webhook.go b/api/v1beta1/vhost_webhook.go index fb378890..67509a0c 100644 --- a/api/v1beta1/vhost_webhook.go +++ b/api/v1beta1/vhost_webhook.go @@ -7,6 +7,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/webhook" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func (r *Vhost) SetupWebhookWithManager(mgr ctrl.Manager) error { @@ -21,32 +22,32 @@ var _ webhook.Validator = &Vhost{} // ValidateCreate implements webhook.Validator so a webhook will be registered for the type // either rabbitmqClusterReference.name or rabbitmqClusterReference.connectionSecret must be provided but not both -func (v *Vhost) ValidateCreate() error { +func (v *Vhost) ValidateCreate() (admission.Warnings, error) { return v.Spec.RabbitmqClusterReference.ValidateOnCreate(v.GroupResource(), v.Name) } // ValidateUpdate returns error type 'forbidden' for updates on vhost name and rabbitmqClusterReference // vhost.spec.tracing can be updated -func (v *Vhost) ValidateUpdate(old runtime.Object) error { +func (v *Vhost) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { oldVhost, ok := old.(*Vhost) if !ok { - return apierrors.NewBadRequest(fmt.Sprintf("expected a vhost but got a %T", old)) + return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a vhost but got a %T", old)) } detailMsg := "updates on name and rabbitmqClusterReference are all forbidden" if v.Spec.Name != oldVhost.Spec.Name { - return apierrors.NewForbidden(v.GroupResource(), v.Name, + return nil, apierrors.NewForbidden(v.GroupResource(), v.Name, field.Forbidden(field.NewPath("spec", "name"), detailMsg)) } if !oldVhost.Spec.RabbitmqClusterReference.Matches(&v.Spec.RabbitmqClusterReference) { - return apierrors.NewForbidden(v.GroupResource(), v.Name, + return nil, apierrors.NewForbidden(v.GroupResource(), v.Name, field.Forbidden(field.NewPath("spec", "rabbitmqClusterReference"), detailMsg)) } - return nil + return nil, nil } -func (v *Vhost) ValidateDelete() error { - return nil +func (v *Vhost) ValidateDelete() (admission.Warnings, error) { + return nil, nil } diff --git a/api/v1beta1/vhost_webhook_test.go b/api/v1beta1/vhost_webhook_test.go index 6485b53a..2ff6db64 100644 --- a/api/v1beta1/vhost_webhook_test.go +++ b/api/v1beta1/vhost_webhook_test.go @@ -28,14 +28,14 @@ var _ = Describe("vhost webhook", func() { It("does not allow both spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret be configured", func() { notAllowed := vhost.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = &corev1.LocalObjectReference{Name: "some-secret"} - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) It("spec.rabbitmqClusterReference.name and spec.rabbitmqClusterReference.connectionSecret cannot both be empty", func() { notAllowed := vhost.DeepCopy() notAllowed.Spec.RabbitmqClusterReference.Name = "" notAllowed.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(notAllowed.ValidateCreate())).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(notAllowed.ValidateCreate()))).To(BeTrue()) }) }) @@ -43,7 +43,7 @@ var _ = Describe("vhost webhook", func() { It("does not allow updates on vhost name", func() { newVhost := vhost.DeepCopy() newVhost.Spec.Name = "new-name" - Expect(apierrors.IsForbidden(newVhost.ValidateUpdate(&vhost))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newVhost.ValidateUpdate(&vhost)))).To(BeTrue()) }) It("does not allow updates on RabbitmqClusterReference", func() { @@ -51,7 +51,7 @@ var _ = Describe("vhost webhook", func() { newVhost.Spec.RabbitmqClusterReference = RabbitmqClusterReference{ Name: "new-cluster", } - Expect(apierrors.IsForbidden(newVhost.ValidateUpdate(&vhost))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(newVhost.ValidateUpdate(&vhost)))).To(BeTrue()) }) It("does not allow updates on rabbitmqClusterReference.connectionSecret", func() { @@ -71,25 +71,25 @@ var _ = Describe("vhost webhook", func() { new := connectionScr.DeepCopy() new.Spec.RabbitmqClusterReference.Name = "a-name" new.Spec.RabbitmqClusterReference.ConnectionSecret = nil - Expect(apierrors.IsForbidden(new.ValidateUpdate(&connectionScr))).To(BeTrue()) + Expect(apierrors.IsForbidden(ignoreNilWarning(new.ValidateUpdate(&connectionScr)))).To(BeTrue()) }) It("allows updates on vhost.spec.tracing", func() { newVhost := vhost.DeepCopy() newVhost.Spec.Tracing = true - Expect(newVhost.ValidateUpdate(&vhost)).To(Succeed()) + Expect(ignoreNilWarning(newVhost.ValidateUpdate(&vhost))).To(Succeed()) }) It("allows updates on vhost.spec.tags", func() { newVhost := vhost.DeepCopy() newVhost.Spec.Tags = []string{"new-tag"} - Expect(newVhost.ValidateUpdate(&vhost)).To(Succeed()) + Expect(ignoreNilWarning(newVhost.ValidateUpdate(&vhost))).To(Succeed()) }) It("allows updates on vhost.spec.defaultQueueType", func() { newVhost := vhost.DeepCopy() newVhost.Spec.DefaultQueueType = "quorum" - Expect(newVhost.ValidateUpdate(&vhost)).To(Succeed()) + Expect(ignoreNilWarning(newVhost.ValidateUpdate(&vhost))).To(Succeed()) }) }) }) diff --git a/config/crd/bases/rabbitmq.com_bindings.yaml b/config/crd/bases/rabbitmq.com_bindings.yaml index 1ff3b391..b7ca83f4 100644 --- a/config/crd/bases/rabbitmq.com_bindings.yaml +++ b/config/crd/bases/rabbitmq.com_bindings.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: bindings.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_exchanges.yaml b/config/crd/bases/rabbitmq.com_exchanges.yaml index 1a9641fb..f387bc2b 100644 --- a/config/crd/bases/rabbitmq.com_exchanges.yaml +++ b/config/crd/bases/rabbitmq.com_exchanges.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: exchanges.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_federations.yaml b/config/crd/bases/rabbitmq.com_federations.yaml index 06118c85..04c3353f 100644 --- a/config/crd/bases/rabbitmq.com_federations.yaml +++ b/config/crd/bases/rabbitmq.com_federations.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: federations.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_permissions.yaml b/config/crd/bases/rabbitmq.com_permissions.yaml index 4e753550..410c4e7b 100644 --- a/config/crd/bases/rabbitmq.com_permissions.yaml +++ b/config/crd/bases/rabbitmq.com_permissions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: permissions.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_policies.yaml b/config/crd/bases/rabbitmq.com_policies.yaml index f0030d52..aa39d783 100644 --- a/config/crd/bases/rabbitmq.com_policies.yaml +++ b/config/crd/bases/rabbitmq.com_policies.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: policies.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_queues.yaml b/config/crd/bases/rabbitmq.com_queues.yaml index 20279289..1054c860 100644 --- a/config/crd/bases/rabbitmq.com_queues.yaml +++ b/config/crd/bases/rabbitmq.com_queues.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: queues.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_schemareplications.yaml b/config/crd/bases/rabbitmq.com_schemareplications.yaml index 3ee54ea3..0e5902f4 100644 --- a/config/crd/bases/rabbitmq.com_schemareplications.yaml +++ b/config/crd/bases/rabbitmq.com_schemareplications.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: schemareplications.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_shovels.yaml b/config/crd/bases/rabbitmq.com_shovels.yaml index da2d99c6..091e0b5b 100644 --- a/config/crd/bases/rabbitmq.com_shovels.yaml +++ b/config/crd/bases/rabbitmq.com_shovels.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: shovels.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_superstreams.yaml b/config/crd/bases/rabbitmq.com_superstreams.yaml index 825a66b3..1a3eca99 100644 --- a/config/crd/bases/rabbitmq.com_superstreams.yaml +++ b/config/crd/bases/rabbitmq.com_superstreams.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: superstreams.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_topicpermissions.yaml b/config/crd/bases/rabbitmq.com_topicpermissions.yaml index 77c17f9b..f971cc34 100644 --- a/config/crd/bases/rabbitmq.com_topicpermissions.yaml +++ b/config/crd/bases/rabbitmq.com_topicpermissions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: topicpermissions.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_users.yaml b/config/crd/bases/rabbitmq.com_users.yaml index f69e2031..9505ffbe 100644 --- a/config/crd/bases/rabbitmq.com_users.yaml +++ b/config/crd/bases/rabbitmq.com_users.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: users.rabbitmq.com spec: group: rabbitmq.com diff --git a/config/crd/bases/rabbitmq.com_vhosts.yaml b/config/crd/bases/rabbitmq.com_vhosts.yaml index b0ecf3d6..ce0d1aa3 100644 --- a/config/crd/bases/rabbitmq.com_vhosts.yaml +++ b/config/crd/bases/rabbitmq.com_vhosts.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.0 name: vhosts.rabbitmq.com spec: group: rabbitmq.com diff --git a/go.mod b/go.mod index b63878a7..d10d2249 100644 --- a/go.mod +++ b/go.mod @@ -15,16 +15,16 @@ require ( github.com/rabbitmq/cluster-operator v1.14.0 github.com/sclevine/yj v0.0.0-20200815061347-554173e71934 gopkg.in/ini.v1 v1.67.0 - k8s.io/api v0.26.3 - k8s.io/apimachinery v0.27.1 - k8s.io/client-go v0.26.3 - k8s.io/code-generator v0.26.3 + k8s.io/api v0.27.2 + k8s.io/apimachinery v0.27.2 + k8s.io/client-go v0.27.2 + k8s.io/code-generator v0.27.2 k8s.io/klog/v2 v2.100.1 - k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a + k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f k8s.io/utils v0.0.0-20230209194617-a36077c30491 - sigs.k8s.io/controller-runtime v0.14.6 + sigs.k8s.io/controller-runtime v0.15.0 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e - sigs.k8s.io/controller-tools v0.11.4 + sigs.k8s.io/controller-tools v0.12.0 sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 ) @@ -35,21 +35,21 @@ require ( github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v3 v3.0.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fatih/color v1.13.0 // indirect + github.com/fatih/color v1.15.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-errors/errors v1.0.1 // indirect github.com/go-jose/go-jose/v3 v3.0.0 // indirect - github.com/go-logr/zapr v1.2.3 // indirect + github.com/go-logr/zapr v1.2.4 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.1 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect - github.com/gobuffalo/flect v0.3.0 // indirect + github.com/gobuffalo/flect v1.0.2 // indirect github.com/goccy/go-yaml v1.11.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -77,10 +77,10 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -92,12 +92,11 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/client_golang v1.15.1 // indirect + github.com/prometheus/client_model v0.4.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cobra v1.7.0 // indirect @@ -113,21 +112,21 @@ require ( golang.org/x/crypto v0.7.0 // indirect golang.org/x/mod v0.10.0 // indirect golang.org/x/net v0.10.0 // indirect - golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect + golang.org/x/oauth2 v0.5.0 // indirect golang.org/x/sys v0.8.0 // indirect golang.org/x/term v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.9.1 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.26.1 // indirect - k8s.io/component-base v0.26.1 // indirect + k8s.io/apiextensions-apiserver v0.27.2 // indirect + k8s.io/component-base v0.27.2 // indirect k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.12.1 // indirect diff --git a/go.sum b/go.sum index dc839b2a..60a5bc7b 100644 --- a/go.sum +++ b/go.sum @@ -1,38 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= @@ -40,19 +8,12 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0 github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -61,9 +22,8 @@ github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -89,14 +49,13 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -106,27 +65,15 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo= github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= -github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= +github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= +github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= @@ -137,37 +84,24 @@ github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8c github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw= -github.com/gobuffalo/flect v0.3.0 h1:erfPWM+K1rFNIQeRPdeEXxo8yFr/PO17lhRnS8FUrtk= -github.com/gobuffalo/flect v0.3.0/go.mod h1:5pf3aGnsvqvCj50AVni7mJJF8ICxGZ8HomberC3pXLE= +github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA= +github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= github.com/goccy/go-yaml v1.11.0 h1:n7Z+zx8S9f9KgzG6KtQKf+kwqXZlLNR2F6018Dgau54= github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -180,8 +114,6 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/certificate-transparency-go v1.1.4 h1:hCyXHDbtqlr/lMXU0D4WgbalXL0Zk4dSWWMbPV8VrqY= github.com/google/certificate-transparency-go v1.1.4/go.mod h1:D6lvbfwckhNrbM9WVl1EVeMOyzC19mpIjMOI4nxBHtQ= github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= @@ -190,10 +122,7 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= @@ -202,26 +131,14 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= @@ -246,8 +163,6 @@ github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as= @@ -255,7 +170,6 @@ github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4= github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= @@ -266,26 +180,16 @@ github.com/jmoiron/sqlx v1.3.3 h1:j82X0bf7oQ27XeqxicSZsTU5suPwKElg3oyxNn43iTk= github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -296,22 +200,20 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= -github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1 h1:9XE5ykDiC8eNSqIPkxx0EsV3kMX1oe4kQWRZjIgytUA= github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1/go.mod h1:qbKwBR+qQODzH2WD/s53mdgp/xVcXMlJb59GRFOp6Z4= github.com/michaelklishin/rabbit-hole/v2 v2.15.0 h1:asuENwbu5UsgPBHKgOzHY6VVrjNePurjJoE+8+EWeLA= @@ -330,8 +232,6 @@ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= @@ -339,8 +239,6 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -384,7 +282,6 @@ github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWEr github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -392,32 +289,15 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= +github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= +github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA= github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= github.com/rabbitmq/cluster-operator v1.14.0 h1:1/nMyd9v/8T5IHA1BVcWbV0nrzN31F+gLP+0Ges6Y5E= @@ -425,9 +305,7 @@ github.com/rabbitmq/cluster-operator v1.14.0/go.mod h1:7XVU6ngbVJSPDXld+uMVk6nu6 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= @@ -436,10 +314,7 @@ github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/sclevine/yj v0.0.0-20200815061347-554173e71934 h1:HQgRgQK9d7cDKkRTS9zlvd6agG3yg7E4Q1ChdHgPs6Y= github.com/sclevine/yj v0.0.0-20200815061347-554173e71934/go.mod h1:AeGluipFgaqcTzUkgIazjEUPD+xbrS9qmLUE1TO1xpo= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= @@ -472,10 +347,9 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1: github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= @@ -485,30 +359,22 @@ github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc h1:zkGwegkOW709y0oiAr github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlNMRnSUTU3P1UdukWhYGifqEsjk9fn7BCk= github.com/zmap/zlint/v3 v3.1.0 h1:WjVytZo79m/L1+/Mlphl09WBob6YTGljN5IGWZFpAv0= github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200821142938-949cc6f4b097 h1:YiRMXXgG+Pg26t1fjq+iAjaauKWMC9cmGFrtOEuwDDg= go.starlark.net v0.0.0-20200821142938-949cc6f4b097/go.mod h1:f0znQkUKRrkk36XxWbGjMqQM8wGv/xHBVE2qc3B5oFU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -519,35 +385,13 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= @@ -559,42 +403,23 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -608,24 +433,15 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 h1:+jnHzr9VPj32ykQVai5DNahi9+NSp7yYuCsl5eAQtL0= -golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= +golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -634,61 +450,33 @@ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -709,9 +497,7 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -725,56 +511,19 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= @@ -789,75 +538,21 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= -gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc= +gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= @@ -869,21 +564,18 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -891,11 +583,9 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -907,42 +597,34 @@ gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU= -k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE= -k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= -k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= -k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc= -k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM= -k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s= -k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ= -k8s.io/code-generator v0.26.3 h1:DNYPsWoeFwmg4qFg97Z1cHSSv7KSG10mAEIFoZGTQM8= -k8s.io/code-generator v0.26.3/go.mod h1:ryaiIKwfxEJEaywEzx3dhWOydpVctKYbqLajJf0O8dI= -k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= -k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= +k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo= +k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4= +k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo= +k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= +k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg= +k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE= +k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ= +k8s.io/code-generator v0.27.2 h1:RmK0CnU5qRaK6WRtSyWNODmfTZNoJbrizpVcsgbtrvI= +k8s.io/code-generator v0.27.2/go.mod h1:DPung1sI5vBgn4AGKtlPRQAyagj/ir/4jI55ipZHVww= +k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo= +k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg= -k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY= +k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= +k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA= -sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= +sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU= +sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk= sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e h1:Z4+OH6QT2Xy2aqyN5BjyBEGnINrFzkHlMqLCyrE0A+g= sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e/go.mod h1:nLkMD2WB4Jcix1qfVuJeOF4j5y/VfyeOIlTxG5Wj9co= -sigs.k8s.io/controller-tools v0.11.4 h1:jqXJ/Xb6yBgbgcBbw1YoC3rC+Bt1XZWiLjj0ZHv/GrU= -sigs.k8s.io/controller-tools v0.11.4/go.mod h1:qcfX7jfcfYD/b7lAhvqAyTbt/px4GpvN88WKLFFv7p8= +sigs.k8s.io/controller-tools v0.12.0 h1:TY6CGE6+6hzO7hhJFte65ud3cFmmZW947jajXkuDfBw= +sigs.k8s.io/controller-tools v0.12.0/go.mod h1:rXlpTfFHZMpZA8aGq9ejArgZiieHd+fkk/fTatY8A2M= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=