From 09e1346b52bc4d427d6a9ee72c8ae575b0ed829f Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Mon, 22 Mar 2021 10:41:20 +0300 Subject: [PATCH] regen with never protoc-gen-go Signed-off-by: Vasiliy Tolstov --- api/annotations.pb.go | 26 +++++++++++----------- api/field_behavior.pb.go | 14 ++++++------ api/http.pb.go | 4 ++-- api/httpbody.pb.go | 14 ++++++------ api/micro.pb.go | 4 ++-- openapiv2/annotations.pb.go | 44 ++++++++++++++++++------------------- openapiv2/gopenapiv2.pb.go | 14 ++++++------ openapiv3/gopenapiv3.pb.go | 14 ++++++------ 8 files changed, 67 insertions(+), 67 deletions(-) diff --git a/api/annotations.pb.go b/api/annotations.pb.go index ecfed34..d1ea072 100644 --- a/api/annotations.pb.go +++ b/api/annotations.pb.go @@ -14,16 +14,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: api/annotations.proto package api import ( - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" ) @@ -36,7 +36,7 @@ const ( var file_api_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.MethodOptions)(nil), + ExtendedType: (*descriptorpb.MethodOptions)(nil), ExtensionType: (*HttpRule)(nil), Field: 72295728, Name: "micro.api.http", @@ -44,7 +44,7 @@ var file_api_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "api/annotations.proto", }, { - ExtendedType: (*descriptor.MethodOptions)(nil), + ExtendedType: (*descriptorpb.MethodOptions)(nil), ExtensionType: (*MicroMethod)(nil), Field: 65535655, Name: "micro.api.micro_method", @@ -52,7 +52,7 @@ var file_api_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "api/annotations.proto", }, { - ExtendedType: (*descriptor.ServiceOptions)(nil), + ExtendedType: (*descriptorpb.ServiceOptions)(nil), ExtensionType: (*MicroService)(nil), Field: 65535655, Name: "micro.api.micro_service", @@ -61,7 +61,7 @@ var file_api_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.MethodOptions. +// Extension fields to descriptorpb.MethodOptions. var ( // See `HttpRule`. // @@ -73,7 +73,7 @@ var ( E_MicroMethod = &file_api_annotations_proto_extTypes[1] ) -// Extension fields to descriptor.ServiceOptions. +// Extension fields to descriptorpb.ServiceOptions. var ( // See `MicroService` // @@ -116,11 +116,11 @@ var file_api_annotations_proto_rawDesc = []byte{ } var file_api_annotations_proto_goTypes = []interface{}{ - (*descriptor.MethodOptions)(nil), // 0: google.protobuf.MethodOptions - (*descriptor.ServiceOptions)(nil), // 1: google.protobuf.ServiceOptions - (*HttpRule)(nil), // 2: micro.api.HttpRule - (*MicroMethod)(nil), // 3: micro.api.MicroMethod - (*MicroService)(nil), // 4: micro.api.MicroService + (*descriptorpb.MethodOptions)(nil), // 0: google.protobuf.MethodOptions + (*descriptorpb.ServiceOptions)(nil), // 1: google.protobuf.ServiceOptions + (*HttpRule)(nil), // 2: micro.api.HttpRule + (*MicroMethod)(nil), // 3: micro.api.MicroMethod + (*MicroService)(nil), // 4: micro.api.MicroService } var file_api_annotations_proto_depIdxs = []int32{ 0, // 0: micro.api.http:extendee -> google.protobuf.MethodOptions diff --git a/api/field_behavior.pb.go b/api/field_behavior.pb.go index 466c37c..9ed1544 100644 --- a/api/field_behavior.pb.go +++ b/api/field_behavior.pb.go @@ -14,16 +14,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: api/field_behavior.proto package api import ( - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" sync "sync" ) @@ -125,7 +125,7 @@ func (FieldBehavior) EnumDescriptor() ([]byte, []int) { var file_api_field_behavior_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: ([]FieldBehavior)(nil), Field: 1052, Name: "micro.api.field_behavior", @@ -134,7 +134,7 @@ var file_api_field_behavior_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // A designation of a specific field behavior (required, output only, etc.) // in protobuf messages. @@ -198,8 +198,8 @@ func file_api_field_behavior_proto_rawDescGZIP() []byte { var file_api_field_behavior_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_api_field_behavior_proto_goTypes = []interface{}{ - (FieldBehavior)(0), // 0: micro.api.FieldBehavior - (*descriptor.FieldOptions)(nil), // 1: google.protobuf.FieldOptions + (FieldBehavior)(0), // 0: micro.api.FieldBehavior + (*descriptorpb.FieldOptions)(nil), // 1: google.protobuf.FieldOptions } var file_api_field_behavior_proto_depIdxs = []int32{ 1, // 0: micro.api.field_behavior:extendee -> google.protobuf.FieldOptions diff --git a/api/http.pb.go b/api/http.pb.go index ff86b6b..f8a573f 100644 --- a/api/http.pb.go +++ b/api/http.pb.go @@ -14,8 +14,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: api/http.proto package api diff --git a/api/httpbody.pb.go b/api/httpbody.pb.go index 61221fe..0b2b306 100644 --- a/api/httpbody.pb.go +++ b/api/httpbody.pb.go @@ -14,16 +14,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: api/httpbody.proto package api import ( - any "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -85,7 +85,7 @@ type HttpBody struct { Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` // Application specific response metadata. Must be set in the first response // for streaming APIs. - Extensions []*any.Any `protobuf:"bytes,3,rep,name=extensions,proto3" json:"extensions,omitempty"` + Extensions []*anypb.Any `protobuf:"bytes,3,rep,name=extensions,proto3" json:"extensions,omitempty"` } func (x *HttpBody) Reset() { @@ -134,7 +134,7 @@ func (x *HttpBody) GetData() []byte { return nil } -func (x *HttpBody) GetExtensions() []*any.Any { +func (x *HttpBody) GetExtensions() []*anypb.Any { if x != nil { return x.Extensions } @@ -177,8 +177,8 @@ func file_api_httpbody_proto_rawDescGZIP() []byte { var file_api_httpbody_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_api_httpbody_proto_goTypes = []interface{}{ - (*HttpBody)(nil), // 0: micro.api.HttpBody - (*any.Any)(nil), // 1: google.protobuf.Any + (*HttpBody)(nil), // 0: micro.api.HttpBody + (*anypb.Any)(nil), // 1: google.protobuf.Any } var file_api_httpbody_proto_depIdxs = []int32{ 1, // 0: micro.api.HttpBody.extensions:type_name -> google.protobuf.Any diff --git a/api/micro.pb.go b/api/micro.pb.go index 6ad5891..ff5cf19 100644 --- a/api/micro.pb.go +++ b/api/micro.pb.go @@ -14,8 +14,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: api/micro.proto package api diff --git a/openapiv2/annotations.pb.go b/openapiv2/annotations.pb.go index 9905724..d056461 100644 --- a/openapiv2/annotations.pb.go +++ b/openapiv2/annotations.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: openapiv2/annotations.proto package openapiv2 import ( - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" ) @@ -22,7 +22,7 @@ const ( var file_openapiv2_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FileOptions)(nil), + ExtendedType: (*descriptorpb.FileOptions)(nil), ExtensionType: (*Document)(nil), Field: 1042, Name: "micro.openapiv2.openapiv2_swagger", @@ -30,7 +30,7 @@ var file_openapiv2_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "openapiv2/annotations.proto", }, { - ExtendedType: (*descriptor.MethodOptions)(nil), + ExtendedType: (*descriptorpb.MethodOptions)(nil), ExtensionType: (*Operation)(nil), Field: 1042, Name: "micro.openapiv2.openapiv2_operation", @@ -38,7 +38,7 @@ var file_openapiv2_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "openapiv2/annotations.proto", }, { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*Schema)(nil), Field: 1042, Name: "micro.openapiv2.openapiv2_schema", @@ -46,7 +46,7 @@ var file_openapiv2_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "openapiv2/annotations.proto", }, { - ExtendedType: (*descriptor.ServiceOptions)(nil), + ExtendedType: (*descriptorpb.ServiceOptions)(nil), ExtensionType: (*Tag)(nil), Field: 1042, Name: "micro.openapiv2.openapiv2_tag", @@ -54,7 +54,7 @@ var file_openapiv2_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "openapiv2/annotations.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*Schema)(nil), Field: 1042, Name: "micro.openapiv2.openapiv2_field", @@ -63,7 +63,7 @@ var file_openapiv2_annotations_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.FileOptions. +// Extension fields to descriptorpb.FileOptions. var ( // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project. // @@ -74,7 +74,7 @@ var ( E_Openapiv2Swagger = &file_openapiv2_annotations_proto_extTypes[0] ) -// Extension fields to descriptor.MethodOptions. +// Extension fields to descriptorpb.MethodOptions. var ( // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project. // @@ -85,7 +85,7 @@ var ( E_Openapiv2Operation = &file_openapiv2_annotations_proto_extTypes[1] ) -// Extension fields to descriptor.MessageOptions. +// Extension fields to descriptorpb.MessageOptions. var ( // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project. // @@ -96,7 +96,7 @@ var ( E_Openapiv2Schema = &file_openapiv2_annotations_proto_extTypes[2] ) -// Extension fields to descriptor.ServiceOptions. +// Extension fields to descriptorpb.ServiceOptions. var ( // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project. // @@ -107,7 +107,7 @@ var ( E_Openapiv2Tag = &file_openapiv2_annotations_proto_extTypes[3] ) -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project. // @@ -167,15 +167,15 @@ var file_openapiv2_annotations_proto_rawDesc = []byte{ } var file_openapiv2_annotations_proto_goTypes = []interface{}{ - (*descriptor.FileOptions)(nil), // 0: google.protobuf.FileOptions - (*descriptor.MethodOptions)(nil), // 1: google.protobuf.MethodOptions - (*descriptor.MessageOptions)(nil), // 2: google.protobuf.MessageOptions - (*descriptor.ServiceOptions)(nil), // 3: google.protobuf.ServiceOptions - (*descriptor.FieldOptions)(nil), // 4: google.protobuf.FieldOptions - (*Document)(nil), // 5: micro.openapiv2.Document - (*Operation)(nil), // 6: micro.openapiv2.Operation - (*Schema)(nil), // 7: micro.openapiv2.Schema - (*Tag)(nil), // 8: micro.openapiv2.Tag + (*descriptorpb.FileOptions)(nil), // 0: google.protobuf.FileOptions + (*descriptorpb.MethodOptions)(nil), // 1: google.protobuf.MethodOptions + (*descriptorpb.MessageOptions)(nil), // 2: google.protobuf.MessageOptions + (*descriptorpb.ServiceOptions)(nil), // 3: google.protobuf.ServiceOptions + (*descriptorpb.FieldOptions)(nil), // 4: google.protobuf.FieldOptions + (*Document)(nil), // 5: micro.openapiv2.Document + (*Operation)(nil), // 6: micro.openapiv2.Operation + (*Schema)(nil), // 7: micro.openapiv2.Schema + (*Tag)(nil), // 8: micro.openapiv2.Tag } var file_openapiv2_annotations_proto_depIdxs = []int32{ 0, // 0: micro.openapiv2.openapiv2_swagger:extendee -> google.protobuf.FileOptions diff --git a/openapiv2/gopenapiv2.pb.go b/openapiv2/gopenapiv2.pb.go index a5c2eea..f473cba 100644 --- a/openapiv2/gopenapiv2.pb.go +++ b/openapiv2/gopenapiv2.pb.go @@ -16,16 +16,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: openapiv2/gopenapiv2.proto package openapiv2 import ( - any "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -122,8 +122,8 @@ type Any struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Value *any.Any `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - Yaml string `protobuf:"bytes,2,opt,name=yaml,proto3" json:"yaml,omitempty"` + Value *anypb.Any `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + Yaml string `protobuf:"bytes,2,opt,name=yaml,proto3" json:"yaml,omitempty"` } func (x *Any) Reset() { @@ -158,7 +158,7 @@ func (*Any) Descriptor() ([]byte, []int) { return file_openapiv2_gopenapiv2_proto_rawDescGZIP(), []int{1} } -func (x *Any) GetValue() *any.Any { +func (x *Any) GetValue() *anypb.Any { if x != nil { return x.Value } @@ -6461,7 +6461,7 @@ var file_openapiv2_gopenapiv2_proto_goTypes = []interface{}{ (*TypeItem)(nil), // 57: micro.openapiv2.TypeItem (*VendorExtension)(nil), // 58: micro.openapiv2.VendorExtension (*Xml)(nil), // 59: micro.openapiv2.Xml - (*any.Any)(nil), // 60: google.protobuf.Any + (*anypb.Any)(nil), // 60: google.protobuf.Any } var file_openapiv2_gopenapiv2_proto_depIdxs = []int32{ 50, // 0: micro.openapiv2.AdditionalPropertiesItem.schema:type_name -> micro.openapiv2.Schema diff --git a/openapiv3/gopenapiv3.pb.go b/openapiv3/gopenapiv3.pb.go index 160ce51..c37a34a 100644 --- a/openapiv3/gopenapiv3.pb.go +++ b/openapiv3/gopenapiv3.pb.go @@ -16,16 +16,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0-devel -// protoc v3.6.1 +// protoc-gen-go v1.26.0 +// protoc v3.15.6 // source: openapiv3/gopenapiv3.proto package openapiv3 import ( - any "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -122,8 +122,8 @@ type Any struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Value *any.Any `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - Yaml string `protobuf:"bytes,2,opt,name=yaml,proto3" json:"yaml,omitempty"` + Value *anypb.Any `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + Yaml string `protobuf:"bytes,2,opt,name=yaml,proto3" json:"yaml,omitempty"` } func (x *Any) Reset() { @@ -158,7 +158,7 @@ func (*Any) Descriptor() ([]byte, []int) { return file_openapiv3_gopenapiv3_proto_rawDescGZIP(), []int{1} } -func (x *Any) GetValue() *any.Any { +func (x *Any) GetValue() *anypb.Any { if x != nil { return x.Value } @@ -6894,7 +6894,7 @@ var file_openapiv3_gopenapiv3_proto_goTypes = []interface{}{ (*Strings)(nil), // 75: micro.openapiv3.Strings (*Tag)(nil), // 76: micro.openapiv3.Tag (*Xml)(nil), // 77: micro.openapiv3.Xml - (*any.Any)(nil), // 78: google.protobuf.Any + (*anypb.Any)(nil), // 78: google.protobuf.Any } var file_openapiv3_gopenapiv3_proto_depIdxs = []int32{ 64, // 0: micro.openapiv3.AdditionalPropertiesItem.schema_or_reference:type_name -> micro.openapiv3.SchemaOrReference