Skip to content

Commit

Permalink
chore: move go-ozzo/ozzo-validation to invopop/validation
Browse files Browse the repository at this point in the history 
invpop/validation is a fork of go-ozzo/ozzo-validation with some additional
bug fixes. Specifically we need: invopop/validation#1
  • Loading branch information
@rhafer
rhafer committed Jun 3, 2024
1 parent 448d1da commit 2fd36c3
Show file tree
Hide file tree
Showing 28 changed files with 183 additions and 190 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ require (
github.com/go-micro/plugins/v4/wrapper/breaker/gobreaker v1.2.0
github.com/go-micro/plugins/v4/wrapper/monitoring/prometheus v1.2.0
github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry v1.2.0
github.com/go-ozzo/ozzo-validation/v4 v4.3.0
github.com/go-playground/validator/v10 v10.20.0
github.com/gofrs/uuid v4.4.0+incompatible
github.com/golang-jwt/jwt/v4 v4.5.0
Expand All @@ -52,6 +51,7 @@ require (
github.com/gookit/config/v2 v2.2.5
github.com/gorilla/mux v1.8.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
github.com/invopop/validation v0.3.0
github.com/jellydator/ttlcache/v2 v2.11.1
github.com/jellydator/ttlcache/v3 v3.2.0
github.com/jinzhu/now v1.1.5
Expand Down
6 changes: 3 additions & 3 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
Expand Down Expand Up @@ -1232,8 +1232,6 @@ github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry v1.2.0 h1:e2hgtWMNqJ3
github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry v1.2.0/go.mod h1:BBqL7ckGNb7rFfk3vU2Yj/CILVsz/WF19CkAyveQl8A=
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-ozzo/ozzo-validation/v4 v4.3.0 h1:byhDUpfEwjsVQb1vBunvIjh2BHQ9ead57VkAEY4V+Es=
github.com/go-ozzo/ozzo-validation/v4 v4.3.0/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew=
github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
Expand Down Expand Up @@ -1546,6 +1544,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/infobloxopen/infoblox-go-client v1.1.1/go.mod h1:BXiw7S2b9qJoM8MS40vfgCNB2NLHGusk1DtO16BD9zI=
github.com/invopop/validation v0.3.0 h1:o260kbjXzoBO/ypXDSSrCLL7SxEFUXBsX09YTE9AxZw=
github.com/invopop/validation v0.3.0/go.mod h1:qIBG6APYLp2Wu3/96p3idYjP8ffTKVmQBfKiZbw0Hts=
github.com/jarcoal/httpmock v1.0.6/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
Expand Down
8 changes: 4 additions & 4 deletions services/settings/pkg/service/v0/validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"regexp"

validation "github.com/go-ozzo/ozzo-validation/v4"
"github.com/go-ozzo/ozzo-validation/v4/is"
validation "github.com/invopop/validation"
"github.com/invopop/validation/is"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
Expand Down Expand Up @@ -129,12 +129,12 @@ func validateListRoleAssignmentsFiltered(req *settingssvc.ListRoleAssignmentsFil
}

func validateUserRoleAssignmentFilter(values interface{}) error {
filter, ok := values.(settingsmsg.UserRoleAssignmentFilter)
filter, ok := values.(*settingsmsg.UserRoleAssignmentFilter)
if !ok {
return errors.New("expected UserRoleAssignmentFilter")
}
return validation.ValidateStruct(
&filter,
filter,
validation.Field(&filter.Type,
validation.Required,
validation.In(settingsmsg.UserRoleAssignmentFilter_TYPE_ACCOUNT, settingsmsg.UserRoleAssignmentFilter_TYPE_ROLE),
Expand Down
0 ...com/go-ozzo/ozzo-validation/v4/.gitignore → .../github.com/invopop/validation/.gitignore
View file
File renamed without changes.
0 ...om/go-ozzo/ozzo-validation/v4/.travis.yml → ...github.com/invopop/validation/.travis.yml
View file
File renamed without changes.
0 ...ub.com/go-ozzo/ozzo-validation/v4/LICENSE → vendor/github.com/invopop/validation/LICENSE
View file
File renamed without changes.
292 changes: 143 additions & 149 deletions ....com/go-ozzo/ozzo-validation/v4/README.md → ...r/github.com/invopop/validation/README.md
View file

Large diffs are not rendered by default.

0 ...com/go-ozzo/ozzo-validation/v4/UPGRADE.md → .../github.com/invopop/validation/UPGRADE.md
View file
File renamed without changes.
0 ....com/go-ozzo/ozzo-validation/v4/absent.go → ...r/github.com/invopop/validation/absent.go
View file
File renamed without changes.
0 ...ub.com/go-ozzo/ozzo-validation/v4/date.go → vendor/github.com/invopop/validation/date.go
View file
File renamed without changes.
6 changes: 2 additions & 4 deletions ...ub.com/go-ozzo/ozzo-validation/v4/each.go → vendor/github.com/invopop/validation/each.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...b.com/go-ozzo/ozzo-validation/v4/error.go → ...or/github.com/invopop/validation/error.go
View file
File renamed without changes.
0 ...thub.com/go-ozzo/ozzo-validation/v4/in.go → vendor/github.com/invopop/validation/in.go
View file
File renamed without changes.
10 changes: 6 additions & 4 deletions ...om/go-ozzo/ozzo-validation/v4/is/rules.go → ...github.com/invopop/validation/is/rules.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ....com/go-ozzo/ozzo-validation/v4/length.go → ...r/github.com/invopop/validation/length.go
View file
File renamed without changes.
11 changes: 6 additions & 5 deletions ...hub.com/go-ozzo/ozzo-validation/v4/map.go → vendor/github.com/invopop/validation/map.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...b.com/go-ozzo/ozzo-validation/v4/match.go → ...or/github.com/invopop/validation/match.go
View file
File renamed without changes.
0 ....com/go-ozzo/ozzo-validation/v4/minmax.go → ...r/github.com/invopop/validation/minmax.go
View file
File renamed without changes.
0 .../go-ozzo/ozzo-validation/v4/multipleof.go → ...thub.com/invopop/validation/multipleof.go
View file
File renamed without changes.
0 ....com/go-ozzo/ozzo-validation/v4/not_in.go → ...r/github.com/invopop/validation/not_in.go
View file
File renamed without changes.
0 ...com/go-ozzo/ozzo-validation/v4/not_nil.go → .../github.com/invopop/validation/not_nil.go
View file
File renamed without changes.
0 ...om/go-ozzo/ozzo-validation/v4/required.go → ...github.com/invopop/validation/required.go
View file
File renamed without changes.
0 ....com/go-ozzo/ozzo-validation/v4/string.go → ...r/github.com/invopop/validation/string.go
View file
File renamed without changes.
22 changes: 11 additions & 11 deletions ....com/go-ozzo/ozzo-validation/v4/struct.go → ...r/github.com/invopop/validation/struct.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ub.com/go-ozzo/ozzo-validation/v4/util.go → vendor/github.com/invopop/validation/util.go
View file
File renamed without changes.
0 .../go-ozzo/ozzo-validation/v4/validation.go → ...thub.com/invopop/validation/validation.go
View file
File renamed without changes.
8 changes: 3 additions & 5 deletions ...ub.com/go-ozzo/ozzo-validation/v4/when.go → vendor/github.com/invopop/validation/when.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -981,10 +981,6 @@ github.com/go-micro/plugins/v4/wrapper/monitoring/prometheus
# github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry v1.2.0
## explicit; go 1.17
github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry
# github.com/go-ozzo/ozzo-validation/v4 v4.3.0
## explicit; go 1.13
github.com/go-ozzo/ozzo-validation/v4
github.com/go-ozzo/ozzo-validation/v4/is
# github.com/go-playground/locales v0.14.1
## explicit; go 1.17
github.com/go-playground/locales
Expand Down Expand Up @@ -1224,6 +1220,10 @@ github.com/imdario/mergo
# github.com/inconshreveable/mousetrap v1.1.0
## explicit; go 1.18
github.com/inconshreveable/mousetrap
# github.com/invopop/validation v0.3.0
## explicit; go 1.16
github.com/invopop/validation
github.com/invopop/validation/is
# github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99
## explicit
github.com/jbenet/go-context/io
Expand Down

0 comments on commit 2fd36c3

Please sign in to comment.