Default validation (#13)

* Add validation to invalid field

* add gentool patch for protoc-gen-atlas-query-validate

* update examples

* small improvments

* latest updates

* Fix gramma

Author: Aliaksei Burau

Dockerfile

@@ -0,0 +1,14 @@
+FROM golang:1.10.0 AS builder
+
+LABEL stage=server-intermediate
+
+WORKDIR /go/src/github.com/infobloxopen/protoc-gen-atlas-query-validate
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux go build -o /out/usr/bin/protoc-gen-atlas-query-validate main.go
+
+FROM infoblox/atlas-gentool:latest AS runner
+
+COPY --from=builder /out/usr/bin/protoc-gen-atlas-query-validate /usr/bin/protoc-gen-atlas-query-validate
+COPY --from=builder /go/src/github.com/infobloxopen/protoc-gen-atlas-query-validate/options/*.proto /go/src/github.com/infobloxopen/protoc-gen-atlas-query-validate/options/
+
+WORKDIR /go/src

Makefile

@@ -22,4 +22,9 @@ test: example
 
 .PHONY: vendor
 vendor:
-	dep ensure -vendor-only
+	dep ensure -vendor-only
+
+.PHONY: gentool
+gentool:
+	docker build -t infoblox/atlas-gentool:test-query .
+	docker image prune -f --filter label=stage=server-intermediate

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

@@ -29,6 +29,9 @@ func ValidateFiltering(f *query.Filtering, messageInfo map[string]FilteringOptio
 		if !ok {
 			return fmt.Errorf("Unknown field: %s", fieldTag)
 		}
+		if fieldInfo.ValueType == QueryValidate_DEFAULT {
+			return fmt.Errorf("Filtering is not supported for field %s", fieldTag)
+		}
 
 		tp := ""
 
@@ -57,8 +60,8 @@ func ValidateFiltering(f *query.Filtering, messageInfo map[string]FilteringOptio
 			}
 			nc := &query.Filtering_NumberArrayCondition{x}
 			tp = query.NumberArrayCondition_Type_name[int32(nc.NumberArrayCondition.Type)]
-
 		default:
+
 			return nil
 		}
 		for _, val := range fieldInfo.Deny {

options/validate.go

@@ -228,8 +228,10 @@ func (p *QueryValidatePlugin) getFilteringData(msg *generator.Descriptor) []fiel
 		valueType := opts.GetValueType()
 		if valueType == options.QueryValidate_DEFAULT {
 			if field.IsRepeated() {
+				data = append(data, fieldValidate{fieldName, options.FilteringOption{ValueType: options.QueryValidate_DEFAULT, Deny: []options.QueryValidate_FilterOperator{options.QueryValidate_ALL}}})
 				continue
 			}
+
 			valueType = p.getValueType(field)
 			if valueType == options.QueryValidate_DEFAULT {
 				if field.GetType() == descriptor.FieldDescriptorProto_TYPE_MESSAGE && opts.GetEnableNestedFields() {
@@ -238,7 +240,9 @@ func (p *QueryValidatePlugin) getFilteringData(msg *generator.Descriptor) []fiel
 					for _, v := range nestedDeny {
 						data = append(data, fieldValidate{fieldName + "." + v.fieldName, v.option})
 					}
+					continue
 				}
+				data = append(data, fieldValidate{fieldName, options.FilteringOption{ValueType: options.QueryValidate_DEFAULT, Deny: []options.QueryValidate_FilterOperator{options.QueryValidate_ALL}}})
 				continue
 			}