Use admReview.Response in error cases too

codeready-toolchain · Nov 1, 2023 · c1f6dff · c1f6dff
1 parent 80df784
commit c1f6dff
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/pkg/webhook/mutatingwebhook/mutate.go b/pkg/webhook/mutatingwebhook/mutate.go
@@ -42,18 +42,16 @@ func handleMutate(logger logr.Logger, w http.ResponseWriter, r *http.Request, mu
 	admReview := admissionv1.AdmissionReview{}
 	if _, _, err := deserializer.Decode(admReviewBody, nil, &admReview); err != nil {
 		logger.Error(err, "unable to deserialize the admission review object", "body", string(admReviewBody))
-		writeResponse(logger, http.StatusBadRequest, w, []byte("unable to read the body of the request"))
-		return
+		admReview.Response = responseWithError("", err)
 	} else if admReview.Request == nil {
 		err = fmt.Errorf("admission review request is nil")
 		logger.Error(err, "invalid admission review request", "AdmissionReview", admReview)
-		writeResponse(logger, http.StatusBadRequest, w, []byte("unable to read the body of the request"))
-		return
+		admReview.Response = responseWithError("", err)
+	} else {
+		// mutate the request
+		admReview.Response = mutator(admReview)
 	}
 
-	// mutate the request
-	admReview.Response = mutator(admReview)
-
 	respBody, err := json.Marshal(admReview)
 	if err != nil {
 		logger.Error(err, "unable to marshal the admission review with response", "admissionReview", admReview)