Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go from 1.35.2-20240920164238-5a7b106cbb87.1 to 1.35.2-20241127180247-a33202765966.1 #5070

Merged
merged 4 commits into from
Dec 13, 2024
Merged

build(deps): bump buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go from 1.35.2-20240920164238-5a7b106cbb87.1 to 1.35.2-20241127180247-a33202765966.1 #5070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd3d38d
build(deps): bump buf.build/gen/go/bufbuild/protovalidate/protocolbuf…
dependabot[bot] Dec 12, 2024
cf170dd
Fix deprecated field
eleftherias Dec 12, 2024
c38bd17
Merge branch 'main' into dependabot/go_modules/buf.build/gen/go/bufbu…
eleftherias Dec 12, 2024
bee9d87
Run go mod tidy
eleftherias Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ module github.com/mindersec/minder
go 1.23.4

require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20240920164238-5a7b106cbb87.1
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20241127180247-a33202765966.1
github.com/ThreeDotsLabs/watermill v1.4.1
github.com/ThreeDotsLabs/watermill-sql/v3 v3.1.0
github.com/alexdrl/zerowater v0.0.3
github.com/aws/aws-sdk-go-v2 v1.32.6
github.com/aws/aws-sdk-go-v2/config v1.28.6
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.40.0
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df
github.com/bufbuild/protovalidate-go v0.7.3
github.com/bufbuild/protovalidate-go v0.8.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/charmbracelet/bubbles v0.20.0
github.com/charmbracelet/bubbletea v1.2.4
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20240920164238-5a7b106cbb87.1 h1:7QIeAuTdLp173vC/9JojRMDFcpmqtoYrxPmvdHAOynw=
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20240920164238-5a7b106cbb87.1/go.mod h1:mnHCFccv4HwuIAOHNGdiIc5ZYbBCvbTWZcodLN5wITI=
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20241127180247-a33202765966.1 h1:jLd96rDDNJ+zIJxvV/L855VEtrjR0G4aePVDlCpf6kw=
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20241127180247-a33202765966.1/go.mod h1:mnHCFccv4HwuIAOHNGdiIc5ZYbBCvbTWZcodLN5wITI=
cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo=
cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
Expand Down Expand Up @@ -217,8 +217,8 @@ github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0
github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
github.com/bufbuild/protovalidate-go v0.7.3 h1:kKnoSueygR3xxppvuBpm9SEwIsP359MMRfMBGmRByPg=
github.com/bufbuild/protovalidate-go v0.7.3/go.mod h1:CFv34wMqiBzAHdQ4q/tWYi9ILFYKuaC3/4zh6eqdUck=
github.com/bufbuild/protovalidate-go v0.8.0 h1:Xs3kCLCJ4tQiogJ0iOXm+ClKw/KviW3nLAryCGW2I3Y=
github.com/bufbuild/protovalidate-go v0.8.0/go.mod h1:JPWZInGm2y2NBg3vKDKdDIkvDjyLv31J3hLH5GIFc/Q=
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 h1:3uZCA/BLTIu+DqCfguByNMJa2HVHpXvjfy0Dy7g6fuA=
github.com/bytecodealliance/wasmtime-go/v3 v3.0.2/go.mod h1:RnUjnIXxEJcL6BgCvNyzCCRzZcxCgsZCi+RNlvYor5Q=
Expand Down
28 changes: 27 additions & 1 deletion internal/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,33 @@ func NewValidator() (*protovalidate.Validator, error) {
func formatViolations(violations *validate.Violations) string {
var res []string
for _, v := range violations.Violations {
res = append(res, fmt.Sprintf("- Field '%s': %s", *v.FieldPath, *v.Message))
res = append(res, fmt.Sprintf("- Field '%s': %s", getFullPath(v.Field), *v.Message))
}
return strings.Join(res, "\n")
}

func getFullPath(field *validate.FieldPath) string {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a smarter way to do this?

var pathElements []string
for _, element := range field.GetElements() {
if element.GetFieldName() != "" {
pathElements = append(pathElements, element.GetFieldName())
} else if element.GetFieldNumber() != 0 {
pathElements = append(pathElements, fmt.Sprintf("%d", element.GetFieldNumber()))
}
if element.GetSubscript() != nil {
switch subscript := element.GetSubscript().(type) {
case *validate.FieldPathElement_Index:
pathElements[len(pathElements)-1] = fmt.Sprintf("%s[%d]", pathElements[len(pathElements)-1], subscript.Index)
case *validate.FieldPathElement_BoolKey:
pathElements[len(pathElements)-1] = fmt.Sprintf("%s[%t]", pathElements[len(pathElements)-1], subscript.BoolKey)
case *validate.FieldPathElement_IntKey:
pathElements[len(pathElements)-1] = fmt.Sprintf("%s[%d]", pathElements[len(pathElements)-1], subscript.IntKey)
case *validate.FieldPathElement_UintKey:
pathElements[len(pathElements)-1] = fmt.Sprintf("%s[%d]", pathElements[len(pathElements)-1], subscript.UintKey)
case *validate.FieldPathElement_StringKey:
pathElements[len(pathElements)-1] = fmt.Sprintf("%s[%s]", pathElements[len(pathElements)-1], subscript.StringKey)
}
}
}
return strings.Join(pathElements, ".")
}
15 changes: 15 additions & 0 deletions internal/api/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,21 @@ func TestProtoValidationInterceptor(t *testing.T) {
errMsg: "Validation failed:\n- Field 'name': value does not match regex pattern",
errCode: codes.InvalidArgument,
},
{
name: "invalid request with nested field",
req: &v1.ListEvaluationResultsRequest{
Context: &v1.Context{
Project: ptr.Ptr(uuid.New().String()),
},
Entity: []*v1.EntityTypedId{
{
Id: "invalid-id",
},
},
},
errMsg: "Validation failed:\n- Field 'entity[0].id': value must be a valid UUID",
errCode: codes.InvalidArgument,
},
}

validator, err := NewValidator()
Expand Down
Loading