diff --git a/example/example.pb.go b/example/example.pb.go index e4326ae..88c43c3 100644 --- a/example/example.pb.go +++ b/example/example.pb.go @@ -180,33 +180,127 @@ func (m *SecondMessage) GetReplaceDefault() string { return "" } +type ThirdExample struct { + InnerExample *ThirdExample_InnerExample `protobuf:"bytes,1,opt,name=inner_example,json=innerExample,proto3" json:"inner"` + XXX_NoUnkeyedLiteral struct{} `json:"-" graphql:"-" bson:"-"` + XXX_unrecognized []byte `json:"-" graphql:"-" bson:"-"` + XXX_sizecache int32 `json:"-" graphql:"-" bson:"-"` +} + +func (m *ThirdExample) Reset() { *m = ThirdExample{} } +func (m *ThirdExample) String() string { return proto.CompactTextString(m) } +func (*ThirdExample) ProtoMessage() {} +func (*ThirdExample) Descriptor() ([]byte, []int) { + return fileDescriptor_1c78cffa5d645ba4, []int{2} +} + +func (m *ThirdExample) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ThirdExample.Unmarshal(m, b) +} +func (m *ThirdExample) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ThirdExample.Marshal(b, m, deterministic) +} +func (m *ThirdExample) XXX_Merge(src proto.Message) { + xxx_messageInfo_ThirdExample.Merge(m, src) +} +func (m *ThirdExample) XXX_Size() int { + return xxx_messageInfo_ThirdExample.Size(m) +} +func (m *ThirdExample) XXX_DiscardUnknown() { + xxx_messageInfo_ThirdExample.DiscardUnknown(m) +} + +var xxx_messageInfo_ThirdExample proto.InternalMessageInfo + +func (m *ThirdExample) GetInnerExample() *ThirdExample_InnerExample { + if m != nil { + return m.InnerExample + } + return nil +} + +type ThirdExample_InnerExample struct { + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"yes"` + Yes int32 `protobuf:"varint,2,opt,name=yes,proto3" json:"id"` + XXX_NoUnkeyedLiteral struct{} `json:"-" graphql:"-" bson:"-"` + XXX_unrecognized []byte `json:"-" graphql:"-" bson:"-"` + XXX_sizecache int32 `json:"-" graphql:"-" bson:"-"` +} + +func (m *ThirdExample_InnerExample) Reset() { *m = ThirdExample_InnerExample{} } +func (m *ThirdExample_InnerExample) String() string { return proto.CompactTextString(m) } +func (*ThirdExample_InnerExample) ProtoMessage() {} +func (*ThirdExample_InnerExample) Descriptor() ([]byte, []int) { + return fileDescriptor_1c78cffa5d645ba4, []int{2, 0} +} + +func (m *ThirdExample_InnerExample) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ThirdExample_InnerExample.Unmarshal(m, b) +} +func (m *ThirdExample_InnerExample) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ThirdExample_InnerExample.Marshal(b, m, deterministic) +} +func (m *ThirdExample_InnerExample) XXX_Merge(src proto.Message) { + xxx_messageInfo_ThirdExample_InnerExample.Merge(m, src) +} +func (m *ThirdExample_InnerExample) XXX_Size() int { + return xxx_messageInfo_ThirdExample_InnerExample.Size(m) +} +func (m *ThirdExample_InnerExample) XXX_DiscardUnknown() { + xxx_messageInfo_ThirdExample_InnerExample.DiscardUnknown(m) +} + +var xxx_messageInfo_ThirdExample_InnerExample proto.InternalMessageInfo + +func (m *ThirdExample_InnerExample) GetId() string { + if m != nil { + return m.Id + } + return "" +} + +func (m *ThirdExample_InnerExample) GetYes() int32 { + if m != nil { + return m.Yes + } + return 0 +} + func init() { proto.RegisterType((*Example)(nil), "example.Example") proto.RegisterType((*SecondMessage)(nil), "example.SecondMessage") + proto.RegisterType((*ThirdExample)(nil), "example.ThirdExample") + proto.RegisterType((*ThirdExample_InnerExample)(nil), "example.ThirdExample.InnerExample") } func init() { proto.RegisterFile("example/example.proto", fileDescriptor_1c78cffa5d645ba4) } var fileDescriptor_1c78cffa5d645ba4 = []byte{ - // 319 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x92, 0xc1, 0x4a, 0x33, 0x31, - 0x10, 0xc7, 0xbf, 0x6d, 0xbf, 0xb6, 0x9a, 0x52, 0xab, 0x11, 0x65, 0x51, 0x94, 0x12, 0x11, 0x7a, - 0xa8, 0xf6, 0xa0, 0x17, 0x7b, 0xb3, 0x54, 0x94, 0x42, 0x45, 0x56, 0xef, 0x4b, 0xb6, 0x9d, 0xa6, - 0xdb, 0x66, 0x37, 0x71, 0x93, 0xba, 0xf5, 0xae, 0x2f, 0xe1, 0xc1, 0xa7, 0xf4, 0x01, 0x24, 0x9b, - 0x20, 0x9e, 0xc4, 0xbb, 0xa7, 0x21, 0x93, 0xdf, 0xff, 0x37, 0x30, 0x0c, 0xda, 0x81, 0x15, 0x4d, - 0x24, 0x87, 0xae, 0xab, 0xa7, 0x32, 0x13, 0x5a, 0xe0, 0x9a, 0x7b, 0xee, 0x6d, 0x6b, 0xca, 0x18, - 0x64, 0x5d, 0x5b, 0xec, 0x2f, 0xf9, 0x28, 0xa1, 0xda, 0x95, 0x05, 0xf0, 0x35, 0x6a, 0xe4, 0xb1, - 0x9e, 0x85, 0x29, 0xe4, 0xa1, 0xa6, 0x4c, 0xf9, 0x5e, 0xcb, 0x6b, 0xaf, 0xf7, 0x8f, 0xde, 0x5e, - 0xde, 0xcb, 0x87, 0x2c, 0xa3, 0x72, 0xf6, 0xc8, 0x7b, 0xc4, 0x20, 0xb7, 0x90, 0x3f, 0x50, 0xa6, - 0x3a, 0x42, 0xea, 0x58, 0xa4, 0x94, 0x93, 0xa0, 0xfe, 0xad, 0x8d, 0x01, 0x6d, 0x7d, 0x89, 0x92, - 0x25, 0xd7, 0xb1, 0xe4, 0xe0, 0x97, 0x0a, 0xd9, 0x85, 0x91, 0x9d, 0xff, 0x2c, 0x6b, 0xad, 0x12, - 0xde, 0x23, 0x45, 0xb0, 0x23, 0x92, 0x58, 0x43, 0x22, 0xf5, 0x33, 0x09, 0x9a, 0x0e, 0x1e, 0x39, - 0x23, 0x1e, 0xa0, 0x66, 0x06, 0x92, 0xd3, 0x31, 0x84, 0x13, 0x98, 0xd2, 0x25, 0xd7, 0x7e, 0xb9, - 0x18, 0xb2, 0x6f, 0x86, 0xec, 0xce, 0x95, 0x48, 0x7b, 0xc4, 0x11, 0x77, 0x19, 0x3c, 0xc5, 0x62, - 0xa9, 0x48, 0xb0, 0xe1, 0x3a, 0x03, 0x1b, 0xc1, 0x07, 0xc8, 0xa3, 0x7e, 0xa5, 0xc8, 0x35, 0x4c, - 0x6e, 0xcd, 0xe6, 0x2e, 0xc9, 0xcd, 0xbf, 0xc0, 0xa3, 0xf8, 0x18, 0xfd, 0x8f, 0xc2, 0xf9, 0xc2, - 0xaf, 0xb6, 0xbc, 0x76, 0xa5, 0xbf, 0x69, 0x88, 0xba, 0x25, 0xa2, 0x70, 0xb8, 0x30, 0x50, 0x39, - 0x1a, 0x2e, 0xfa, 0x27, 0xa8, 0x2a, 0x52, 0x08, 0xc5, 0x14, 0xff, 0x66, 0x5d, 0xe4, 0xb5, 0x84, - 0x1a, 0xf7, 0x30, 0x16, 0xe9, 0x64, 0x04, 0x4a, 0x51, 0xf6, 0x47, 0x97, 0x1f, 0x55, 0x8b, 0x2b, - 0x3c, 0xfb, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x18, 0x14, 0x82, 0x3f, 0xbc, 0x02, 0x00, 0x00, + // 414 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x93, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0x49, 0x42, 0x3b, 0xe6, 0x26, 0x2b, 0x33, 0x02, 0x45, 0x43, 0x40, 0x64, 0x84, 0xb4, + 0xc3, 0xe8, 0x24, 0xe0, 0x42, 0x6f, 0x44, 0x43, 0xc0, 0xa4, 0x21, 0x08, 0x3b, 0x71, 0x89, 0x9c, + 0xe5, 0x6d, 0xea, 0xd6, 0x89, 0x43, 0xec, 0xd2, 0xf6, 0x0e, 0x5f, 0x82, 0x03, 0xdf, 0x84, 0x6f, + 0xc5, 0x07, 0x40, 0xfe, 0x53, 0x94, 0x13, 0xe2, 0xbe, 0x93, 0x65, 0xbf, 0xbf, 0xe7, 0x79, 0xa4, + 0x47, 0xaf, 0xd1, 0x5d, 0xd8, 0xd0, 0xba, 0xe5, 0x70, 0xea, 0xce, 0x49, 0xdb, 0x09, 0x25, 0xf0, + 0x9e, 0xbb, 0x1e, 0xdd, 0x51, 0xb4, 0xaa, 0xa0, 0x3b, 0xb5, 0x87, 0x9d, 0x92, 0xdf, 0x3e, 0xda, + 0x7b, 0x6d, 0x01, 0xfc, 0x06, 0x45, 0x6b, 0xa6, 0xe6, 0x79, 0x03, 0xeb, 0x5c, 0xd1, 0x4a, 0xc6, + 0x5e, 0xe2, 0x1d, 0xef, 0xa7, 0x8f, 0x7f, 0x7c, 0xfb, 0x19, 0x3c, 0xac, 0x3a, 0xda, 0xce, 0xbf, + 0xf0, 0x29, 0xd1, 0xc8, 0x7b, 0x58, 0x5f, 0xd2, 0x4a, 0x9e, 0x88, 0x56, 0x31, 0xd1, 0x50, 0x4e, + 0xb2, 0x51, 0xef, 0x19, 0x03, 0x3a, 0xfc, 0x6b, 0x54, 0xaf, 0xb8, 0x62, 0x2d, 0x87, 0xd8, 0x37, + 0x66, 0x2f, 0xb5, 0xd9, 0x8b, 0x7f, 0x9b, 0x25, 0x9b, 0x9a, 0x4f, 0x89, 0x11, 0x9e, 0x88, 0x9a, + 0x29, 0xa8, 0x5b, 0xb5, 0x25, 0xd9, 0xd8, 0xc1, 0x17, 0xce, 0x11, 0x9f, 0xa1, 0x71, 0x07, 0x2d, + 0xa7, 0x57, 0x90, 0x97, 0x30, 0xa3, 0x2b, 0xae, 0xe2, 0xc0, 0x84, 0xdc, 0xd7, 0x21, 0xf7, 0x16, + 0x52, 0x34, 0x53, 0xe2, 0x88, 0x0f, 0x1d, 0x7c, 0x65, 0x62, 0x25, 0x49, 0x76, 0xe0, 0x5e, 0xce, + 0xac, 0x04, 0x3f, 0x40, 0x1e, 0x8d, 0x07, 0x46, 0x17, 0x69, 0xdd, 0x2d, 0xab, 0x7b, 0x45, 0xde, + 0xde, 0xc8, 0x3c, 0x8a, 0x9f, 0xa0, 0x9b, 0x45, 0xbe, 0x58, 0xc6, 0xc3, 0xc4, 0x3b, 0x1e, 0xa4, + 0xb7, 0x35, 0x31, 0xb2, 0x44, 0x91, 0x9f, 0x2f, 0x35, 0x14, 0x14, 0xe7, 0xcb, 0xf4, 0x29, 0x1a, + 0x8a, 0x06, 0x72, 0x31, 0xc3, 0xff, 0x53, 0x17, 0xf9, 0xee, 0xa3, 0xe8, 0x13, 0x5c, 0x89, 0xa6, + 0xbc, 0x00, 0x29, 0x69, 0x75, 0x4d, 0xcb, 0x27, 0xbf, 0x3c, 0x14, 0x5e, 0xce, 0x59, 0x57, 0xee, + 0x76, 0xf0, 0x33, 0x8a, 0x58, 0xd3, 0x40, 0x97, 0xbb, 0xad, 0x35, 0x35, 0x8c, 0x9e, 0x91, 0xc9, + 0x6e, 0xa9, 0xfb, 0xf4, 0xe4, 0x9d, 0x46, 0xdd, 0x25, 0x3d, 0xd4, 0xc1, 0xa1, 0x0d, 0x36, 0x1e, + 0x24, 0x0b, 0x59, 0x0f, 0x38, 0xfa, 0x88, 0xc2, 0xbe, 0x00, 0x3f, 0x42, 0x3e, 0x2b, 0x5d, 0xcf, + 0x63, 0x2d, 0x46, 0x56, 0xbc, 0x05, 0x49, 0x32, 0x9f, 0x95, 0x38, 0x41, 0xc1, 0x16, 0xa4, 0x29, + 0x6f, 0x90, 0x1e, 0x68, 0x62, 0xdf, 0xd9, 0x97, 0x24, 0xd3, 0xa3, 0x62, 0x68, 0x7e, 0xd1, 0xf3, + 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x0f, 0x99, 0xd2, 0x7c, 0x03, 0x00, 0x00, } diff --git a/example/example.proto b/example/example.proto index e716a57..f685f68 100644 --- a/example/example.proto +++ b/example/example.proto @@ -22,4 +22,13 @@ message SecondMessage { string with_new_multiple = 2 [(tagger.tags) = "graphql:\"withNewTags,optional\" xml:\"multi,omitempty\"" ]; string replace_default = 3 [(tagger.tags) = "json:\"replacePrevious\""] ; +} + +message ThirdExample { + message InnerExample { + string id = 1 [(tagger.tags) = "json:\"yes\""]; + int32 yes = 2 [(tagger.tags) = "json:\"id\""]; + } + + InnerExample inner_example = 1 [(tagger.tags) = "json:\"inner\""]; } \ No newline at end of file diff --git a/go.mod b/go.mod index 9d7e6c5..e68c0d4 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,16 @@ module github.com/srikrsna/protoc-gen-gotag +go 1.11 + require ( github.com/fatih/structtag v1.0.0 - github.com/golang/protobuf v1.3.1 - github.com/lyft/protoc-gen-star v0.4.9 + github.com/golang/protobuf v1.3.2 + github.com/lyft/protoc-gen-star v0.4.11 github.com/spf13/afero v1.2.2 // indirect github.com/stretchr/objx v0.2.0 // indirect golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480 // indirect golang.org/x/net v0.0.0-20190419010253-1f3472d942ba // indirect golang.org/x/sync v0.0.0-20190412183630-56d357773e84 // indirect golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be // indirect + golang.org/x/text v0.3.2 // indirect ) diff --git a/go.sum b/go.sum index 4f572f2..d8e5e53 100644 --- a/go.sum +++ b/go.sum @@ -7,10 +7,14 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/lyft/protoc-gen-star v0.3.7 h1:W4dlsAyWiwWTKVRP6ujIR+dzIFcCaZmYH6rI4RYqXDE= github.com/lyft/protoc-gen-star v0.3.7/go.mod h1:mE8fbna26u7aEA2QCVvvfBU/ZrPgocG1206xAFPcs94= github.com/lyft/protoc-gen-star v0.4.9 h1:dm1l/IvkdW3IzdwrqPu2ywcBdqZ7hp+ppzN/AJZg0Z0= github.com/lyft/protoc-gen-star v0.4.9/go.mod h1:mE8fbna26u7aEA2QCVvvfBU/ZrPgocG1206xAFPcs94= +github.com/lyft/protoc-gen-star v0.4.11 h1:zW6fJQBtCtVeSiO/Kbpzv32GO0J/Z8egSLeohES202w= +github.com/lyft/protoc-gen-star v0.4.11/go.mod h1:mE8fbna26u7aEA2QCVvvfBU/ZrPgocG1206xAFPcs94= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/spf13/afero v1.1.1 h1:Lt3ihYMlE+lreX1GS4Qw4ZsNpYQLxIXKBTEOXm3nt6I= @@ -35,3 +39,6 @@ golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/main.go b/main.go index 6f464bd..f1d46fc 100644 --- a/main.go +++ b/main.go @@ -8,5 +8,5 @@ import ( ) func main() { - pgs.Init().RegisterModule(module.New()).RegisterPostProcessor(pgsgo.GoFmt()).Render() + pgs.Init(pgs.DebugMode()).RegisterModule(module.New()).RegisterPostProcessor(pgsgo.GoFmt()).Render() } diff --git a/module/extract.go b/module/extract.go index 48fb68d..a157354 100644 --- a/module/extract.go +++ b/module/extract.go @@ -2,19 +2,21 @@ package module import ( "github.com/fatih/structtag" - "github.com/lyft/protoc-gen-star" + pgs "github.com/lyft/protoc-gen-star" + pgsgo "github.com/lyft/protoc-gen-star/lang/go" "github.com/srikrsna/protoc-gen-gotag/tagger" ) type tagExtractor struct { pgs.Visitor pgs.DebuggerCommon + pgsgo.Context tags map[string]map[string]*structtag.Tags } -func newTagExtractor(d pgs.DebuggerCommon) *tagExtractor { - v := &tagExtractor{DebuggerCommon: d} +func newTagExtractor(d pgs.DebuggerCommon, ctx pgsgo.Context) *tagExtractor { + v := &tagExtractor{DebuggerCommon: d, Context: ctx} v.Visitor = pgs.PassThroughVisitor(v) return v } @@ -35,13 +37,13 @@ func (v *tagExtractor) VisitOneOf(o pgs.OneOf) (pgs.Visitor, error) { return nil, err } - msgName := o.Message().Name().UpperCamelCase().String() + msgName := v.Context.Name(o.Message()).String() if v.tags[msgName] == nil { v.tags[msgName] = map[string]*structtag.Tags{} } - v.tags[msgName][o.Name().UpperCamelCase().String()] = tags + v.tags[msgName][v.Context.Name(o).String()] = tags return v, nil } @@ -60,7 +62,7 @@ func (v *tagExtractor) VisitField(f pgs.Field) (pgs.Visitor, error) { tags, err := structtag.Parse(tval) v.CheckErr(err) - msgName := f.Message().Name().UpperCamelCase().String() + msgName := v.Context.Name(f.Message()).String() if f.InOneOf() { msgName = f.Message().Name().UpperCamelCase().String() + "_" + f.Name().UpperCamelCase().String() @@ -70,7 +72,7 @@ func (v *tagExtractor) VisitField(f pgs.Field) (pgs.Visitor, error) { v.tags[msgName] = map[string]*structtag.Tags{} } - v.tags[msgName][f.Name().UpperCamelCase().String()] = tags + v.tags[msgName][v.Context.Name(f).String()] = tags return v, nil } diff --git a/module/tagger.go b/module/tagger.go index 09f1b05..d4106e3 100644 --- a/module/tagger.go +++ b/module/tagger.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/fatih/structtag" - "github.com/lyft/protoc-gen-star" + pgs "github.com/lyft/protoc-gen-star" pgsgo "github.com/lyft/protoc-gen-star/lang/go" ) @@ -38,7 +38,7 @@ func (m mod) Execute(targets map[string]pgs.File, packages map[string]pgs.Packag xt, err := structtag.Parse(xtv) m.CheckErr(err) - extractor := newTagExtractor(m) + extractor := newTagExtractor(m, m.Context) for _, f := range targets { tags := extractor.Extract(f) diff --git a/tagger/tagger.pb.go b/tagger/tagger.pb.go index 2ebe695..287cf1a 100644 --- a/tagger/tagger.pb.go +++ b/tagger/tagger.pb.go @@ -1,12 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: tagger/tagger.proto -package tagger // import "github.com/srikrsna/protoc-gen-gotag/tagger" +package tagger -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package var E_Tags = &proto.ExtensionDesc{ ExtendedType: (*descriptor.FieldOptions)(nil), @@ -33,7 +35,7 @@ var E_OneofTags = &proto.ExtensionDesc{ ExtensionType: (*string)(nil), Field: 847939, Name: "tagger.oneof_tags", - Tag: "bytes,847939,opt,name=oneof_tags,json=oneofTags", + Tag: "bytes,847939,opt,name=oneof_tags", Filename: "tagger/tagger.proto", } @@ -42,9 +44,9 @@ func init() { proto.RegisterExtension(E_OneofTags) } -func init() { proto.RegisterFile("tagger/tagger.proto", fileDescriptor_tagger_405e48db8be7f212) } +func init() { proto.RegisterFile("tagger/tagger.proto", fileDescriptor_79eafcc1d20e9e03) } -var fileDescriptor_tagger_405e48db8be7f212 = []byte{ +var fileDescriptor_79eafcc1d20e9e03 = []byte{ // 181 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x49, 0x4c, 0x4f, 0x4f, 0x2d, 0xd2, 0x87, 0x50, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x6c, 0x10, 0x9e, 0x94,