chore: warning message should also be carried with APIStatusError

Signed-off-by: STRRL <im@strrl.dev>
kubernetes-sigs · Apr 17, 2023 · b2a9552 · b2a9552
1 parent 0d248e2
commit b2a9552
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/pkg/webhook/admission/validator.go b/pkg/webhook/admission/validator.go
@@ -117,7 +117,7 @@ func (h *validatingHandler) Handle(ctx context.Context, req Request) Response {
 	if err != nil {
 		var apiStatus apierrors.APIStatus
 		if errors.As(err, &apiStatus) {
-			return validationResponseFromStatus(false, apiStatus.Status())
+			return validationResponseFromStatus(false, apiStatus.Status()).WithWarnings(warnings...)
 		}
 		return Denied(err.Error()).WithWarnings(warnings...)
 	}

diff --git a/pkg/webhook/admission/validator_custom.go b/pkg/webhook/admission/validator_custom.go
@@ -116,7 +116,7 @@ func (h *validatorForType) Handle(ctx context.Context, req Request) Response {
 	if err != nil {
 		var apiStatus apierrors.APIStatus
 		if errors.As(err, &apiStatus) {
-			return validationResponseFromStatus(false, apiStatus.Status())
+			return validationResponseFromStatus(false, apiStatus.Status()).WithWarnings(warnings...)
 		}
 		return Denied(err.Error()).WithWarnings(warnings...)
 	}

diff --git a/pkg/webhook/admission/validator_test.go b/pkg/webhook/admission/validator_test.go
@@ -183,7 +183,8 @@ var _ = Describe("validatingHandler", func() {
 			Expect(response.Allowed).Should(BeFalse())
 			Expect(response.Result.Code).Should(Equal(expectedError.Status().Code))
 			Expect(*response.Result).Should(Equal(expectedError.Status()))
-			Expect(response.AdmissionResponse.Warnings).Should(BeEmpty())
+			Expect(response.AdmissionResponse.Warnings).Should(ContainElements(warningMessage))
+			Expect(response.AdmissionResponse.Warnings).Should(ContainElements(anotherWarningMessage))
 
 		})
 
@@ -206,7 +207,8 @@ var _ = Describe("validatingHandler", func() {
 			Expect(response.Allowed).Should(BeFalse())
 			Expect(response.Result.Code).Should(Equal(expectedError.Status().Code))
 			Expect(*response.Result).Should(Equal(expectedError.Status()))
-			Expect(response.AdmissionResponse.Warnings).Should(BeEmpty())
+			Expect(response.AdmissionResponse.Warnings).Should(ContainElements(warningMessage))
+			Expect(response.AdmissionResponse.Warnings).Should(ContainElements(anotherWarningMessage))
 
 		})
 
@@ -225,7 +227,8 @@ var _ = Describe("validatingHandler", func() {
 			Expect(response.Allowed).Should(BeFalse())
 			Expect(response.Result.Code).Should(Equal(expectedError.Status().Code))
 			Expect(*response.Result).Should(Equal(expectedError.Status()))
-			Expect(response.AdmissionResponse.Warnings).Should(BeEmpty())
+			Expect(response.AdmissionResponse.Warnings).Should(ContainElements(warningMessage))
+			Expect(response.AdmissionResponse.Warnings).Should(ContainElements(anotherWarningMessage))
 
 		})