Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,28 @@ version: "2"
linters:
default: standard
enable:
- bodyclose
- prealloc
- unparam
settings:
staticcheck:
dot-import-whitelist:
- fmt
- github.com/onsi/ginkgo/v2
- github.com/onsi/gomega
exclusions:
paths:
- generated.*\.go
- client
- vendor

formatters:
enable:
- gofmt
- gofumpt
- goimports
settings:
gofmt:
rewrite-rules:
- pattern: 'interface{}'
replacement: 'any'

issues:
max-same-issues: 100

exclude-files:
- generated.*\\.go

exclude-dirs:
- client
- vendor

run:
timeout: 10m
4 changes: 3 additions & 1 deletion pkg/evaluator/eval.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ func getProgramForRule(rule string) (cel.Program, error) {
}
env, err := cel.NewEnv(
cel.VariableDecls(
decls.NewVariable(defaultCELVar, types.DynType)))
decls.NewVariable(defaultCELVar, types.DynType),
),
)
if err != nil {
return nil, err
}
Expand Down
39 changes: 20 additions & 19 deletions test/e2e/framework/crd.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,26 @@ import (
)

func (f *Framework) EnsureCRD() GomegaAsyncAssertion {
return Eventually(func() error {
if err := f.kc.List(f.ctx, &api.RecommendationList{}); err != nil {
return fmt.Errorf("CRD Recommendation is not ready, Reason: %v", err)
}

if err := f.kc.List(f.ctx, &api.MaintenanceWindowList{}); err != nil {
return fmt.Errorf("CRD MaintainenceWindow is not ready, Reason: %v", err)
}

if err := f.kc.List(f.ctx, &api.ClusterMaintenanceWindowList{}); err != nil {
return fmt.Errorf("CRD ClusterMaintainenceWindow is not ready, Reason: %v", err)
}

if err := f.kc.List(f.ctx, &api.ApprovalPolicyList{}); err != nil {
return fmt.Errorf("CRD ApprovalPolicy is not ready, Reason: %v", err)
}

return nil
},
return Eventually(
func() error {
if err := f.kc.List(f.ctx, &api.RecommendationList{}); err != nil {
return fmt.Errorf("CRD Recommendation is not ready, Reason: %v", err)
}

if err := f.kc.List(f.ctx, &api.MaintenanceWindowList{}); err != nil {
return fmt.Errorf("CRD MaintainenceWindow is not ready, Reason: %v", err)
}

if err := f.kc.List(f.ctx, &api.ClusterMaintenanceWindowList{}); err != nil {
return fmt.Errorf("CRD ClusterMaintainenceWindow is not ready, Reason: %v", err)
}

if err := f.kc.List(f.ctx, &api.ApprovalPolicyList{}); err != nil {
return fmt.Errorf("CRD ApprovalPolicy is not ready, Reason: %v", err)
}

return nil
},
time.Minute*2,
time.Second*10,
)
Expand Down
Loading