Skip to content

Commit

Permalink
fix metrics-operator
Browse files Browse the repository at this point in the history 
Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
  • Loading branch information
@odubajDT
odubajDT committed Sep 13, 2023
1 parent f82bb02 commit 10cfd52
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 14 deletions.
17 changes: 9 additions & 8 deletions metrics-operator/api/v1alpha3/analysisdefinition_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/webhook"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
)

// log is for logging in this package.
Expand All @@ -39,36 +40,36 @@ func (r *AnalysisDefinition) SetupWebhookWithManager(mgr ctrl.Manager) error {
var _ webhook.Validator = &AnalysisDefinition{}

// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
func (r *AnalysisDefinition) ValidateCreate() error {
func (r *AnalysisDefinition) ValidateCreate() (admission.Warnings, error) {
analysisdefinitionlog.Info("validate create", "name", r.Name)

for _, o := range r.Spec.Objectives {
if err := o.validate(); err != nil {
return err
return []string{}, err
}
}

return r.Spec.TotalScore.validate()
return []string{}, r.Spec.TotalScore.validate()
}

// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
func (r *AnalysisDefinition) ValidateUpdate(old runtime.Object) error {
func (r *AnalysisDefinition) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
analysisdefinitionlog.Info("validate update", "name", r.Name)

for _, o := range r.Spec.Objectives {
if err := o.validate(); err != nil {
return err
return []string{}, err
}
}

return r.Spec.TotalScore.validate()
return []string{}, r.Spec.TotalScore.validate()
}

// ValidateDelete implements webhook.Validator so a webhook will be registered for the type
func (r *AnalysisDefinition) ValidateDelete() error {
func (r *AnalysisDefinition) ValidateDelete() (admission.Warnings, error) {
analysisdefinitionlog.Info("validate delete", "name", r.Name)

return nil
return []string{}, nil
}

func (s *TotalScore) validate() error {
Expand Down
6 changes: 4 additions & 2 deletions metrics-operator/api/v1alpha3/analysisdefinition_webhook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,10 @@ func TestAnalysisDefinition_validateCreateUpdate(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
require.Equal(t, tt.wantErr, tt.obj.ValidateCreate())
require.Equal(t, tt.wantErr, tt.obj.ValidateUpdate(&AnalysisDefinition{}))
_, err := tt.obj.ValidateCreate()
require.Equal(t, tt.wantErr, err)
_, err = tt.obj.ValidateUpdate(&AnalysisDefinition{})
require.Equal(t, tt.wantErr, err)
})
}
}
Expand Down
6 changes: 3 additions & 3 deletions metrics-operator/api/v1alpha3/keptnmetric_webhook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,11 +474,11 @@ func TestKeptnMetric_validateRangeStep(t *testing.T) {
var err error
switch tt.verb {
case "create":
err = s.ValidateCreate()
_, err = s.ValidateCreate()
case "update":
err = s.ValidateUpdate(tt.oldSpec)
_, err = s.ValidateUpdate(tt.oldSpec)
case "delete":
err = s.ValidateDelete()
_, err = s.ValidateDelete()
}
if tt.want == nil {
require.Nil(t, err)
Expand Down
2 changes: 1 addition & 1 deletion metrics-operator/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/go-logr/logr v1.2.4
github.com/gorilla/mux v1.8.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/keptn/lifecycle-toolkit/klt-cert-manager v1.0.0
github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20230913133126-f82bb021f68f
github.com/open-feature/go-sdk v1.7.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
Expand Down
6 changes: 6 additions & 0 deletions metrics-operator/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
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-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
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.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
Expand Down Expand Up @@ -233,12 +234,16 @@ github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9q
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 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
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.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20230913133126-f82bb021f68f h1:GT9pXO4vuWYd+YpfZNYVBbQxbXBh1n4btn+cFGKK//A=
github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20230913133126-f82bb021f68f/go.mod h1:GL0od5sRlCrxx8MFmbYZwYmhSzawtQjgKel90nM9nyY=
github.com/keptn/lifecycle-toolkit/klt-cert-manager v1.0.0 h1:NitdGKPLyqoO4F+rT46My5VTC39R37BFfg37Ti5R+r0=
github.com/keptn/lifecycle-toolkit/klt-cert-manager v1.0.0/go.mod h1:8L3D7pL1WWNHfp0Fm0hGroIlNWaEDeCA35wlFDPSEMo=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Expand All @@ -263,6 +268,7 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
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-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
github.com/open-feature/go-sdk v1.7.0 h1:g6o/sf5xaED7xawXwZ0LqE7RS9co7HZJMClXCXmIbgw=
Expand Down

0 comments on commit 10cfd52

Please sign in to comment.