Skip to content

Commit 31371cc

Browse files
committed
chore: refine interface methods declration
Signed-off-by: STRRL <[email protected]>
1 parent f099810 commit 31371cc

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

pkg/webhook/admission/admissiontest/util.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ type FakeValidatorWarn struct {
7979
WarningsToReturn []string
8080
}
8181

82-
func (v *FakeValidatorWarn) ValidateCreate() (err error, warnings []string) {
83-
return v.ErrorToReturn, v.WarningsToReturn
82+
func (v *FakeValidatorWarn) ValidateCreate() (warnings []string, err error) {
83+
return v.WarningsToReturn, v.ErrorToReturn
8484
}
8585

86-
func (v *FakeValidatorWarn) ValidateUpdate(old runtime.Object) (err error, warnings []string) {
87-
return v.ErrorToReturn, v.WarningsToReturn
86+
func (v *FakeValidatorWarn) ValidateUpdate(old runtime.Object) (warnings []string, err error) {
87+
return v.WarningsToReturn, v.ErrorToReturn
8888
}
8989

90-
func (v *FakeValidatorWarn) ValidateDelete() (err error, warnings []string) {
91-
return v.ErrorToReturn, v.WarningsToReturn
90+
func (v *FakeValidatorWarn) ValidateDelete() (warnings []string, err error) {
91+
return v.WarningsToReturn, v.ErrorToReturn
9292
}
9393

9494
func (v *FakeValidatorWarn) SetGroupVersionKind(kind schema.GroupVersionKind) {

pkg/webhook/admission/validator_warn.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ import (
2929
// ValidatorWarn works like Validator, but it allows to return warnings.
3030
type ValidatorWarn interface {
3131
runtime.Object
32-
ValidateCreate() (err error, warnings []string)
33-
ValidateUpdate(old runtime.Object) (err error, warnings []string)
34-
ValidateDelete() (err error, warnings []string)
32+
ValidateCreate() (warnings []string, err error)
33+
ValidateUpdate(old runtime.Object) (warnings []string, err error)
34+
ValidateDelete() (warnings []string, err error)
3535
}
3636

37+
// ValidatingWebhookWithWarningFor creates a new Webhook for validating the provided type with warning messages.
3738
func ValidatingWebhookWithWarningFor(validatorWarning ValidatorWarn) *Webhook {
38-
return nil
39+
return &Webhook{
40+
Handler: &validatingWarnHandler{validatorWarn: validatorWarning},
41+
}
3942
}
4043

4144
var _ Handler = &validatingWarnHandler{}
@@ -68,7 +71,7 @@ func (h *validatingWarnHandler) Handle(ctx context.Context, req Request) Respons
6871
return Errored(http.StatusBadRequest, err)
6972
}
7073

71-
err, warnings := obj.ValidateCreate()
74+
warnings, err := obj.ValidateCreate()
7275
allWarnings = append(allWarnings, warnings...)
7376
if err != nil {
7477
var apiStatus apierrors.APIStatus
@@ -90,7 +93,7 @@ func (h *validatingWarnHandler) Handle(ctx context.Context, req Request) Respons
9093
if err != nil {
9194
return Errored(http.StatusBadRequest, err)
9295
}
93-
err, warnings := obj.ValidateUpdate(oldObj)
96+
warnings, err := obj.ValidateUpdate(oldObj)
9497
allWarnings = append(allWarnings, warnings...)
9598
if err != nil {
9699
var apiStatus apierrors.APIStatus
@@ -109,7 +112,7 @@ func (h *validatingWarnHandler) Handle(ctx context.Context, req Request) Respons
109112
return Errored(http.StatusBadRequest, err)
110113
}
111114

112-
err, warnings := obj.ValidateDelete()
115+
warnings, err := obj.ValidateDelete()
113116
allWarnings = append(allWarnings, warnings...)
114117
if err != nil {
115118
var apiStatus apierrors.APIStatus

0 commit comments

Comments
 (0)