From 6baabf2148b7447eda893423cc299bb9f899f2c4 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 3 Jun 2020 15:24:39 +0200 Subject: [PATCH] Remove Nil validation on ListSettingsValues request That validation was just wrong. It enforced identifier values to be empty. --- go.mod | 3 +++ go.sum | 6 ++++++ pkg/assets/embed.go | 4 ++-- pkg/service/v0/validator.go | 6 ++++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c8cabc47a..7e6996c6a 100644 --- a/go.mod +++ b/go.mod @@ -7,15 +7,18 @@ require ( contrib.go.opencensus.io/exporter/ocagent v0.6.0 contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/UnnoTed/fileb0x v1.1.4 + github.com/cespare/reflex v0.2.0 // indirect github.com/go-chi/chi v4.1.0+incompatible github.com/go-chi/render v1.0.1 github.com/go-ozzo/ozzo-validation/v4 v4.2.1 github.com/golang/protobuf v1.4.0 github.com/grpc-ecosystem/grpc-gateway v1.14.4 github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 // indirect + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/micro/cli/v2 v2.1.2 github.com/micro/go-micro/v2 v2.6.0 github.com/mitchellh/gox v1.0.1 + github.com/ogier/pflag v0.0.1 // indirect github.com/oklog/run v1.0.0 github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c diff --git a/go.sum b/go.sum index 0192b3d7a..3fff6bd82 100644 --- a/go.sum +++ b/go.sum @@ -100,6 +100,8 @@ github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4r github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/reflex v0.2.0 h1:6d9WpWJseKjJvZEevKP7Pk42nPx2+BUTqmhNk8wZPwM= +github.com/cespare/reflex v0.2.0/go.mod h1:ooqOLJ4algvHP/oYvKWfWJ9tFUzCLDk5qkIJduMYrgI= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA= @@ -351,6 +353,8 @@ github.com/justinas/alice v1.2.0 h1:+MHSA/vccVCF4Uq37S42jwlkvI2Xzl7zTPCN5BnZNVo= github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA= github.com/karrick/godirwalk v1.7.8 h1:VfG72pyIxgtC7+3X9CMHI0AOl4LwyRAg98WAgsvffi8= github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -489,6 +493,8 @@ github.com/nrdcg/goinwx v0.6.1/go.mod h1:XPiut7enlbEdntAqalBIqcYcTEVhpv/dKWgDCX2 github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4rRpRiyw= github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d h1:x3S6kxmy49zXVVyhcnrFqxvNVCBPb2KZ9hV2RBdS840= github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= +github.com/ogier/pflag v0.0.1 h1:RW6JSWSu/RkSatfcLtogGfFgpim5p7ARQ10ECk5O750= +github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= diff --git a/pkg/assets/embed.go b/pkg/assets/embed.go index 5f78f6651..76d0b90a4 100644 --- a/pkg/assets/embed.go +++ b/pkg/assets/embed.go @@ -1,5 +1,5 @@ -// Code generated by fileb0x at "2020-05-18 11:04:02.579403 +0200 CEST m=+0.032731659" from config file "embed.yml" DO NOT EDIT. -// modification hash(8cc9a42d333f443b4cd19fc245770308.8058aec596c5fb73022d09bb97af796e) +// Code generated by fileb0x at "2020-06-03 13:34:57.567257 +0200 CEST m=+0.040129778" from config file "embed.yml" DO NOT EDIT. +// modification hash(65d24f2e8af3a68b0d8a76c191429e1f.8058aec596c5fb73022d09bb97af796e) package assets diff --git a/pkg/service/v0/validator.go b/pkg/service/v0/validator.go index 5eb96b6ac..005efaa12 100644 --- a/pkg/service/v0/validator.go +++ b/pkg/service/v0/validator.go @@ -1,6 +1,7 @@ package svc import ( + "fmt" "regexp" validation "github.com/go-ozzo/ozzo-validation/v4" @@ -55,13 +56,14 @@ func validateGetSettingsValue(req *proto.GetSettingsValueRequest) error { } func validateListSettingsValues(req *proto.ListSettingsValuesRequest) error { + fmt.Println(req.Identifier) return validation.ValidateStruct( req.Identifier, validation.Field(&req.Identifier.AccountUuid, is.UUID), validation.Field(&req.Identifier.Extension, validation.Match(regexForKeys)), - validation.Field(&req.Identifier.Extension, validation.When(req.Identifier.BundleKey != "", validation.Required).Else(validation.Nil)), + validation.Field(&req.Identifier.Extension, validation.When(req.Identifier.BundleKey != "", validation.Required)), validation.Field(&req.Identifier.BundleKey, validation.Match(regexForKeys)), - validation.Field(&req.Identifier.BundleKey, validation.When(req.Identifier.SettingKey != "", validation.Required).Else(validation.Nil)), + validation.Field(&req.Identifier.BundleKey, validation.When(req.Identifier.SettingKey != "", validation.Required)), validation.Field(&req.Identifier.SettingKey, validation.Match(regexForKeys)), ) }