Issue #71, Change interface of Array values to ComparableValue

Signed-off-by: Phil Hunt <[email protected]>

pkg/hexapolicy/conditions/conditions.go

@@ -13,7 +13,7 @@ import (
 const (
 	AAllow string = "allow"
 	ADeny  string = "deny"
-	AAudit string = "audit"
+	// AAudit string = "audit"
 )
 
 type ConditionInfo struct {

pkg/hexapolicy/types/array.go

@@ -1,12 +1,15 @@
 package types
 
-import "strings"
+import (
+	"fmt"
+	"strings"
+)
 
 type Array struct {
-	values []Value
+	values []ComparableValue
 }
 
-func NewArray(values []Value) Value {
+func NewArray(values []ComparableValue) Value {
 	return Array{values}
 }
 
@@ -31,13 +34,19 @@ func ParseArray(s string) (Value, error) {
 	val = strings.TrimSuffix(val, "]")
 
 	vals := strings.Split(val, ",")
-	values := make([]Value, len(vals))
+	values := make([]ComparableValue, len(vals))
 	for i, item := range vals {
 		iValue, err := ParseValue(item)
 		if err != nil {
 			return nil, err
 		}
-		values[i] = iValue
+		switch v := iValue.(type) {
+		case ComparableValue:
+			values[i] = v
+		default:
+			return nil, fmt.Errorf("arrays cannot contain sub-arrays or objects: %s", s)
+		}
+
 	}
 	return NewArray(values), nil
 }

pkg/hexapolicy/types/types_test.go

@@ -61,7 +61,7 @@ func TestTypes(t *testing.T) {
 		{
 			"Arrays",
 			"[\"a\", \"b\", \"c\"]",
-			Array{[]Value{String{"a"}, String{"b"}, String{"c"}}},
+			Array{[]ComparableValue{String{"a"}, String{"b"}, String{"c"}}},
 			"",
 			"",
 			false,
@@ -239,8 +239,8 @@ func TestArray(t *testing.T) {
 	assert.NoError(t, err)
 	assert.IsType(t, Array{}, value)
 	assert.Equal(t, TypeArray, value.ValueType())
-	assert.IsType(t, []Value{}, value.Value())
-	vals := value.Value().([]Value)
+	assert.IsType(t, []ComparableValue{}, value.Value())
+	vals := value.Value().([]ComparableValue)
 	val2 := vals[1]
 	assert.Equal(t, float64(2), val2.Value())
 }