Skip to content

Commit

Permalink
Remove multierr and make kafka webhook work the same as other webhooks
Browse files Browse the repository at this point in the history
  • Loading branch information
glrf committed Dec 5, 2022
1 parent b312939 commit 69b85dc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/exoscale/egoscale v0.90.1
github.com/go-logr/logr v1.2.3
github.com/go-logr/zapr v1.2.3
github.com/google/go-cmp v0.5.8
github.com/hashicorp/go-version v1.6.0
github.com/minio/minio-go/v7 v7.0.43
github.com/stretchr/testify v1.8.0
Expand Down Expand Up @@ -46,7 +47,6 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
Expand Down
24 changes: 14 additions & 10 deletions operator/kafkacontroller/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (

exoscalev1 "github.com/vshn/provider-exoscale/apis/exoscale/v1"
"github.com/vshn/provider-exoscale/operator/webhook"
"go.uber.org/multierr"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/go-logr/logr"
Expand Down Expand Up @@ -66,11 +65,15 @@ func (v *Validator) ValidateDelete(_ context.Context, obj runtime.Object) error
}

func validateSpec(params exoscalev1.KafkaParameters) error {
return multierr.Combine(
validateIpFilter(params),
validateMaintenanceSchedule(params),
validateKafkaSettings(params),
)
err := validateIpFilter(params)
if err != nil {
return err
}
err = validateMaintenanceSchedule(params)
if err != nil {
return err
}
return validateKafkaSettings(params)
}

func validateIpFilter(params exoscalev1.KafkaParameters) error {
Expand All @@ -90,10 +93,11 @@ func validateKafkaSettings(obj exoscalev1.KafkaParameters) error {
}

func validateImmutable(oldInst, newInst exoscalev1.Kafka) error {
return multierr.Combine(
compareZone(oldInst.Spec.ForProvider, newInst.Spec.ForProvider),
compareVersion(oldInst, newInst),
)
err := compareZone(oldInst.Spec.ForProvider, newInst.Spec.ForProvider)
if err != nil {
return err
}
return compareVersion(oldInst, newInst)
}

func compareZone(oldParams, newParams exoscalev1.KafkaParameters) error {
Expand Down

0 comments on commit 69b85dc

Please sign in to comment.