diff --git a/webhooks/admission_test.go b/webhooks/admission_test.go index 113e937ce4..c1ffbad608 100644 --- a/webhooks/admission_test.go +++ b/webhooks/admission_test.go @@ -1,6 +1,7 @@ package webhooks_test import ( + "gotest.tools/assert" "testing" types "github.com/nirmata/kube-policy/pkg/apis/policy/v1alpha1" @@ -12,41 +13,41 @@ import ( func TestAdmissionIsRequired(t *testing.T) { var request v1beta1.AdmissionRequest request.Kind.Kind = "ConfigMap" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "CronJob" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "DaemonSet" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "Deployment" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "Endpoints" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "HorizontalPodAutoscaler" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "Ingress" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "Job" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "LimitRange" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "Namespace" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "NetworkPolicy" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "PersistentVolumeClaim" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "PodDisruptionBudget" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "PodTemplate" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "ResourceQuota" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "Secret" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "Service" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) request.Kind.Kind = "StatefulSet" - assertEq(t, true, webhooks.AdmissionIsRequired(&request)) + assert.Assert(t, webhooks.AdmissionIsRequired(&request)) } func TestIsRuleResourceFitsRequest_Kind(t *testing.T) { @@ -62,9 +63,9 @@ func TestIsRuleResourceFitsRequest_Kind(t *testing.T) { objectByteArray := []byte(`{"metadata":{"name":"test-config-map","namespace":"default","creationTimestamp":null,"labels":{"label1":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, true, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, webhooks.IsRuleApplicableToRequest(resource, &request)) resource.Kind = "Deployment" - assertEq(t, false, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, false == webhooks.IsRuleApplicableToRequest(resource, &request)) } func TestIsRuleResourceFitsRequest_Name(t *testing.T) { @@ -79,17 +80,17 @@ func TestIsRuleResourceFitsRequest_Name(t *testing.T) { objectByteArray := []byte(`{"metadata":{"name":"test-config-map","namespace":"default","creationTimestamp":null,"labels":{"label1":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, true, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, webhooks.IsRuleApplicableToRequest(resource, &request)) resourceName = "test-config-map-new" - assertEq(t, false, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, false == webhooks.IsRuleApplicableToRequest(resource, &request)) objectByteArray = []byte(`{"metadata":{"name":"test-config-map-new","namespace":"default","creationTimestamp":null,"labels":{"label1":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, true, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, webhooks.IsRuleApplicableToRequest(resource, &request)) objectByteArray = []byte(`{"metadata":{"name":"","namespace":"default","creationTimestamp":null,"labels":{"label1":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, false, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, false == webhooks.IsRuleApplicableToRequest(resource, &request)) } func TestIsRuleResourceFitsRequest_MatchExpressions(t *testing.T) { @@ -130,7 +131,7 @@ func TestIsRuleResourceFitsRequest_MatchExpressions(t *testing.T) { objectByteArray := []byte(`{"metadata":{"name":"test-config-map","namespace":"default","creationTimestamp":null,"labels":{"label1":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, true, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, webhooks.IsRuleApplicableToRequest(resource, &request)) } func TestIsRuleResourceFitsRequest_MatchLabels(t *testing.T) { @@ -151,11 +152,11 @@ func TestIsRuleResourceFitsRequest_MatchLabels(t *testing.T) { objectByteArray := []byte(`{"metadata":{"name":"test-config-map","namespace":"default","creationTimestamp":null,"labels":{"label1":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, true, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, webhooks.IsRuleApplicableToRequest(resource, &request)) objectByteArray = []byte(`{"metadata":{"name":"test-config-map","namespace":"default","creationTimestamp":null,"labels":{"label3":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, false, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, false == webhooks.IsRuleApplicableToRequest(resource, &request)) resource = types.PolicyResource{ Kind: "ConfigMap", @@ -168,7 +169,7 @@ func TestIsRuleResourceFitsRequest_MatchLabels(t *testing.T) { }, } - assertEq(t, true, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, webhooks.IsRuleApplicableToRequest(resource, &request)) } func TestIsRuleResourceFitsRequest_MatchLabelsAndMatchExpressions(t *testing.T) { @@ -197,7 +198,7 @@ func TestIsRuleResourceFitsRequest_MatchLabelsAndMatchExpressions(t *testing.T) objectByteArray := []byte(`{"metadata":{"name":"test-config-map","namespace":"default","creationTimestamp":null,"labels":{"label1":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, true, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, webhooks.IsRuleApplicableToRequest(resource, &request)) resource = types.PolicyResource{ Kind: "ConfigMap", @@ -220,5 +221,5 @@ func TestIsRuleResourceFitsRequest_MatchLabelsAndMatchExpressions(t *testing.T) objectByteArray = []byte(`{"metadata":{"name":"test-config-map","namespace":"default","creationTimestamp":null,"labels":{"label1":"test1","label2":"test2"}}}`) request.Object.Raw = objectByteArray - assertEq(t, true, webhooks.IsRuleApplicableToRequest(resource, &request)) + assert.Assert(t, webhooks.IsRuleApplicableToRequest(resource, &request)) }