Skip to content

Commit 8cd88a3

Browse files
viccuadviccuad
authored
Merge pull request #1360 from kubewarden/renovate/go-dependencies
fix(deps): update go dependencies
2 parents 424cefa + e1d0ab8 commit 8cd88a3

14 files changed

Lines changed: 48 additions & 412 deletions

‎api/policies/v1/admissionpolicy_webhook.go‎

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ import (
1818
"context"
1919
"fmt"
2020

21-
"k8s.io/apimachinery/pkg/runtime"
2221
ctrl "sigs.k8s.io/controller-runtime"
2322
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
24-
"sigs.k8s.io/controller-runtime/pkg/webhook"
2523
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2624

2725
"github.com/go-logr/logr"
@@ -32,8 +30,7 @@ import (
3230
func (r *AdmissionPolicy) SetupWebhookWithManager(mgr ctrl.Manager) error {
3331
logger := mgr.GetLogger().WithName("admissionpolicy-webhook")
3432

35-
err := ctrl.NewWebhookManagedBy(mgr).
36-
For(r).
33+
err := ctrl.NewWebhookManagedBy(mgr, r).
3734
WithDefaulter(&admissionPolicyDefaulter{
3835
logger: logger,
3936
}).
@@ -54,15 +51,8 @@ type admissionPolicyDefaulter struct {
5451
logger logr.Logger
5552
}
5653

57-
var _ webhook.CustomDefaulter = &admissionPolicyDefaulter{}
58-
5954
// Default implements webhook.CustomDefaulter so a webhook will be registered for the type.
60-
func (d *admissionPolicyDefaulter) Default(_ context.Context, obj runtime.Object) error {
61-
admissionPolicy, ok := obj.(*AdmissionPolicy)
62-
if !ok {
63-
return fmt.Errorf("expected an AdmissionPolicy object, got %T", obj)
64-
}
65-
55+
func (d *admissionPolicyDefaulter) Default(_ context.Context, admissionPolicy *AdmissionPolicy) error {
6656
if admissionPolicy.Spec.PolicyServer == "" {
6757
admissionPolicy.Spec.PolicyServer = constants.DefaultPolicyServer
6858
}
@@ -80,15 +70,8 @@ type admissionPolicyValidator struct {
8070
logger logr.Logger
8171
}
8272

83-
var _ webhook.CustomValidator = &admissionPolicyValidator{}
84-
8573
// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.
86-
func (v *admissionPolicyValidator) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
87-
admissionPolicy, ok := obj.(*AdmissionPolicy)
88-
if !ok {
89-
return nil, fmt.Errorf("expected an AdmissionPolicy object, got %T", obj)
90-
}
91-
74+
func (v *admissionPolicyValidator) ValidateCreate(_ context.Context, admissionPolicy *AdmissionPolicy) (admission.Warnings, error) {
9275
v.logger.Info("Validating AdmissionPolicy creation", "name", admissionPolicy.GetName())
9376

9477
allErrors := validatePolicyCreate(admissionPolicy)
@@ -100,16 +83,7 @@ func (v *admissionPolicyValidator) ValidateCreate(_ context.Context, obj runtime
10083
}
10184

10285
// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type.
103-
func (v *admissionPolicyValidator) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
104-
oldAdmissionPolicy, ok := oldObj.(*AdmissionPolicy)
105-
if !ok {
106-
return nil, fmt.Errorf("expected an AdmissionPolicy object, got %T", oldObj)
107-
}
108-
newAdmissionPolicy, ok := newObj.(*AdmissionPolicy)
109-
if !ok {
110-
return nil, fmt.Errorf("expected an AdmissionPolicy object, got %T", newObj)
111-
}
112-
86+
func (v *admissionPolicyValidator) ValidateUpdate(_ context.Context, oldAdmissionPolicy, newAdmissionPolicy *AdmissionPolicy) (admission.Warnings, error) {
11387
v.logger.Info("Validating ClusterAdmissionPolicy update", "name", newAdmissionPolicy.GetName())
11488

11589
allErrors := validatePolicyUpdate(oldAdmissionPolicy, newAdmissionPolicy)
@@ -121,12 +95,7 @@ func (v *admissionPolicyValidator) ValidateUpdate(_ context.Context, oldObj, new
12195
}
12296

12397
// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type.
124-
func (v *admissionPolicyValidator) ValidateDelete(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
125-
admissionPolicy, ok := obj.(*AdmissionPolicy)
126-
if !ok {
127-
return nil, fmt.Errorf("expected an AdmissionPolicy object, got %T", obj)
128-
}
129-
98+
func (v *admissionPolicyValidator) ValidateDelete(_ context.Context, admissionPolicy *AdmissionPolicy) (admission.Warnings, error) {
13099
v.logger.Info("Validating AdmissionPolicy delete", "name", admissionPolicy.GetName())
131100

132101
return nil, nil

‎api/policies/v1/admissionpolicy_webhook_test.go‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/stretchr/testify/require"
2222

2323
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
24-
corev1 "k8s.io/api/core/v1"
2524

2625
"github.com/kubewarden/kubewarden-controller/internal/constants"
2726
)
@@ -37,14 +36,6 @@ func TestAdmissionPolicyDefault(t *testing.T) {
3736
assert.Contains(t, policy.GetFinalizers(), constants.KubewardenFinalizer)
3837
}
3938

40-
func TestAdmissionPolicyDefaultWithInvalidType(t *testing.T) {
41-
defaulter := admissionPolicyDefaulter{logger: logr.Discard()}
42-
obj := &corev1.Pod{}
43-
44-
err := defaulter.Default(t.Context(), obj)
45-
require.ErrorContains(t, err, "expected an AdmissionPolicy object, got *v1.Pod")
46-
}
47-
4839
func TestAdmissionPolicyValidateCreate(t *testing.T) {
4940
validator := admissionPolicyValidator{logger: logr.Discard()}
5041
policy := NewAdmissionPolicyFactory().Build()
@@ -143,15 +134,6 @@ func TestAdmissionPolicyValidateCreateWithErrors(t *testing.T) {
143134
assert.Empty(t, warnings)
144135
}
145136

146-
func TestAdmissionPolicyValidateCreateWithInvalidType(t *testing.T) {
147-
validator := admissionPolicyValidator{logger: logr.Discard()}
148-
obj := &corev1.Pod{}
149-
150-
warnings, err := validator.ValidateCreate(t.Context(), obj)
151-
require.ErrorContains(t, err, "expected an AdmissionPolicy object, got *v1.Pod")
152-
assert.Empty(t, warnings)
153-
}
154-
155137
func TestAdmissionPolicyValidateUpdate(t *testing.T) {
156138
validator := admissionPolicyValidator{logger: logr.Discard()}
157139
oldPolicy := NewAdmissionPolicyFactory().Build()
@@ -196,21 +178,6 @@ func TestAdmissionPolicyValidateUpdateWithErrors(t *testing.T) {
196178
assert.Empty(t, warnings)
197179
}
198180

199-
func TestAdmissionPolicyValidateUpdateWithInvalidType(t *testing.T) {
200-
validator := admissionPolicyValidator{logger: logr.Discard()}
201-
obj := &corev1.Pod{}
202-
oldPolicy := NewAdmissionPolicyFactory().Build()
203-
newPolicy := NewAdmissionPolicyFactory().Build()
204-
205-
warnings, err := validator.ValidateUpdate(t.Context(), obj, newPolicy)
206-
require.ErrorContains(t, err, "expected an AdmissionPolicy object, got *v1.Pod")
207-
assert.Empty(t, warnings)
208-
209-
warnings, err = validator.ValidateUpdate(t.Context(), oldPolicy, obj)
210-
require.ErrorContains(t, err, "expected an AdmissionPolicy object, got *v1.Pod")
211-
assert.Empty(t, warnings)
212-
}
213-
214181
func TestAdmissionPolicyValidateDelete(t *testing.T) {
215182
validator := admissionPolicyValidator{logger: logr.Discard()}
216183
policy := NewAdmissionPolicyFactory().Build()
@@ -219,12 +186,3 @@ func TestAdmissionPolicyValidateDelete(t *testing.T) {
219186
require.NoError(t, err)
220187
assert.Empty(t, warnings)
221188
}
222-
223-
func TestAdmissionPolicyValidateDeleteWithInvalidType(t *testing.T) {
224-
validator := admissionPolicyValidator{logger: logr.Discard()}
225-
obj := &corev1.Pod{}
226-
227-
warnings, err := validator.ValidateDelete(t.Context(), obj)
228-
require.ErrorContains(t, err, "expected an AdmissionPolicy object, got *v1.Pod")
229-
assert.Empty(t, warnings)
230-
}

‎api/policies/v1/admissionpolicygroup_webhook.go‎

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ import (
1818
"context"
1919
"fmt"
2020

21-
"k8s.io/apimachinery/pkg/runtime"
2221
ctrl "sigs.k8s.io/controller-runtime"
2322
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
24-
"sigs.k8s.io/controller-runtime/pkg/webhook"
2523
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2624

2725
"github.com/go-logr/logr"
@@ -32,8 +30,7 @@ import (
3230
func (r *AdmissionPolicyGroup) SetupWebhookWithManager(mgr ctrl.Manager) error {
3331
logger := mgr.GetLogger().WithName("admissionpolicygroup-webhook")
3432

35-
err := ctrl.NewWebhookManagedBy(mgr).
36-
For(r).
33+
err := ctrl.NewWebhookManagedBy(mgr, r).
3734
WithDefaulter(&admissionPolicyGroupDefaulter{
3835
logger: logger,
3936
}).
@@ -55,15 +52,8 @@ type admissionPolicyGroupDefaulter struct {
5552
logger logr.Logger
5653
}
5754

58-
var _ webhook.CustomDefaulter = &admissionPolicyGroupDefaulter{}
59-
6055
// Default implements webhook.CustomDefaulter so a webhook will be registered for the type.
61-
func (d *admissionPolicyGroupDefaulter) Default(_ context.Context, obj runtime.Object) error {
62-
admissionPolicyGroup, ok := obj.(*AdmissionPolicyGroup)
63-
if !ok {
64-
return fmt.Errorf("expected an AdmissionPolicyGroup object, got %T", obj)
65-
}
66-
56+
func (d *admissionPolicyGroupDefaulter) Default(_ context.Context, admissionPolicyGroup *AdmissionPolicyGroup) error {
6757
d.logger.Info("Defaulting AdmissionPolicyGroup", "name", admissionPolicyGroup.GetName())
6858

6959
if admissionPolicyGroup.Spec.PolicyServer == "" {
@@ -83,15 +73,8 @@ type admissionPolicyGroupValidator struct {
8373
logger logr.Logger
8474
}
8575

86-
var _ webhook.CustomValidator = &admissionPolicyGroupValidator{}
87-
8876
// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.
89-
func (v *admissionPolicyGroupValidator) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
90-
admissionPolicyGroup, ok := obj.(*AdmissionPolicyGroup)
91-
if !ok {
92-
return nil, fmt.Errorf("expected an AdmissionPolicyGroup object, got %T", obj)
93-
}
94-
77+
func (v *admissionPolicyGroupValidator) ValidateCreate(_ context.Context, admissionPolicyGroup *AdmissionPolicyGroup) (admission.Warnings, error) {
9578
v.logger.Info("Validating AdmissionPolicyGroup creation", "name", admissionPolicyGroup.GetName())
9679

9780
allErrors := validatePolicyGroupCreate(admissionPolicyGroup)
@@ -104,16 +87,7 @@ func (v *admissionPolicyGroupValidator) ValidateCreate(_ context.Context, obj ru
10487
}
10588

10689
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
107-
func (v *admissionPolicyGroupValidator) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
108-
oldAdmissionPolicyGroup, ok := oldObj.(*AdmissionPolicyGroup)
109-
if !ok {
110-
return nil, fmt.Errorf("expected an AdmissionPolicyGroup object, got %T", oldObj)
111-
}
112-
newAdmissionPolicyGroup, ok := newObj.(*AdmissionPolicyGroup)
113-
if !ok {
114-
return nil, fmt.Errorf("expected an AdmissionPolicyGroup object, got %T", newObj)
115-
}
116-
90+
func (v *admissionPolicyGroupValidator) ValidateUpdate(_ context.Context, oldAdmissionPolicyGroup, newAdmissionPolicyGroup *AdmissionPolicyGroup) (admission.Warnings, error) {
11791
v.logger.Info("Validating AdmissionPolicyGroup update", "name", newAdmissionPolicyGroup.GetName())
11892

11993
if allErrors := validatePolicyGroupUpdate(oldAdmissionPolicyGroup, newAdmissionPolicyGroup); len(allErrors) != 0 {
@@ -124,12 +98,7 @@ func (v *admissionPolicyGroupValidator) ValidateUpdate(_ context.Context, oldObj
12498
}
12599

126100
// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type.
127-
func (v *admissionPolicyGroupValidator) ValidateDelete(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
128-
admissionPolicyGroup, ok := obj.(*AdmissionPolicyGroup)
129-
if !ok {
130-
return nil, fmt.Errorf("expected an AdmissionPolicyGroup object, got %T", obj)
131-
}
132-
101+
func (v *admissionPolicyGroupValidator) ValidateDelete(_ context.Context, admissionPolicyGroup *AdmissionPolicyGroup) (admission.Warnings, error) {
133102
v.logger.Info("Validating AdmissionPolicyGroup delete", "name", admissionPolicyGroup.GetName())
134103

135104
return nil, nil

‎api/policies/v1/admissionpolicygroup_webhook_test.go‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/stretchr/testify/require"
2323

2424
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
25-
corev1 "k8s.io/api/core/v1"
2625

2726
"github.com/kubewarden/kubewarden-controller/internal/constants"
2827
)
@@ -38,14 +37,6 @@ func TestAdmissionPolicyGroupDefault(t *testing.T) {
3837
assert.Contains(t, policy.GetFinalizers(), constants.KubewardenFinalizer)
3938
}
4039

41-
func TestAdmissionPolicyGroupDefaultWithInvalidType(t *testing.T) {
42-
defaulter := admissionPolicyGroupDefaulter{logger: logr.Discard()}
43-
obj := &corev1.Pod{}
44-
45-
err := defaulter.Default(t.Context(), obj)
46-
require.ErrorContains(t, err, "expected an AdmissionPolicyGroup object, got *v1.Pod")
47-
}
48-
4940
func TestAdmissionPolicyGroupValidateCreate(t *testing.T) {
5041
validator := admissionPolicyGroupValidator{logger: logr.Discard()}
5142
policy := NewAdmissionPolicyGroupFactory().Build()
@@ -144,15 +135,6 @@ func TestAdmissionPolicyGroupValidateCreateWithErrors(t *testing.T) {
144135
assert.Empty(t, warnings)
145136
}
146137

147-
func TestAdmissionPolicyGroupValidateCreateWithInvalidType(t *testing.T) {
148-
validator := admissionPolicyGroupValidator{logger: logr.Discard()}
149-
obj := &corev1.Pod{}
150-
151-
warnings, err := validator.ValidateCreate(t.Context(), obj)
152-
require.ErrorContains(t, err, "expected an AdmissionPolicyGroup object, got *v1.Pod")
153-
assert.Empty(t, warnings)
154-
}
155-
156138
func TestAdmissionPolicyGroupValidateUpdate(t *testing.T) {
157139
validator := admissionPolicyGroupValidator{logger: logr.Discard()}
158140
oldPolicy := NewAdmissionPolicyGroupFactory().Build()
@@ -197,21 +179,6 @@ func TestAdmissionPolicyGroupValidateUpdateWithErrors(t *testing.T) {
197179
assert.Empty(t, warnings)
198180
}
199181

200-
func TestAdmissionPolicyGroupValidateUpdateWithInvalidType(t *testing.T) {
201-
validator := admissionPolicyGroupValidator{logger: logr.Discard()}
202-
obj := &corev1.Pod{}
203-
oldPolicy := NewAdmissionPolicyGroupFactory().Build()
204-
newPolicy := NewAdmissionPolicyGroupFactory().Build()
205-
206-
warnings, err := validator.ValidateUpdate(t.Context(), obj, newPolicy)
207-
require.ErrorContains(t, err, "expected an AdmissionPolicyGroup object, got *v1.Pod")
208-
assert.Empty(t, warnings)
209-
210-
warnings, err = validator.ValidateUpdate(t.Context(), oldPolicy, obj)
211-
require.ErrorContains(t, err, "expected an AdmissionPolicyGroup object, got *v1.Pod")
212-
assert.Empty(t, warnings)
213-
}
214-
215182
func TestAdmissionPolicyGroupValidateDelete(t *testing.T) {
216183
validator := admissionPolicyGroupValidator{logger: logr.Discard()}
217184
policy := NewAdmissionPolicyGroupFactory().Build()
@@ -220,12 +187,3 @@ func TestAdmissionPolicyGroupValidateDelete(t *testing.T) {
220187
require.NoError(t, err)
221188
assert.Empty(t, warnings)
222189
}
223-
224-
func TestAdmissionPolicyGroupValidateDeleteWithInvalidType(t *testing.T) {
225-
validator := admissionPolicyGroupValidator{logger: logr.Discard()}
226-
obj := &corev1.Pod{}
227-
228-
warnings, err := validator.ValidateDelete(t.Context(), obj)
229-
require.ErrorContains(t, err, "expected an AdmissionPolicyGroup object, got *v1.Pod")
230-
assert.Empty(t, warnings)
231-
}

0 commit comments

Comments
 (0)