copy typemeta from request to response (#335)

* copy ttypemeta from request to response Signed-off-by: Stuart Hayton <[email protected]> * fix description
IBM · Jun 16, 2021 · 06dfd28 · 06dfd28
1 parent c9a1b60
commit 06dfd28
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
@@ -132,6 +132,7 @@ func (s *Server) Run() {
 func reviewResponseToByte(admissionResponse *admissionv1.AdmissionResponse, admissionReview admissionv1.AdmissionReview) []byte {
 	response := admissionv1.AdmissionReview{}
 	if admissionResponse != nil {
+		response.TypeMeta = admissionReview.TypeMeta
 		response.Response = admissionResponse
 		if admissionReview.Request != nil {
 			response.Response.UID = admissionReview.Request.UID

diff --git a/pkg/webhook/webhook_test.go b/pkg/webhook/webhook_test.go
@@ -26,6 +26,7 @@ import (
 
 	fakeController "github.com/IBM/portieris/pkg/controller/fakecontroller"
 	admissionv1 "k8s.io/api/admission/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -80,7 +81,7 @@ func Test_reviewResponseToByte(t *testing.T) {
 		wantAdmissionReview admissionv1.AdmissionReview
 	}{
 		{
-			name:              "Review response matches inputted review with matching request/response UID",
+			name:              "Review response has UUID matching the request",
 			admissionResponse: &admissionv1.AdmissionResponse{UID: "responseUID", Allowed: true},
 			admissionReview: admissionv1.AdmissionReview{
 				Request: &admissionv1.AdmissionRequest{UID: "requestUID"},
@@ -94,13 +95,24 @@ func Test_reviewResponseToByte(t *testing.T) {
 			admissionResponse: &admissionv1.AdmissionResponse{},
 			admissionReview: admissionv1.AdmissionReview{
 				Request: &admissionv1.AdmissionRequest{
-					UID:       "requestUID",
 					Object:    runtime.RawExtension{Raw: []byte("SomeBytes")},
 					OldObject: runtime.RawExtension{Raw: []byte("SomeBytes")},
 				},
 			},
 			wantAdmissionReview: admissionv1.AdmissionReview{
-				Response: &admissionv1.AdmissionResponse{UID: "requestUID"},
+				Response: &admissionv1.AdmissionResponse{},
+			},
+		},
+		{
+			name:              "Review response object has TypeMeta from incoming review",
+			admissionResponse: &admissionv1.AdmissionResponse{},
+			admissionReview: admissionv1.AdmissionReview{
+				TypeMeta: v1.TypeMeta{Kind: "someKind", APIVersion: "APIVersion10"},
+				Request:  &admissionv1.AdmissionRequest{},
+			},
+			wantAdmissionReview: admissionv1.AdmissionReview{
+				TypeMeta: v1.TypeMeta{Kind: "someKind", APIVersion: "APIVersion10"},
+				Response: &admissionv1.AdmissionResponse{},
 			},
 		},
 	}