Merge pull request #5 from dbsystel/develop

Fix: provided request UID in response

.github/workflows/go.yml

@@ -26,7 +26,9 @@ jobs:
       with:
         version: v1.40
         only-new-issues: true
-
+        skip-go-installation: true
+        skip-pkg-cache: true
+
     - name: Build
       run: go build -v ./pkg/...
 

pkg/codec/deserializer_test.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"reflect"
 
+	admissionv1 "k8s.io/api/admission/v1"
+
 	"github.com/dbsystel/kewl/pkg/panicutils"
 
 	"github.com/dbsystel/kewl/pkg/codec"
@@ -38,24 +40,29 @@ var _ = Describe("Deserializer", func() {
 	BeforeEach(func() {
 		sut = codec.NewDeserializer(runtime.NewScheme())
 	})
-	It("should throw an error if object is unknown", func() {
+	It("should return an error if object is unknown", func() {
 		deserialize, err := sut.Deserialize(schema.GroupVersionKind{Group: "meh", Version: "meh", Kind: "meh"}, nil)
 		Expect(deserialize).To(BeNil())
 		Expect(err).To(HaveOccurred())
 	})
-	It("should throw an error if the object is known, but cannot be deserialized", func() {
+	It("should return an error if the object is known, but cannot be deserialized", func() {
 		Expect(sut.Register(&corev1Extension{})).To(Not(HaveOccurred()))
 		deserialize, err := sut.Deserialize(gvk(corev1.SchemeGroupVersion, corev1.Pod{}), []byte("meh"))
 		Expect(deserialize).To(BeNil())
 		Expect(err).To(HaveOccurred())
 	})
-	It("should throw an error when the scheme extension is nil", func() {
+	It("should return an error when the scheme extension is nil", func() {
 		Expect(sut.Register(nil)).To(HaveOccurred())
 	})
 	It("should deserialize an object correctly", func() {
 		Expect(sut.Register(&corev1Extension{})).To(Not(HaveOccurred()))
 		Expect(sut.Deserialize(gvk(corev1.SchemeGroupVersion, corev1.Pod{}), marshalJSON(&corev1.Pod{}))).Should(Not(BeNil()))
 	})
+	It("should return an error in case an invalid object was provided", func() {
+		Expect(sut.Register(&corev1Extension{})).To(Not(HaveOccurred()))
+		_, err := sut.Deserialize(gvk(corev1.SchemeGroupVersion, admissionv1.AdmissionReview{}), marshalJSON(&corev1.Pod{}))
+		Expect(err).To(HaveOccurred())
+	})
 	It("should propagate not registered correctly", func() {
 		Expect(sut.Register(&corev1Extension{})).To(Not(HaveOccurred()))
 		_, err := sut.Deserialize(schema.GroupVersionKind{}, marshalJSON(&corev1.Pod{}))

pkg/webhook/facade/api.go

@@ -82,10 +82,10 @@ func AdmissionReviewFrom(bytes []byte) (AdmissionReview, error) {
 		return nil, fmt.Errorf("%v - %v: %v", InvalidAdmissionReviewMsg, "invalid object GroupVersionKind", kind)
 	}
 	if kind.Group == v1.SchemeGroupVersion.Group && kind.Version == v1.SchemeGroupVersion.Version {
-		return v1AdmissionReviewFromBytes(bytes)
+		return V1AdmissionReviewFromBytes(bytes)
 	}
 	if kind.Group == v1beta1.SchemeGroupVersion.Group && kind.Version == v1beta1.SchemeGroupVersion.Version {
-		return v1beta1AdmissionReviewFromBytes(bytes)
+		return V1beta1AdmissionReviewFromBytes(bytes)
 	}
 	return nil, fmt.Errorf("could not create facade for: %v", kind)
 }

pkg/webhook/facade/v1_admission_review.go

@@ -12,7 +12,7 @@ import (
 
 var v1PatchTypeJSONPatch = v1.PatchTypeJSONPatch
 
-func v1AdmissionReviewFromBytes(bytes []byte) (AdmissionReview, error) {
+func V1AdmissionReviewFromBytes(bytes []byte) (AdmissionReview, error) {
 	target := &v1.AdmissionReview{}
 	if err := json.Unmarshal(bytes, target); err != nil {
 		return nil, errors.Wrap(err, "got an admission review v1, but could not serialize it")
@@ -78,16 +78,15 @@ func (v *v1AdmissionReviewRequest) Resource() metav1.GroupVersionResource {
 	return v.target.Resource
 }
 
-func (v v1AdmissionReviewRequest) Version() string {
-	return v1.SchemeGroupVersion.Version
-}
-
 // Response decorator functions
 var _ AdmissionResponse = &v1AdmissionReview{}
 
 func (v *v1AdmissionReview) withResponse(handler func(response *v1.AdmissionResponse)) {
 	if v.target.Response == nil {
-		v.target.Response = &v1.AdmissionResponse{}
+		if v.target.Request == nil {
+			return
+		}
+		v.target.Response = &v1.AdmissionResponse{UID: v.target.Request.UID}
 	}
 	handler(v.target.Response)
 }

pkg/webhook/facade/v1_admission_review_test.go

@@ -2,7 +2,6 @@
 package facade_test
 
 import (
-	"github.com/dbsystel/kewl/pkg/panicutils"
 	"github.com/dbsystel/kewl/pkg/webhook/facade"
 	"github.com/dbsystel/kewl/testing/admission_test"
 	"github.com/dbsystel/kewl/testing/validation_test"
@@ -13,15 +12,24 @@ import (
 )
 
 var _ = Describe("v1AdmissionReview test", func() {
+	var review *admission_test.V1AdmissionReview
 	var sut facade.AdmissionReview
 	BeforeEach(func() {
-		review, err := facade.AdmissionReviewFrom(admission_test.V1ValidPod().MustMarshal())
-		panicutils.PanicIfError(err)
-		sut = review
+		review = admission_test.V1ValidPod()
+		var err error
+		sut, err = facade.AdmissionReviewFrom(review.MustMarshal())
+		Expect(err).NotTo(HaveOccurred())
 	})
 	v1AdmissionReview := func() *v1.AdmissionReview {
 		return K8sAdmissionReview(sut, &v1.AdmissionReview{}).(*v1.AdmissionReview)
 	}
+	It("should return decode err", func() {
+		_, err := facade.V1AdmissionReviewFromBytes([]byte("bla"))
+		Expect(err).To(HaveOccurred())
+	})
+	It("should return the version correctly", func() {
+		Expect(sut.Version()).To(Equal(v1.SchemeGroupVersion.Version))
+	})
 	It("should facade the request correctly", func() {
 		expected := admission_test.V1ValidPod().Request
 		Expect(sut.Request().Kind()).To(BeEquivalentTo(expected.Kind))
@@ -36,6 +44,7 @@ var _ = Describe("v1AdmissionReview test", func() {
 			sut.Response().Allow()
 			result := v1AdmissionReview()
 			Expect(result.Response).NotTo(BeNil())
+			Expect(result.Response.UID).To(Equal(review.Request.UID))
 			Expect(result.Response.Allowed).To(BeTrue())
 			Expect(sut.Response().ResponseType()).To(Equal(facade.AdmissionAllowed))
 		})
@@ -52,6 +61,7 @@ var _ = Describe("v1AdmissionReview test", func() {
 			sut.Response().Deny(status)
 			result := v1AdmissionReview()
 			Expect(result.Response).NotTo(BeNil())
+			Expect(result.Response.UID).To(Equal(review.Request.UID))
 			Expect(result.Response.Allowed).To(BeFalse())
 			Expect(result.Response.Result).To(BeEquivalentTo(status))
 			Expect(sut.Response().ResponseType()).To(Equal(facade.AdmissionDenied))
@@ -60,6 +70,7 @@ var _ = Describe("v1AdmissionReview test", func() {
 			sut.Response().PatchJSON([]byte("{}"))
 			result := v1AdmissionReview()
 			Expect(result.Response).NotTo(BeNil())
+			Expect(result.Response.UID).To(Equal(review.Request.UID))
 			Expect(result.Response.Allowed).To(BeTrue())
 			Expect(result.Response.PatchType).NotTo(BeNil())
 			Expect(result.Response.Patch).NotTo(BeEmpty())
@@ -74,5 +85,11 @@ var _ = Describe("v1AdmissionReview test", func() {
 			sut.Response().Deny(nil)
 			Expect(sut.Response().IsSet()).To(BeTrue())
 		})
+		It("should not handle response if request is nil", func() {
+			Expect(sut.Response().IsSet()).To(BeFalse())
+			sut.ClearRequest()
+			sut.Response().Allow()
+			Expect(sut.Response().IsSet()).To(BeFalse())
+		})
 	})
 })

pkg/webhook/facade/v1beta1_admission_review.go

@@ -12,7 +12,7 @@ import (
 
 var v1beta1PatchTypeJSONPatch = v1beta1.PatchTypeJSONPatch
 
-func v1beta1AdmissionReviewFromBytes(bytes []byte) (AdmissionReview, error) {
+func V1beta1AdmissionReviewFromBytes(bytes []byte) (AdmissionReview, error) {
 	target := &v1beta1.AdmissionReview{}
 	if err := json.Unmarshal(bytes, target); err != nil {
 		return nil, errors.Wrap(err, "got an admission review v1beta1, but could not serialize it")
@@ -78,16 +78,15 @@ func (v *v1beta1AdmissionReviewRequest) Resource() metav1.GroupVersionResource {
 	return v.target.Resource
 }
 
-func (v v1beta1AdmissionReviewRequest) Version() string {
-	return v1beta1.SchemeGroupVersion.Version
-}
-
 // Response decorator functions
 var _ AdmissionResponse = &v1beta1AdmissionReview{}
 
 func (v *v1beta1AdmissionReview) withResponse(handler func(response *v1beta1.AdmissionResponse)) {
 	if v.target.Response == nil {
-		v.target.Response = &v1beta1.AdmissionResponse{}
+		if v.target.Request == nil {
+			return
+		}
+		v.target.Response = &v1beta1.AdmissionResponse{UID: v.target.Request.UID}
 	}
 	handler(v.target.Response)
 }

pkg/webhook/facade/v1beta1_admission_review_test.go

@@ -2,7 +2,6 @@
 package facade_test
 
 import (
-	"github.com/dbsystel/kewl/pkg/panicutils"
 	"github.com/dbsystel/kewl/pkg/webhook/facade"
 	"github.com/dbsystel/kewl/testing/admission_test"
 	"github.com/dbsystel/kewl/testing/validation_test"
@@ -13,15 +12,24 @@ import (
 )
 
 var _ = Describe("v1beta1AdmissionReview test", func() {
+	var review *admission_test.V1Beta1AdmissionReview
 	var sut facade.AdmissionReview
 	BeforeEach(func() {
-		review, err := facade.AdmissionReviewFrom(admission_test.V1Beta1ValidPod().MustMarshal())
-		panicutils.PanicIfError(err)
-		sut = review
+		review = admission_test.V1Beta1ValidPod()
+		var err error
+		sut, err = facade.AdmissionReviewFrom(review.MustMarshal())
+		Expect(err).NotTo(HaveOccurred())
 	})
 	v1beta1AdmissionReview := func() *v1beta1.AdmissionReview {
 		return K8sAdmissionReview(sut, &v1beta1.AdmissionReview{}).(*v1beta1.AdmissionReview)
 	}
+	It("should return decode err", func() {
+		_, err := facade.V1beta1AdmissionReviewFromBytes([]byte("bla"))
+		Expect(err).To(HaveOccurred())
+	})
+	It("should return the version correctly", func() {
+		Expect(sut.Version()).To(Equal(v1beta1.SchemeGroupVersion.Version))
+	})
 	It("should facade the request correctly", func() {
 		expected := admission_test.V1Beta1ValidPod().Request
 		Expect(sut.Request().Kind()).To(BeEquivalentTo(expected.Kind))
@@ -36,6 +44,7 @@ var _ = Describe("v1beta1AdmissionReview test", func() {
 			sut.Response().Allow()
 			result := v1beta1AdmissionReview()
 			Expect(result.Response).NotTo(BeNil())
+			Expect(result.Response.UID).To(Equal(review.Request.UID))
 			Expect(result.Response.Allowed).To(BeTrue())
 			Expect(sut.Response().ResponseType()).To(Equal(facade.AdmissionAllowed))
 		})
@@ -52,6 +61,7 @@ var _ = Describe("v1beta1AdmissionReview test", func() {
 			sut.Response().Deny(status)
 			result := v1beta1AdmissionReview()
 			Expect(result.Response).NotTo(BeNil())
+			Expect(result.Response.UID).To(Equal(review.Request.UID))
 			Expect(result.Response.Allowed).To(BeFalse())
 			Expect(result.Response.Result).To(BeEquivalentTo(status))
 			Expect(sut.Response().ResponseType()).To(Equal(facade.AdmissionDenied))
@@ -60,6 +70,7 @@ var _ = Describe("v1beta1AdmissionReview test", func() {
 			sut.Response().PatchJSON([]byte("{}"))
 			result := v1beta1AdmissionReview()
 			Expect(result.Response).NotTo(BeNil())
+			Expect(result.Response.UID).To(Equal(review.Request.UID))
 			Expect(result.Response.Allowed).To(BeTrue())
 			Expect(result.Response.PatchType).NotTo(BeNil())
 			Expect(result.Response.Patch).NotTo(BeEmpty())
@@ -74,5 +85,11 @@ var _ = Describe("v1beta1AdmissionReview test", func() {
 			sut.Response().Deny(nil)
 			Expect(sut.Response().IsSet()).To(BeTrue())
 		})
+		It("should not handle response if request is nil", func() {
+			Expect(sut.Response().IsSet()).To(BeFalse())
+			sut.ClearRequest()
+			sut.Response().Allow()
+			Expect(sut.Response().IsSet()).To(BeFalse())
+		})
 	})
 })

testing/admission_test/v1.go

@@ -7,6 +7,7 @@ import (
 	v1 "k8s.io/api/admission/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/uuid"
 )
 
 // V1TypeMeta is the metav1.TypeMeta for v1.AdmissionReview
@@ -31,6 +32,7 @@ func NewV1Review(obj, oldObj testing.Reviewable) func() *V1AdmissionReview {
 		return &V1AdmissionReview{
 			TypeMeta: V1TypeMeta,
 			Request: &v1.AdmissionRequest{
+				UID:  uuid.NewUUID(),
 				Kind: metav1.GroupVersionKind{Group: kind.Group, Version: kind.Version, Kind: kind.Kind},
 				Resource: metav1.GroupVersionResource{
 					Group:    kind.Group,

testing/admission_test/v1beta1.go

@@ -6,6 +6,7 @@ import (
 	"github.com/dbsystel/kewl/testing/json_test"
 	"k8s.io/api/admission/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/uuid"
 )
 
 // V1Beta1TypeMeta is the metav1.TypeMeta for v1beta1.AdmissionReview
@@ -29,6 +30,7 @@ func NewV1Beta1Review(obj, oldObj testing.Reviewable) func() *V1Beta1AdmissionRe
 		return &V1Beta1AdmissionReview{
 			TypeMeta: V1Beta1TypeMeta,
 			Request: &v1beta1.AdmissionRequest{
+				UID:  uuid.NewUUID(),
 				Kind: metav1.GroupVersionKind{Group: kind.Group, Version: kind.Version, Kind: kind.Kind},
 				Resource: metav1.GroupVersionResource{
 					Group:    kind.Group,