feat: change allow key to match

Author: chen-keinan

eval/cmdeval.go

@@ -75,7 +75,7 @@ func (cv commandEvaluate) evalPolicy(commands []string, cmdExec cmd, evalExpr st
 			if len(res) > 0 {
 				policyResult = utils.MatchPolicy(res[0].ExpressionValue[0].Value, ReturnFields)
 			} else {
-				policyResult = utils.PolicyResult{ReturnValues: map[string]string{"allow": "false"}}
+				policyResult = utils.PolicyResult{ReturnValues: map[string]string{"match": "false"}}
 			}
 			policyEvalResults = append(policyEvalResults, policyResult)
 		}

eval/cmdeval_test.go

@@ -33,7 +33,7 @@ func TestEvalCommand(t *testing.T) {
 }
 
 const NotAllowPolicy = `package itsio
-policy_eval :={"name":namespace_name,"allow":allow_policy} {
+policy_eval :={"name":namespace_name,"match":allow_policy} {
 	namespace_name:= input.metadata.namespace
     input.kind == "Pod"
 	some i
@@ -42,7 +42,7 @@ policy_eval :={"name":namespace_name,"allow":allow_policy} {
 `
 
 const AllowPolicy = `package itsio
-policy_eval :={"name":namespace_name,"allow":allow_policy} {
+policy_eval :={"name":namespace_name,"match":allow_policy} {
 	namespace_name:= input.metadata.namespace
 	allow_policy := namespace_name == "default"
   }

utils/stringutil.go

@@ -220,12 +220,12 @@ func MatchPolicy(evalResult interface{}, returnKeys []string) PolicyResult {
 	switch t := evalResult.(type) {
 	case bool:
 		boolValue := strconv.FormatBool(t)
-		return PolicyResult{ReturnValues: map[string]string{"allow": boolValue}}
+		return PolicyResult{ReturnValues: map[string]string{"match": boolValue}}
 	case map[string]interface{}:
 		pr := PolicyResult{ReturnValues: make(map[string]string)}
 		for _, rv := range returnKeys {
 			key := strings.TrimSpace(rv)
-			if key == "allow" {
+			if key == "match" {
 				b, ok := t[key].(bool)
 				if ok {
 					boolValue := strconv.FormatBool(b)
@@ -240,7 +240,7 @@ func MatchPolicy(evalResult interface{}, returnKeys []string) PolicyResult {
 		}
 		return pr
 	default:
-		return PolicyResult{ReturnValues: map[string]string{"allow": "false"}}
+		return PolicyResult{ReturnValues: map[string]string{"match": "false"}}
 	}
 }
 

utils/stringutil_test.go

@@ -152,14 +152,14 @@ func Test_GetPolicyExpr(t *testing.T) {
 
 func Test_MatchPolicySingleReturn(t *testing.T) {
 	policyValues := true
-	returnData := []string{"allow"}
+	returnData := []string{"match"}
 	mpr := MatchPolicy(policyValues, returnData)
-	assert.Equal(t, mpr.ReturnValues["allow"], "true")
+	assert.Equal(t, mpr.ReturnValues["match"], "true")
 }
 
 func Test_MatchPolicySingleMulti(t *testing.T) {
-	policyValues := map[string]interface{}{"allow": true}
-	returnData := []string{"allow"}
+	policyValues := map[string]interface{}{"match": true}
+	returnData := []string{"match"}
 	mpr := MatchPolicy(policyValues, returnData)
-	assert.Equal(t, mpr.ReturnValues["allow"], "true")
+	assert.Equal(t, mpr.ReturnValues["match"], "true")
 }