fixup! feat: Add preflight checks framework

Each check returns list of causes

Author: dlipovetsky

pkg/webhook/preflight/preflight.go

@@ -16,10 +16,10 @@ import (
 
 type CheckResult struct {
 	Allowed bool
-	Field   string
-	Message string
-	Warning string
 	Error   bool
+
+	Causes   []metav1.StatusCause
+	Warnings []string
 }
 
 type Check = func(ctx context.Context) CheckResult
@@ -121,28 +121,15 @@ func (h *WebhookHandler) Handle(ctx context.Context, req admission.Request) admi
 	internalError := false
 	for result := range resultCh {
 		if result.Error {
-			resp.Allowed = false
-			resp.Result.Details.Causes = append(resp.Result.Details.Causes, metav1.StatusCause{
-				Type:    metav1.CauseTypeInternal,
-				Field:   result.Field,
-				Message: result.Message,
-			})
 			internalError = true
-			continue
 		}
 
 		if !result.Allowed {
 			resp.Allowed = false
-			resp.Result.Details.Causes = append(resp.Result.Details.Causes, metav1.StatusCause{
-				Type:    metav1.CauseTypeFieldValueInvalid,
-				Field:   result.Field,
-				Message: result.Message,
-			})
 		}
 
-		if result.Warning != "" {
-			resp.Warnings = append(resp.Warnings, result.Warning)
-		}
+		resp.Result.Details.Causes = append(resp.Result.Details.Causes, result.Causes...)
+		resp.Warnings = append(resp.Warnings, result.Warnings...)
 	}
 
 	if len(resp.Result.Details.Causes) == 0 {

pkg/webhook/preflight/preflight_test.go

@@ -194,8 +194,13 @@ func TestHandle(t *testing.T) {
 						func(ctx context.Context) CheckResult {
 							return CheckResult{
 								Allowed: false,
-								Field:   "spec.test",
-								Message: "test failed",
+								Causes: []metav1.StatusCause{
+									{
+										Type:    metav1.CauseTypeFieldValueInvalid,
+										Field:   "spec.test",
+										Message: "test failed",
+									},
+								},
 							}
 						},
 					},
@@ -239,7 +244,9 @@ func TestHandle(t *testing.T) {
 						func(ctx context.Context) CheckResult {
 							return CheckResult{
 								Allowed: true,
-								Warning: "test warning",
+								Warnings: []string{
+									"test warning",
+								},
 							}
 						},
 					},
@@ -275,7 +282,13 @@ func TestHandle(t *testing.T) {
 							return CheckResult{
 								Allowed: false,
 								Error:   true,
-								Message: "internal error",
+
+								Causes: []metav1.StatusCause{
+									{
+										Type:    metav1.CauseTypeInternal,
+										Message: "internal error",
+									},
+								},
 							}
 						},
 					},
@@ -285,7 +298,12 @@ func TestHandle(t *testing.T) {
 						func(ctx context.Context) CheckResult {
 							return CheckResult{
 								Allowed: false,
-								Message: "check failed",
+								Causes: []metav1.StatusCause{
+									{
+										Type:    metav1.CauseTypeFieldValueInvalid,
+										Message: "check failed",
+									},
+								},
 							}
 						},
 					},
@@ -401,7 +419,12 @@ func TestHandleCancelledContext(t *testing.T) {
 					return CheckResult{
 						Allowed: false,
 						Error:   true,
-						Message: "context cancelled",
+						Causes: []metav1.StatusCause{
+							{
+								Type:    metav1.CauseTypeInternal,
+								Message: "context cancelled",
+							},
+						},
 					}
 				case <-time.After(100 * time.Millisecond):
 					return CheckResult{Allowed: true}
@@ -413,7 +436,12 @@ func TestHandleCancelledContext(t *testing.T) {
 					return CheckResult{
 						Allowed: false,
 						Error:   true,
-						Message: "context cancelled",
+						Causes: []metav1.StatusCause{
+							{
+								Type:    metav1.CauseTypeInternal,
+								Message: "context cancelled",
+							},
+						},
 					}
 				case <-time.After(100 * time.Millisecond):
 					return CheckResult{Allowed: true}