add is-array, is-not-array ops

stelligent · Aug 25, 2018 · 8e98146 · 8e98146
1 parent 23b23be
commit 8e98146
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 0 deletions.
diff --git a/assertion/match.go b/assertion/match.go
@@ -112,6 +112,16 @@ func isMatch(data interface{}, expression Expression) (MatchResult, error) {
 			return matches()
 		}
 		return doesNotMatch("%v should not be empty", key)
+	case "is-array":
+		if isArray(data) {
+			return matches()
+		}
+		return doesNotMatch("%v should be an array", key)
+	case "is-not-array":
+		if !isArray(data) {
+			return matches()
+		}
+		return doesNotMatch("%v should not be an array", key)
 	case "intersect":
 		if jsonListsIntersect(searchResult, value) {
 			return matches()

diff --git a/assertion/match_test.go b/assertion/match_test.go
@@ -111,6 +111,10 @@ func TestIsMatch(t *testing.T) {
 		"startsWithFalse":                {"FooBar", "starts-with", "Bar", "", false},
 		"endsWithTrue":                   {"FooBar", "ends-with", "Bar", "", true},
 		"endsWithFalse":                  {"FooBar", "ends-with", "Foo", "", false},
+		"isArrayTrue":                    {sliceOfTags, "is-array", "", "", true},
+		"isArrayFalse":                   {"Foo", "is-array", "", "", false},
+		"isNotArrayTrue":                 {sliceOfTags, "is-not-array", "", "", false},
+		"isNotArrayFalse":                {"Foo", "is-not-array", "", "", true},
 	}
 	for k, tc := range testCases {
 		var m MatchResult

diff --git a/assertion/util.go b/assertion/util.go
@@ -45,6 +45,21 @@ func isEmpty(data interface{}) bool {
 	}
 }
 
+func isArray(data interface{}) bool {
+	switch data.(type) {
+	case nil:
+		return false
+	case string:
+		return false
+	case []interface{}:
+		return true
+	case []map[string]interface{}:
+		return true
+	default:
+		return false
+	}
+}
+
 func listsIntersect(list1 []string, list2 []string) bool {
 	for _, a := range list1 {
 		for _, b := range list2 {

diff --git a/docs/operations.md b/docs/operations.md
@@ -12,7 +12,9 @@
 | [every](#every)                   | Every          |
 | [has-properties](#has-properties) | Has Properties |
 | [in](#in)                         | In             |
+| [is-array](#is-array)             | Is Array       |
 | [is-false](#is-false)             | Is False       |
+| [is-not-array](#is-not-array)     | Is Not Array   |
 | [is-true](#is-true)               | Is True        |
 | [ne](#ne)                         | Not equal      |
 | [none](#none)                     | None           |
@@ -389,3 +391,39 @@ Example:
          value: Resource
 ...
 ```
+
+## is-array
+
+Check that an attribute is an array
+
+Example:
+
+```
+...
+  - id: TAGS_ARRAY
+    message: Tags should be an array
+    severity: FAILURE
+    resource: some_resource
+    assertions:
+       - key: Tags[]
+         op: is-array
+...
+```
+
+## is-not-array
+
+Check that an attribute is not an array
+
+Example:
+
+```
+...
+  - id: DESCRIPTION_NOT_AN_ARRAY
+    message: Description should not be an array
+    severity: FAILURE
+    resource: some_resource
+    assertions:
+       - key: Name
+         op: is-not-array
+...
+```