Fixed check for null value for array type when key/value is not set

Author: aneeshkp

Makefile

@@ -49,13 +49,13 @@ run-generic-cnf-tests:
 	cd ./test-network-function && ./test-network-function.test -ginkgo.focus="generic" ${COMMON_GINKGO_ARGS}
 
 run-cnf-tests:
-	cd ./test-network-function && ./test-network-function.test $COMMON_GINKGO_ARGS
+	cd ./test-network-function && ./test-network-function.test ${COMMON_GINKGO_ARGS}
 
 run-operator-tests:
-	cd ./test-network-function/operator-test && ./operator-test.test  $COMMON_GINKGO_ARGS
+	cd ./test-network-function/operator-test && ./operator-test.test  ${COMMON_GINKGO_ARGS}
 
 run-container-tests:
-	cd ./test-network-function/container-test && ./container-test.test  $COMMON_GINKGO_ARGS
+	cd ./test-network-function/container-test && ./container-test.test  ${COMMON_GINKGO_ARGS}
 
 deps-update:
 	go mod tidy && \
@@ -80,7 +80,7 @@ clean:
 	rm -f ./test-network-function/operator-test/operator-test.test
 	rm -f ./test-network-function/operator-test/cnf-operator-certification-tests_junit.xml
 	rm -f ./test-network-function/container-test/container-test.test
-	rm -f ./test-network-function/container-test/cnf-container-certification-tests_junit.xml
+	rm -f ./test-network-function/container-test/cnf-container-tests_junit.xml
 
 dependencies:
 	go get github.com/onsi/ginkgo/ginkgo

pkg/tnf/handlers/container/pod.go

@@ -65,7 +65,12 @@ func (p *Pod) ReelMatch(_ string, _ string, match string) *reel.Step {
 	//for type: array ,should match for any expected status or fail on any expected status
 	//based on the action type allow (default)|deny
 	if p.ResultType == "array" {
-
+		re := regexp.MustCompile(testcases.GetOutRegExp("NULL")) //Not having capabilities is positive
+		matched := re.MatchString(match)
+		if matched {
+			p.result = tnf.SUCCESS
+			return nil
+		}
 		replacer := strings.NewReplacer(`[`, ``, "\"", ``, `]`, ``, `, `, `,`)
 		match = replacer.Replace(match)
 		matchSlice := strings.Split(match, ",")

pkg/tnf/handlers/container/pod_test.go

@@ -64,6 +64,13 @@ func TestPodTest_ReelMatchStringNoFound(t *testing.T) {
 	assert.Equal(t, tnf.ERROR, c.Result())
 }
 
+func TestPodTest_ReelMatchArray_Allow_Dendy_ISNULL(t *testing.T) {
+	c := container.NewPod(command, name, namespace, sliceExpectedStatus, "array", actionAllow, testTimeoutDuration)
+	step := c.ReelMatch("", "", `null`)
+	assert.Nil(t, step)
+	assert.Equal(t, tnf.SUCCESS, c.Result())
+}
+
 func TestPodTest_ReelMatchArray_Allow_Match(t *testing.T) {
 	c := container.NewPod(command, name, namespace, sliceExpectedStatus, "array", actionAllow, testTimeoutDuration)
 	step := c.ReelMatch("", "", `["NET_ADMIN", "SYS_TIME"]`)

pkg/tnf/handlers/container/testcases/data/privilegedpod.go

@@ -63,7 +63,7 @@ var PrivilegedPodJSON = string(`{
       "name": "ROOT_CHECK",
       "skiptest": true,
       "command": "oc get pod  %s  -n %s -o json  | jq -r '.spec.containers[0].securityContext.runAsUser'",
-      "resultType": "string",
+      "resulttype": "string",
       "action": "allow",
       "expectedstatus": [
         "NON_ROOT_USER"

test-network-function/container-test/container_cnf_test.go

@@ -57,7 +57,7 @@ var _ = ginkgo.Describe("container_test", func() {
 		gomega.Expect(context.GetExpecter()).ToNot(gomega.BeNil())
 	})
 	// add pdo is running check later
-	ginkgo.When("When Pod is in running state", func() {
+	ginkgo.When("pod is in running state", func() {
 		for _, pod := range podsInTest.Pod {
 			for _, testType := range pod.Tests {
 				testFile := loadConfiguredTestFile(testType)
@@ -78,9 +78,9 @@ var _ = ginkgo.Describe("container_test", func() {
 })
 
 func runTestsOnPod(name, namespace string, testCmd testcases.BaseTestCase) {
-	ginkgo.When("Pod Test ", func() {
-		ginkgo.It("Checks for "+testCmd.Name, func() {
-			podInTest := container.NewPod(testCmd.Command, name, namespace, testCmd.ExptectedStatus, testCmd.Action, testCmd.ResultType, defaultTimeout)
+	ginkgo.When("pod test ", func() {
+		ginkgo.It("checks for "+testCmd.Name, func() {
+			podInTest := container.NewPod(testCmd.Command, name, namespace, testCmd.ExptectedStatus, testCmd.ResultType, testCmd.Action, defaultTimeout)
 			gomega.Expect(podInTest).ToNot(gomega.BeNil())
 			test, err := tnf.NewTest(context.GetExpecter(), podInTest, []reel.Handler{podInTest}, context.GetErrorChannel())
 			gomega.Expect(err).To(gomega.BeNil())