boolean support

Author: askurydzin

Makefile

@@ -26,5 +26,5 @@ vendor:
 
 .PHONY: gentool
 gentool:
-	docker build -t infoblox/atlas-gentool:test-query .
+	docker build -t infoblox/atlas-gentool:atlas-validate-query-dev .
 	docker image prune -f --filter label=stage=server-intermediate

example/example.pb.atlas.query.validate.go

@@ -28,6 +28,7 @@ message User {
     Address work_address = 12;
     string company = 13 [(atlas.query.validate).filtering.deny = IEQ];
     string nationality = 14 [(atlas.query.validate).filtering.deny = IN];
+    bool boolean_field = 15;
 }
 
 message CustomType {

example/example.proto

@@ -38,6 +38,10 @@ func TestValidateFiltering(t *testing.T) {
 		{`nationality in ["American", "Сhinese"]`, true},
 		{`weight in [10, 20, 30]`, false},
 		{`comment in [10, 20, 30]`, true},
+		{`boolean_field in ["true", "1", "t", "True", "TRUE", "false", "0", "f", "False", "FALSE"]`, false},
+		{`boolean_field in ["tRuE"]`, true},
+		{`boolean_field=="True"`, false},
+		{`boolean_field=="Blah"`, true},
 	}
 
 	for _, test := range tests {

example/example_test.go

@@ -39,6 +39,7 @@ message QueryValidate {
     DEFAULT = 0;
     STRING = 1;
     NUMBER = 2;
+    BOOL = 3;
   }
   ValueType value_type  = 4;
   string value_type_url = 5;

options/query_validate.pb.go

@@ -2,6 +2,7 @@ package options
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/infobloxopen/atlas-app-toolkit/query"
@@ -53,9 +54,16 @@ func ValidateFiltering(f *query.Filtering, messageInfo map[string]FilteringOptio
 
 		switch x := f.(type) {
 		case *query.StringCondition:
-			if fieldInfo.ValueType != QueryValidate_STRING {
+			if fieldInfo.ValueType != QueryValidate_STRING && fieldInfo.ValueType != QueryValidate_BOOL {
 				return fmt.Errorf("Got invalid literal type for %s, expect %s", fieldTag, fieldInfo.ValueType)
 			}
+
+			if fieldInfo.ValueType == QueryValidate_BOOL {
+				if _, err := strconv.ParseBool(x.Value); err != nil {
+					return fmt.Errorf("Got invalid literal for field %q of type %s, expect 'true' or 'false'", fieldTag, fieldInfo.ValueType)
+				}
+			}
+
 			sc := &query.Filtering_StringCondition{x}
 			tp = query.StringCondition_Type_name[int32(sc.StringCondition.Type)]
 		case *query.NumberCondition:
@@ -65,9 +73,18 @@ func ValidateFiltering(f *query.Filtering, messageInfo map[string]FilteringOptio
 			nc := &query.Filtering_NumberCondition{x}
 			tp = query.NumberCondition_Type_name[int32(nc.NumberCondition.Type)]
 		case *query.StringArrayCondition:
-			if fieldInfo.ValueType != QueryValidate_STRING {
+			if fieldInfo.ValueType != QueryValidate_STRING && fieldInfo.ValueType != QueryValidate_BOOL {
 				return fmt.Errorf("Got invalid literal type for %s, expect %s", fieldTag, fieldInfo.ValueType)
 			}
+
+			if fieldInfo.ValueType == QueryValidate_BOOL {
+				for i, xv := range x.Values {
+					if _, err := strconv.ParseBool(xv); err != nil {
+						return fmt.Errorf("Got invalid literal for field %q of type %s at position %d, expect 'true' or 'false'", fieldTag, fieldInfo.ValueType, i)
+					}
+				}
+			}
+
 			nc := &query.Filtering_StringArrayCondition{x}
 			tp = query.StringArrayCondition_Type_name[int32(nc.StringArrayCondition.Type)]
 		case *query.NumberArrayCondition: