| Lorenz Brun | dcfc678 | 2021-11-30 05:27:48 +0100 | [diff] [blame] | 1 | From 3ec1e2168d64d880231c7bc3b022ac6e6ef342ad Mon Sep 17 00:00:00 2001 |
| 2 | From: Lorenz Brun <lorenz@monogon.tech> |
| 3 | Date: Tue, 30 Nov 2021 03:40:11 +0100 |
| 4 | Subject: [PATCH] Remove gogo compatibility hack |
| 5 | |
| 6 | We build the whole thing with Bazel so the protobuf generated code uses |
| 7 | the correct runtime support library by definition. |
| 8 | --- |
| 9 | extensions/validator_field/validator_field.go | 17 ----------------- |
| 10 | 1 file changed, 17 deletions(-) |
| 11 | |
| 12 | diff --git a/extensions/validator_field/validator_field.go b/extensions/validator_field/validator_field.go |
| 13 | index 224e414..0e2d8fb 100644 |
| 14 | --- a/extensions/validator_field/validator_field.go |
| 15 | +++ b/extensions/validator_field/validator_field.go |
| 16 | @@ -5,27 +5,10 @@ import ( |
| 17 | "reflect" |
| 18 | "strings" |
| 19 | |
| 20 | - "github.com/golang/protobuf/proto" |
| 21 | - "github.com/golang/protobuf/protoc-gen-go/descriptor" |
| 22 | validator "github.com/mwitkow/go-proto-validators" |
| 23 | "github.com/pseudomuto/protoc-gen-doc/extensions" |
| 24 | ) |
| 25 | |
| 26 | -func init() { |
| 27 | - // NOTE: mwitkow/go-proto-validators uses gogo/profobuf/proto and therefore |
| 28 | - // only registers the extension under gogo. We need to register it under |
| 29 | - // golang/protobuf/proto with the same properties, except using the |
| 30 | - // golang/protobuf FieldOptions descriptor. |
| 31 | - proto.RegisterExtension(&proto.ExtensionDesc{ |
| 32 | - ExtendedType: (*descriptor.FieldOptions)(nil), |
| 33 | - ExtensionType: validator.E_Field.ExtensionType, |
| 34 | - Field: validator.E_Field.Field, |
| 35 | - Name: validator.E_Field.Name, |
| 36 | - Tag: validator.E_Field.Tag, |
| 37 | - Filename: validator.E_Field.Filename, |
| 38 | - }) |
| 39 | -} |
| 40 | - |
| 41 | // ValidatorRule represents a single validator rule from the (validator.field) method option extension. |
| 42 | type ValidatorRule struct { |
| 43 | Name string `json:"name"` |
| 44 | -- |
| 45 | 2.25.1 |
| 46 | |