From d296983c137c4834d4aacd9b361c1fa0c580fa08 Mon Sep 17 00:00:00 2001 From: renovate_bot <group_8045_bot_c14af90fcc2e9e0c89e91dd630ad2f8d@noreply.code.fbi.h-da.de> Date: Tue, 3 Dec 2024 15:37:36 +0000 Subject: [PATCH] [renovate] Update module buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go to v1.35.2-20241127180247-a33202765966.1 See merge request danet/gosdn!1116 Co-authored-by: Fabian Seidl <fabian.seidl@h-da.de> Co-authored-by: Renovate Bot <renovate@danet.fbi.h-da.de> --- controller/northbound/server/utils_test.go | 16 +++++++++++++++- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/controller/northbound/server/utils_test.go b/controller/northbound/server/utils_test.go index d86de701b..7a4636caa 100644 --- a/controller/northbound/server/utils_test.go +++ b/controller/northbound/server/utils_test.go @@ -9,7 +9,7 @@ import ( func contains(array []*validate.Violation, err *validate.Violation) bool { for _, v := range array { - if *v.FieldPath == *err.FieldPath && *v.ConstraintId == *err.ConstraintId && *v.Message == *err.Message { + if isEqualFieldPaths(v.Field, err.Field) && *v.ConstraintId == *err.ConstraintId && *v.Message == *err.Message { return true } } @@ -17,6 +17,20 @@ func contains(array []*validate.Violation, err *validate.Violation) bool { return false } +func isEqualFieldPaths(violationFieldPath, errFieldPath *validate.FieldPath) bool { + if len(violationFieldPath.GetElements()) != len(errFieldPath.GetElements()) { + return false + } + + for i, elem := range violationFieldPath.GetElements() { + if elem != errFieldPath.GetElements()[i] { + return false + } + } + + return true +} + func assertValidationErrors(t *testing.T, err error, expectedValidationErrors []*validate.Violation) { st := status.Convert(err) errDetails := st.Details() diff --git a/go.mod b/go.mod index dbbfdd3ed..d6e62cc42 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( ) 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/bufbuild/protovalidate-go v0.7.3 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-plugin v1.4.10 diff --git a/go.sum b/go.sum index 343846eb2..9f6fbc9f3 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,8 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.1-2024092016423 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.1-20240920164238-5a7b106cbb87.1/go.mod h1:Duw/9JoXkXIydyASnLYIiufkzySThoqavOsF+IihqvM= 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= -- GitLab