diff --git a/examples/clients/abe/examplepb_a_bit_of_everything.go b/examples/clients/abe/examplepb_a_bit_of_everything.go index cb6fb3a487d..d416004b85e 100644 --- a/examples/clients/abe/examplepb_a_bit_of_everything.go +++ b/examples/clients/abe/examplepb_a_bit_of_everything.go @@ -14,6 +14,7 @@ import ( "time" ) +// Intentionaly complicated message type to cover much features of Protobuf. type ExamplepbABitOfEverything struct { SingleNested ABitOfEverythingNested `json:"single_nested,omitempty"` diff --git a/examples/proto/examplepb/a_bit_of_everything.pb.go b/examples/proto/examplepb/a_bit_of_everything.pb.go index 91b403c1bca..e2fddf7ab62 100644 --- a/examples/proto/examplepb/a_bit_of_everything.pb.go +++ b/examples/proto/examplepb/a_bit_of_everything.pb.go @@ -53,7 +53,7 @@ func (x NumericEnum) String() string { return proto.EnumName(NumericEnum_name, int32(x)) } func (NumericEnum) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_06ded4cf666009ee, []int{0} + return fileDescriptor_a_bit_of_everything_cd9917162b8575c6, []int{0} } // DeepEnum is one or zero. @@ -79,43 +79,43 @@ func (x ABitOfEverything_Nested_DeepEnum) String() string { return proto.EnumName(ABitOfEverything_Nested_DeepEnum_name, int32(x)) } func (ABitOfEverything_Nested_DeepEnum) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_06ded4cf666009ee, []int{0, 0, 0} + return fileDescriptor_a_bit_of_everything_cd9917162b8575c6, []int{0, 0, 0} } // Intentionaly complicated message type to cover much features of Protobuf. // NEXT ID: 30 type ABitOfEverything struct { - SingleNested *ABitOfEverything_Nested `protobuf:"bytes,25,opt,name=single_nested,json=singleNested" json:"single_nested,omitempty"` - Uuid string `protobuf:"bytes,1,opt,name=uuid" json:"uuid,omitempty"` - Nested []*ABitOfEverything_Nested `protobuf:"bytes,2,rep,name=nested" json:"nested,omitempty"` - FloatValue float32 `protobuf:"fixed32,3,opt,name=float_value,json=floatValue" json:"float_value,omitempty"` - DoubleValue float64 `protobuf:"fixed64,4,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"` - Int64Value int64 `protobuf:"varint,5,opt,name=int64_value,json=int64Value" json:"int64_value,omitempty"` - Uint64Value uint64 `protobuf:"varint,6,opt,name=uint64_value,json=uint64Value" json:"uint64_value,omitempty"` - Int32Value int32 `protobuf:"varint,7,opt,name=int32_value,json=int32Value" json:"int32_value,omitempty"` - Fixed64Value uint64 `protobuf:"fixed64,8,opt,name=fixed64_value,json=fixed64Value" json:"fixed64_value,omitempty"` - Fixed32Value uint32 `protobuf:"fixed32,9,opt,name=fixed32_value,json=fixed32Value" json:"fixed32_value,omitempty"` - BoolValue bool `protobuf:"varint,10,opt,name=bool_value,json=boolValue" json:"bool_value,omitempty"` - StringValue string `protobuf:"bytes,11,opt,name=string_value,json=stringValue" json:"string_value,omitempty"` + SingleNested *ABitOfEverything_Nested `protobuf:"bytes,25,opt,name=single_nested,json=singleNested,proto3" json:"single_nested,omitempty"` + Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"` + Nested []*ABitOfEverything_Nested `protobuf:"bytes,2,rep,name=nested,proto3" json:"nested,omitempty"` + FloatValue float32 `protobuf:"fixed32,3,opt,name=float_value,json=floatValue,proto3" json:"float_value,omitempty"` + DoubleValue float64 `protobuf:"fixed64,4,opt,name=double_value,json=doubleValue,proto3" json:"double_value,omitempty"` + Int64Value int64 `protobuf:"varint,5,opt,name=int64_value,json=int64Value,proto3" json:"int64_value,omitempty"` + Uint64Value uint64 `protobuf:"varint,6,opt,name=uint64_value,json=uint64Value,proto3" json:"uint64_value,omitempty"` + Int32Value int32 `protobuf:"varint,7,opt,name=int32_value,json=int32Value,proto3" json:"int32_value,omitempty"` + Fixed64Value uint64 `protobuf:"fixed64,8,opt,name=fixed64_value,json=fixed64Value,proto3" json:"fixed64_value,omitempty"` + Fixed32Value uint32 `protobuf:"fixed32,9,opt,name=fixed32_value,json=fixed32Value,proto3" json:"fixed32_value,omitempty"` + BoolValue bool `protobuf:"varint,10,opt,name=bool_value,json=boolValue,proto3" json:"bool_value,omitempty"` + StringValue string `protobuf:"bytes,11,opt,name=string_value,json=stringValue,proto3" json:"string_value,omitempty"` BytesValue []byte `protobuf:"bytes,29,opt,name=bytes_value,json=bytesValue,proto3" json:"bytes_value,omitempty"` - Uint32Value uint32 `protobuf:"varint,13,opt,name=uint32_value,json=uint32Value" json:"uint32_value,omitempty"` - EnumValue NumericEnum `protobuf:"varint,14,opt,name=enum_value,json=enumValue,enum=grpc.gateway.examples.examplepb.NumericEnum" json:"enum_value,omitempty"` - Sfixed32Value int32 `protobuf:"fixed32,15,opt,name=sfixed32_value,json=sfixed32Value" json:"sfixed32_value,omitempty"` - Sfixed64Value int64 `protobuf:"fixed64,16,opt,name=sfixed64_value,json=sfixed64Value" json:"sfixed64_value,omitempty"` - Sint32Value int32 `protobuf:"zigzag32,17,opt,name=sint32_value,json=sint32Value" json:"sint32_value,omitempty"` - Sint64Value int64 `protobuf:"zigzag64,18,opt,name=sint64_value,json=sint64Value" json:"sint64_value,omitempty"` - RepeatedStringValue []string `protobuf:"bytes,19,rep,name=repeated_string_value,json=repeatedStringValue" json:"repeated_string_value,omitempty"` + Uint32Value uint32 `protobuf:"varint,13,opt,name=uint32_value,json=uint32Value,proto3" json:"uint32_value,omitempty"` + EnumValue NumericEnum `protobuf:"varint,14,opt,name=enum_value,json=enumValue,proto3,enum=grpc.gateway.examples.examplepb.NumericEnum" json:"enum_value,omitempty"` + Sfixed32Value int32 `protobuf:"fixed32,15,opt,name=sfixed32_value,json=sfixed32Value,proto3" json:"sfixed32_value,omitempty"` + Sfixed64Value int64 `protobuf:"fixed64,16,opt,name=sfixed64_value,json=sfixed64Value,proto3" json:"sfixed64_value,omitempty"` + Sint32Value int32 `protobuf:"zigzag32,17,opt,name=sint32_value,json=sint32Value,proto3" json:"sint32_value,omitempty"` + Sint64Value int64 `protobuf:"zigzag64,18,opt,name=sint64_value,json=sint64Value,proto3" json:"sint64_value,omitempty"` + RepeatedStringValue []string `protobuf:"bytes,19,rep,name=repeated_string_value,json=repeatedStringValue,proto3" json:"repeated_string_value,omitempty"` // Types that are valid to be assigned to OneofValue: // *ABitOfEverything_OneofEmpty // *ABitOfEverything_OneofString OneofValue isABitOfEverything_OneofValue `protobuf_oneof:"oneof_value"` - MapValue map[string]NumericEnum `protobuf:"bytes,22,rep,name=map_value,json=mapValue" json:"map_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=grpc.gateway.examples.examplepb.NumericEnum"` - MappedStringValue map[string]string `protobuf:"bytes,23,rep,name=mapped_string_value,json=mappedStringValue" json:"mapped_string_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - MappedNestedValue map[string]*ABitOfEverything_Nested `protobuf:"bytes,24,rep,name=mapped_nested_value,json=mappedNestedValue" json:"mapped_nested_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - NonConventionalNameValue string `protobuf:"bytes,26,opt,name=nonConventionalNameValue" json:"nonConventionalNameValue,omitempty"` - TimestampValue *timestamp.Timestamp `protobuf:"bytes,27,opt,name=timestamp_value,json=timestampValue" json:"timestamp_value,omitempty"` + MapValue map[string]NumericEnum `protobuf:"bytes,22,rep,name=map_value,json=mapValue,proto3" json:"map_value,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=grpc.gateway.examples.examplepb.NumericEnum"` + MappedStringValue map[string]string `protobuf:"bytes,23,rep,name=mapped_string_value,json=mappedStringValue,proto3" json:"mapped_string_value,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MappedNestedValue map[string]*ABitOfEverything_Nested `protobuf:"bytes,24,rep,name=mapped_nested_value,json=mappedNestedValue,proto3" json:"mapped_nested_value,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + NonConventionalNameValue string `protobuf:"bytes,26,opt,name=nonConventionalNameValue,proto3" json:"nonConventionalNameValue,omitempty"` + TimestampValue *timestamp.Timestamp `protobuf:"bytes,27,opt,name=timestamp_value,json=timestampValue,proto3" json:"timestamp_value,omitempty"` // repeated enum value. it is comma-separated in query - RepeatedEnumValue []NumericEnum `protobuf:"varint,28,rep,packed,name=repeated_enum_value,json=repeatedEnumValue,enum=grpc.gateway.examples.examplepb.NumericEnum" json:"repeated_enum_value,omitempty"` + RepeatedEnumValue []NumericEnum `protobuf:"varint,28,rep,packed,name=repeated_enum_value,json=repeatedEnumValue,proto3,enum=grpc.gateway.examples.examplepb.NumericEnum" json:"repeated_enum_value,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -125,7 +125,7 @@ func (m *ABitOfEverything) Reset() { *m = ABitOfEverything{} } func (m *ABitOfEverything) String() string { return proto.CompactTextString(m) } func (*ABitOfEverything) ProtoMessage() {} func (*ABitOfEverything) Descriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_06ded4cf666009ee, []int{0} + return fileDescriptor_a_bit_of_everything_cd9917162b8575c6, []int{0} } func (m *ABitOfEverything) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ABitOfEverything.Unmarshal(m, b) @@ -150,10 +150,10 @@ type isABitOfEverything_OneofValue interface { } type ABitOfEverything_OneofEmpty struct { - OneofEmpty *empty.Empty `protobuf:"bytes,20,opt,name=oneof_empty,json=oneofEmpty,oneof"` + OneofEmpty *empty.Empty `protobuf:"bytes,20,opt,name=oneof_empty,json=oneofEmpty,proto3,oneof"` } type ABitOfEverything_OneofString struct { - OneofString string `protobuf:"bytes,21,opt,name=oneof_string,json=oneofString,oneof"` + OneofString string `protobuf:"bytes,21,opt,name=oneof_string,json=oneofString,proto3,oneof"` } func (*ABitOfEverything_OneofEmpty) isABitOfEverything_OneofValue() {} @@ -435,9 +435,9 @@ func _ABitOfEverything_OneofSizer(msg proto.Message) (n int) { // Nested is nested type. type ABitOfEverything_Nested struct { // name is nested field. - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Amount uint32 `protobuf:"varint,2,opt,name=amount" json:"amount,omitempty"` - Ok ABitOfEverything_Nested_DeepEnum `protobuf:"varint,3,opt,name=ok,enum=grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum" json:"ok,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Amount uint32 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"` + Ok ABitOfEverything_Nested_DeepEnum `protobuf:"varint,3,opt,name=ok,proto3,enum=grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum" json:"ok,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -447,7 +447,7 @@ func (m *ABitOfEverything_Nested) Reset() { *m = ABitOfEverything_Nested func (m *ABitOfEverything_Nested) String() string { return proto.CompactTextString(m) } func (*ABitOfEverything_Nested) ProtoMessage() {} func (*ABitOfEverything_Nested) Descriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_06ded4cf666009ee, []int{0, 0} + return fileDescriptor_a_bit_of_everything_cd9917162b8575c6, []int{0, 0} } func (m *ABitOfEverything_Nested) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ABitOfEverything_Nested.Unmarshal(m, b) @@ -489,7 +489,7 @@ func (m *ABitOfEverything_Nested) GetOk() ABitOfEverything_Nested_DeepEnum { } type Body struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -499,7 +499,7 @@ func (m *Body) Reset() { *m = Body{} } func (m *Body) String() string { return proto.CompactTextString(m) } func (*Body) ProtoMessage() {} func (*Body) Descriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_06ded4cf666009ee, []int{1} + return fileDescriptor_a_bit_of_everything_cd9917162b8575c6, []int{1} } func (m *Body) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Body.Unmarshal(m, b) @@ -527,8 +527,8 @@ func (m *Body) GetName() string { } type MessageWithBody struct { - Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` - Data *Body `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Data *Body `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -538,7 +538,7 @@ func (m *MessageWithBody) Reset() { *m = MessageWithBody{} } func (m *MessageWithBody) String() string { return proto.CompactTextString(m) } func (*MessageWithBody) ProtoMessage() {} func (*MessageWithBody) Descriptor() ([]byte, []int) { - return fileDescriptor_a_bit_of_everything_06ded4cf666009ee, []int{2} + return fileDescriptor_a_bit_of_everything_cd9917162b8575c6, []int{2} } func (m *MessageWithBody) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageWithBody.Unmarshal(m, b) @@ -1195,136 +1195,148 @@ var _AnotherServiceWithNoBindings_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("examples/proto/examplepb/a_bit_of_everything.proto", fileDescriptor_a_bit_of_everything_06ded4cf666009ee) -} - -var fileDescriptor_a_bit_of_everything_06ded4cf666009ee = []byte{ - // 2019 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0xdb, 0xc8, - 0x15, 0xf7, 0x48, 0xb2, 0x22, 0x3d, 0xf9, 0x43, 0x1e, 0xe7, 0xc3, 0x51, 0x9c, 0xf5, 0x44, 0xc9, - 0xb6, 0x8c, 0x37, 0x22, 0x37, 0xca, 0xa2, 0xd8, 0x08, 0x68, 0xb7, 0xb2, 0xad, 0x4d, 0x82, 0x6c, - 0x9c, 0x84, 0xd9, 0x4d, 0x83, 0x34, 0x5b, 0x83, 0x22, 0x47, 0x12, 0x13, 0x91, 0xc3, 0x92, 0x43, - 0x27, 0xaa, 0xeb, 0x16, 0xed, 0x02, 0x2d, 0xf6, 0x54, 0xc0, 0xbd, 0xef, 0xa5, 0x40, 0xd1, 0x4b, - 0x0f, 0x3d, 0xf4, 0x54, 0xa0, 0x3d, 0xf6, 0xd0, 0x63, 0x81, 0xde, 0x0b, 0xf4, 0xd4, 0x63, 0xff, - 0x82, 0x62, 0x86, 0xa4, 0x42, 0xc9, 0x16, 0x1c, 0x39, 0x8b, 0xbd, 0x24, 0x9c, 0x99, 0xdf, 0x7b, - 0xef, 0xf7, 0xde, 0xbc, 0xf7, 0xe6, 0xc9, 0x50, 0xa7, 0xaf, 0x0c, 0xc7, 0xeb, 0xd3, 0x40, 0xf3, - 0x7c, 0xc6, 0x99, 0x16, 0x2f, 0xbd, 0xb6, 0x66, 0xec, 0xb4, 0x6d, 0xbe, 0xc3, 0x3a, 0x3b, 0x74, - 0x97, 0xfa, 0x03, 0xde, 0xb3, 0xdd, 0xae, 0x2a, 0x31, 0x78, 0xad, 0xeb, 0x7b, 0xa6, 0xda, 0x35, - 0x38, 0x7d, 0x69, 0x0c, 0xd4, 0x44, 0x81, 0x3a, 0x14, 0xad, 0xac, 0x76, 0x19, 0xeb, 0xf6, 0xa9, - 0x66, 0x78, 0xb6, 0x66, 0xb8, 0x2e, 0xe3, 0x06, 0xb7, 0x99, 0x1b, 0x44, 0xe2, 0x95, 0x0b, 0xf1, - 0xa9, 0x5c, 0xb5, 0xc3, 0x8e, 0x46, 0x1d, 0x8f, 0x0f, 0xe2, 0xc3, 0x77, 0xc6, 0x0f, 0xad, 0xd0, - 0x97, 0xd2, 0xf1, 0x39, 0x19, 0xe3, 0x1b, 0x84, 0x6d, 0xcd, 0xa1, 0x41, 0x60, 0x74, 0x69, 0x8c, - 0xb8, 0x74, 0x18, 0x51, 0x1f, 0x83, 0xac, 0x8d, 0x1b, 0xe1, 0xb6, 0x43, 0x03, 0x6e, 0x38, 0x5e, - 0x0c, 0xb8, 0x26, 0xff, 0x33, 0x6b, 0x5d, 0xea, 0xd6, 0x82, 0x97, 0x46, 0xb7, 0x4b, 0x7d, 0x8d, - 0x79, 0xd2, 0x89, 0xc3, 0x0e, 0x55, 0xff, 0x5a, 0x86, 0x72, 0x73, 0xc3, 0xe6, 0xf7, 0x3b, 0xad, - 0x61, 0xa8, 0xf0, 0xe7, 0x30, 0x1f, 0xd8, 0x6e, 0xb7, 0x4f, 0x77, 0x5c, 0x1a, 0x70, 0x6a, 0xad, - 0x9c, 0x27, 0x48, 0x29, 0xd5, 0x3f, 0x54, 0x8f, 0x09, 0x9e, 0x3a, 0xae, 0x49, 0xdd, 0x96, 0xf2, - 0xfa, 0x5c, 0xa4, 0x2e, 0x5a, 0x61, 0x0c, 0xb9, 0x30, 0xb4, 0xad, 0x15, 0x44, 0x90, 0x52, 0xd4, - 0xe5, 0x37, 0x7e, 0x00, 0xf9, 0xd8, 0x56, 0x86, 0x64, 0xdf, 0xca, 0x56, 0xac, 0x07, 0xaf, 0x41, - 0xa9, 0xd3, 0x67, 0x06, 0xdf, 0xd9, 0x35, 0xfa, 0x21, 0x5d, 0xc9, 0x12, 0xa4, 0x64, 0x74, 0x90, - 0x5b, 0x8f, 0xc5, 0x0e, 0xbe, 0x04, 0x73, 0x16, 0x0b, 0xdb, 0x7d, 0x1a, 0x23, 0x72, 0x04, 0x29, - 0x48, 0x2f, 0x45, 0x7b, 0x11, 0x64, 0x0d, 0x4a, 0xb6, 0xcb, 0xbf, 0xf3, 0x41, 0x8c, 0x98, 0x25, - 0x48, 0xc9, 0xea, 0x20, 0xb7, 0x86, 0x3a, 0xc2, 0x34, 0x22, 0x4f, 0x90, 0x92, 0xd3, 0x4b, 0x61, - 0x0a, 0x12, 0xe9, 0xb8, 0x51, 0x8f, 0x11, 0xa7, 0x08, 0x52, 0x66, 0xa5, 0x8e, 0x1b, 0xf5, 0x08, - 0x70, 0x19, 0xe6, 0x3b, 0xf6, 0x2b, 0x6a, 0x0d, 0x95, 0x14, 0x08, 0x52, 0xf2, 0xfa, 0x5c, 0xbc, - 0x39, 0x0a, 0x1a, 0xea, 0x29, 0x12, 0xa4, 0x9c, 0x8a, 0x41, 0x89, 0xa6, 0x8b, 0x00, 0x6d, 0xc6, - 0xfa, 0x31, 0x02, 0x08, 0x52, 0x0a, 0x7a, 0x51, 0xec, 0x0c, 0xc9, 0x06, 0xdc, 0xb7, 0xdd, 0x6e, - 0x0c, 0x28, 0xc9, 0xf8, 0x97, 0xa2, 0xbd, 0x21, 0xd9, 0xf6, 0x80, 0xd3, 0x20, 0x46, 0x5c, 0x24, - 0x48, 0x99, 0xd3, 0x41, 0x6e, 0x8d, 0x38, 0x3c, 0xa4, 0x31, 0x4f, 0x90, 0x32, 0x1f, 0x39, 0x9c, - 0xb0, 0xb8, 0x0b, 0x40, 0xdd, 0xd0, 0x89, 0x01, 0x0b, 0x04, 0x29, 0x0b, 0xf5, 0x6b, 0xc7, 0x5e, - 0xe7, 0x76, 0xe8, 0x50, 0xdf, 0x36, 0x5b, 0x6e, 0xe8, 0xe8, 0x45, 0x21, 0x1f, 0x29, 0x7b, 0x17, - 0x16, 0x82, 0x51, 0xc7, 0x17, 0x09, 0x52, 0x16, 0xf5, 0xf9, 0x60, 0xc4, 0xf3, 0x21, 0x6c, 0x18, - 0xc4, 0x32, 0x41, 0x4a, 0x39, 0x81, 0xa5, 0xae, 0x2b, 0x48, 0xb3, 0x5f, 0x22, 0x48, 0x59, 0xd2, - 0x4b, 0x41, 0x8a, 0x7d, 0x0c, 0x19, 0xea, 0xc1, 0x04, 0x29, 0x38, 0x82, 0x24, 0x5a, 0xea, 0x70, - 0xc6, 0xa7, 0x1e, 0x35, 0x38, 0xb5, 0x76, 0x46, 0x02, 0xba, 0x4c, 0xb2, 0x4a, 0x51, 0x5f, 0x4e, - 0x0e, 0x1f, 0xa5, 0x02, 0x7b, 0x13, 0x4a, 0xcc, 0xa5, 0xa2, 0x23, 0x89, 0x86, 0xb1, 0x72, 0x5a, - 0x16, 0xd4, 0x59, 0x35, 0x2a, 0x66, 0x35, 0x29, 0x66, 0xb5, 0x25, 0x4e, 0x6f, 0xcf, 0xe8, 0x20, - 0xc1, 0x72, 0x85, 0x2f, 0xc3, 0x5c, 0x24, 0x1a, 0xd9, 0x5a, 0x39, 0x23, 0xae, 0xed, 0xf6, 0x8c, - 0x1e, 0x29, 0x8c, 0x8c, 0xe0, 0x67, 0x50, 0x74, 0x0c, 0x2f, 0xe6, 0x71, 0x56, 0x96, 0xd0, 0x47, - 0xd3, 0x97, 0xd0, 0x3d, 0xc3, 0x93, 0x74, 0x5b, 0x2e, 0xf7, 0x07, 0x7a, 0xc1, 0x89, 0x97, 0xf8, - 0x15, 0x2c, 0x3b, 0x86, 0xe7, 0x8d, 0xfb, 0x7b, 0x4e, 0xda, 0xb9, 0x7d, 0x22, 0x3b, 0xde, 0x48, - 0x7c, 0x22, 0x83, 0x4b, 0xce, 0xf8, 0x7e, 0xca, 0x72, 0x54, 0xd6, 0xb1, 0xe5, 0x95, 0xb7, 0xb3, - 0x1c, 0xb5, 0x8a, 0xc3, 0x96, 0x53, 0xfb, 0xb8, 0x01, 0x2b, 0x2e, 0x73, 0x37, 0x99, 0xbb, 0x4b, - 0x5d, 0xd1, 0x31, 0x8d, 0xfe, 0xb6, 0xe1, 0x44, 0x7d, 0x61, 0xa5, 0x22, 0x2b, 0x67, 0xe2, 0x39, - 0xde, 0x84, 0xc5, 0x61, 0x5b, 0x8e, 0x19, 0x5f, 0x90, 0x37, 0x5e, 0x39, 0x74, 0xe3, 0x9f, 0x26, - 0x38, 0x7d, 0x61, 0x28, 0x12, 0x29, 0x79, 0x06, 0xc3, 0x4c, 0xda, 0x49, 0x15, 0xd4, 0x2a, 0xc9, - 0x4e, 0x5d, 0x50, 0x4b, 0x89, 0xa2, 0x56, 0x52, 0x58, 0x95, 0x3f, 0x20, 0xc8, 0xbf, 0xee, 0xc7, - 0xae, 0xe1, 0xd0, 0xa4, 0x1f, 0x8b, 0x6f, 0x7c, 0x16, 0xf2, 0x86, 0xc3, 0x42, 0x97, 0xaf, 0x64, - 0x64, 0x85, 0xc7, 0x2b, 0xfc, 0x10, 0x32, 0xec, 0x85, 0x6c, 0xa6, 0x0b, 0xf5, 0xe6, 0x49, 0x7b, - 0xb4, 0xba, 0x45, 0xa9, 0x27, 0x89, 0x65, 0xd8, 0x8b, 0xea, 0x1a, 0x14, 0x92, 0x35, 0x2e, 0xc2, - 0xec, 0xc7, 0xcd, 0x4f, 0x1e, 0xb5, 0xca, 0x33, 0xb8, 0x00, 0xb9, 0x4f, 0xf5, 0xcf, 0x5a, 0x65, - 0x54, 0xb1, 0x61, 0x7e, 0x24, 0x31, 0x71, 0x19, 0xb2, 0x2f, 0xe8, 0x20, 0xe6, 0x2b, 0x3e, 0xf1, - 0x06, 0xcc, 0x46, 0xd1, 0xc9, 0x9c, 0xa0, 0xdd, 0x44, 0xa2, 0x8d, 0xcc, 0x87, 0xa8, 0xb2, 0x05, - 0x67, 0x8f, 0xce, 0xcd, 0x23, 0x6c, 0x9e, 0x4e, 0xdb, 0x2c, 0xa6, 0xb5, 0xfc, 0x2c, 0xd1, 0x32, - 0x9e, 0x67, 0x47, 0x68, 0xd9, 0x4e, 0x6b, 0x79, 0x9b, 0x77, 0xef, 0xb5, 0xfd, 0xc6, 0x0f, 0x0f, - 0x9a, 0x4f, 0xd6, 0x1f, 0xc3, 0x95, 0x8f, 0x6d, 0xd7, 0x22, 0x2c, 0xe4, 0xc4, 0x61, 0x3e, 0x25, - 0x46, 0x5b, 0x7c, 0x1e, 0x7a, 0xec, 0xd5, 0x1e, 0xe7, 0x5e, 0xd0, 0xd0, 0xb4, 0xae, 0xcd, 0x7b, - 0x61, 0x5b, 0x35, 0x99, 0xa3, 0x09, 0x0e, 0x35, 0x6a, 0xb2, 0x60, 0x10, 0x70, 0x1a, 0x2f, 0x63, - 0x4a, 0x1b, 0xf3, 0x49, 0x27, 0x93, 0xf6, 0xaa, 0x15, 0xc8, 0x6d, 0x30, 0x6b, 0x70, 0x54, 0x12, - 0x55, 0x9f, 0xc1, 0xe2, 0xbd, 0x68, 0x78, 0xf9, 0x81, 0xcd, 0x7b, 0x12, 0xb6, 0x00, 0x99, 0xe1, - 0xcb, 0x9f, 0xb1, 0x2d, 0x7c, 0x13, 0x72, 0x96, 0xc1, 0x8d, 0xd8, 0xfb, 0x77, 0x8f, 0xf5, 0x5e, - 0x28, 0xd1, 0xa5, 0xc8, 0x3a, 0x81, 0x52, 0xea, 0x16, 0x45, 0xbe, 0x3c, 0x6d, 0xe9, 0xf7, 0xcb, - 0x33, 0xf8, 0x14, 0x64, 0xef, 0x6f, 0xb7, 0xca, 0xa8, 0xfe, 0xa7, 0x65, 0x38, 0x37, 0xee, 0xef, - 0x23, 0xea, 0xef, 0xda, 0x26, 0xc5, 0x5f, 0x65, 0x21, 0xbf, 0xe9, 0x8b, 0xa2, 0xc0, 0xd7, 0xa7, - 0x8e, 0x79, 0x65, 0x7a, 0x91, 0xea, 0x1f, 0x33, 0xbf, 0xfc, 0xe7, 0x7f, 0x7e, 0x9b, 0xf9, 0x7d, - 0xa6, 0xfa, 0xbb, 0x8c, 0xb6, 0x7b, 0x3d, 0x99, 0x56, 0x8f, 0x9a, 0x55, 0xb5, 0xbd, 0xd4, 0xe4, - 0xb2, 0xaf, 0xed, 0xa5, 0xc7, 0x94, 0x7d, 0x6d, 0x2f, 0xf5, 0x3c, 0xed, 0x6b, 0x01, 0xf5, 0x0c, - 0xdf, 0xe0, 0xcc, 0xd7, 0xf6, 0xc2, 0x91, 0x83, 0xbd, 0xd4, 0x43, 0xb7, 0xaf, 0xed, 0x8d, 0xbc, - 0x8e, 0xc9, 0x3a, 0x75, 0xfe, 0x7a, 0x70, 0xd8, 0xd7, 0xf6, 0xd2, 0x5d, 0xfe, 0xbb, 0x01, 0xf7, - 0x3d, 0x9f, 0x76, 0xec, 0x57, 0xda, 0xfa, 0x7e, 0x64, 0x24, 0x25, 0x16, 0x8c, 0xeb, 0x09, 0xc6, - 0x0d, 0x05, 0x63, 0x02, 0xa3, 0x24, 0x27, 0xb5, 0xd0, 0x7d, 0xfc, 0x15, 0x02, 0x88, 0x2e, 0x48, - 0x26, 0xce, 0x37, 0x73, 0x49, 0xeb, 0xf2, 0x8e, 0xae, 0x54, 0xd7, 0x8e, 0xb9, 0xa1, 0x06, 0x5a, - 0xc7, 0x3f, 0x85, 0xfc, 0x27, 0x8c, 0xbd, 0x08, 0x3d, 0xbc, 0xa8, 0x8a, 0x41, 0x5d, 0xbd, 0x63, - 0xc5, 0xd9, 0x7e, 0x12, 0xcb, 0xaa, 0xb4, 0xac, 0xe0, 0x6f, 0x1d, 0x9b, 0x1b, 0x62, 0x5e, 0xde, - 0xc7, 0xbf, 0x42, 0x90, 0xff, 0xcc, 0xb3, 0x4e, 0x98, 0xbf, 0x13, 0x26, 0x8f, 0xea, 0x75, 0xc9, - 0xe2, 0xbd, 0xca, 0x1b, 0xb2, 0x10, 0x61, 0xf8, 0x0d, 0x82, 0xfc, 0x16, 0xed, 0x53, 0x4e, 0x0f, - 0xc7, 0x61, 0x92, 0x99, 0x67, 0x07, 0xcd, 0xf7, 0xda, 0x57, 0x61, 0x01, 0xa0, 0xe9, 0xd9, 0x77, - 0xe9, 0xa0, 0x19, 0xf2, 0x1e, 0x9e, 0x81, 0x73, 0x90, 0xbf, 0x2f, 0x3e, 0xeb, 0x78, 0x1e, 0x72, - 0x3e, 0x35, 0x2c, 0x98, 0x7d, 0xe9, 0xdb, 0x9c, 0x46, 0xa1, 0x59, 0x7f, 0xd3, 0xd0, 0xfc, 0x1b, - 0x41, 0xe1, 0x16, 0xe5, 0x0f, 0x43, 0xea, 0x0f, 0xbe, 0xce, 0xe0, 0x7c, 0x89, 0x0e, 0x9a, 0x7a, - 0x75, 0x1b, 0x56, 0x8f, 0xea, 0xab, 0x43, 0x83, 0x53, 0xf6, 0xd3, 0x27, 0x48, 0x7a, 0xa7, 0xe2, - 0x6b, 0xc7, 0x79, 0xf7, 0x63, 0xa1, 0x3e, 0xf1, 0xf1, 0xef, 0x19, 0xc8, 0xb5, 0xcc, 0x1e, 0xc3, - 0xca, 0x04, 0xff, 0x82, 0xb0, 0xad, 0x46, 0x8f, 0x58, 0x72, 0x19, 0x6f, 0x8c, 0xac, 0xfe, 0x17, - 0x1d, 0x34, 0xbf, 0x40, 0x30, 0x47, 0xcd, 0x1e, 0x23, 0x41, 0xd4, 0x30, 0xa1, 0x20, 0x57, 0xbe, - 0x67, 0xe2, 0xa5, 0x47, 0xa1, 0xe3, 0x18, 0xfe, 0xa0, 0x41, 0x5a, 0xf1, 0x56, 0xa5, 0xbc, 0x45, - 0x03, 0xd3, 0xb7, 0xe5, 0xcf, 0x4c, 0xb9, 0x5b, 0xdd, 0x02, 0x3c, 0x1a, 0x26, 0xc9, 0x76, 0xca, - 0xe0, 0xc8, 0xd0, 0x7c, 0x7e, 0x7c, 0x68, 0x04, 0x35, 0x6d, 0x2f, 0xea, 0x29, 0x4f, 0xcf, 0x57, - 0xcb, 0xda, 0x6e, 0x7d, 0x88, 0x17, 0x67, 0x8d, 0xe8, 0x71, 0x7c, 0x8a, 0xf1, 0xa1, 0x23, 0xfc, - 0x67, 0x04, 0x73, 0x62, 0xfe, 0x78, 0x60, 0xf0, 0x9e, 0xe4, 0xf8, 0xcd, 0x74, 0x9a, 0x8f, 0xa4, - 0x6f, 0x37, 0xab, 0x1f, 0x1c, 0x9b, 0xd4, 0x23, 0x3f, 0xc5, 0x55, 0xf1, 0xb0, 0xca, 0xba, 0x6b, - 0x02, 0x6c, 0xb3, 0x0d, 0xdb, 0xb5, 0x6c, 0xb7, 0x1b, 0xe0, 0xf3, 0x87, 0x72, 0x76, 0x2b, 0xfe, - 0xe3, 0xc3, 0xc4, 0x74, 0x9e, 0xc1, 0x8f, 0xe1, 0x94, 0x18, 0x3f, 0x59, 0xc8, 0xf1, 0x04, 0xd0, - 0x44, 0xe1, 0x0b, 0x92, 0xfe, 0x19, 0xbc, 0x9c, 0x8e, 0x27, 0x8f, 0x95, 0xf5, 0xa0, 0xdc, 0xf2, - 0x7d, 0xe6, 0x8b, 0x57, 0x7f, 0x8b, 0x72, 0xc3, 0xee, 0x07, 0x53, 0x1b, 0xb8, 0x22, 0x0d, 0xbc, - 0x83, 0x57, 0x47, 0x2e, 0x4c, 0x68, 0x7d, 0x69, 0xf3, 0x9e, 0x15, 0x6b, 0xfd, 0x35, 0x02, 0x7c, - 0x8b, 0xf2, 0xf1, 0x29, 0xe3, 0xfd, 0x63, 0xef, 0x63, 0x4c, 0x62, 0x22, 0x8d, 0x6f, 0x4b, 0x1a, - 0x97, 0xaa, 0xe7, 0xd3, 0x34, 0x04, 0x83, 0x36, 0xb3, 0x06, 0xda, 0x9e, 0xe8, 0x81, 0x72, 0x1a, - 0xc1, 0x5f, 0x20, 0x58, 0x7a, 0xc0, 0x02, 0x2e, 0x34, 0x4a, 0x51, 0x49, 0xe4, 0xcd, 0x06, 0x9a, - 0x89, 0xd6, 0x35, 0x69, 0xfd, 0x6a, 0xf5, 0x4a, 0xda, 0xba, 0xc7, 0x02, 0x2e, 0x18, 0xc8, 0x5f, - 0x92, 0x11, 0x8d, 0x24, 0x29, 0x2a, 0x7f, 0x43, 0x07, 0xcd, 0xbf, 0x20, 0xdc, 0x99, 0x30, 0xf5, - 0x10, 0x2b, 0x55, 0xa6, 0xb5, 0x1a, 0x79, 0xd9, 0xb3, 0xcd, 0x1e, 0x09, 0x7a, 0x2c, 0xec, 0x5b, - 0xc4, 0x65, 0x9c, 0xb4, 0x29, 0x09, 0x03, 0x6a, 0x11, 0xdb, 0x25, 0x5e, 0xdf, 0x30, 0x29, 0x61, - 0x1d, 0xc2, 0x7b, 0x94, 0x58, 0xcc, 0x0c, 0x1d, 0xea, 0x46, 0x7f, 0x3b, 0x22, 0x26, 0x73, 0xc4, - 0xe2, 0x52, 0xe5, 0x21, 0xac, 0x1d, 0xd5, 0x0b, 0x45, 0x19, 0x25, 0x73, 0xd6, 0x94, 0x15, 0x5f, - 0x7f, 0x0e, 0xa7, 0x4d, 0xc3, 0xa1, 0xfd, 0x4d, 0x23, 0xa0, 0xb1, 0x0e, 0x31, 0x14, 0x60, 0x1d, - 0x66, 0xa3, 0x9f, 0xc3, 0xd3, 0x26, 0xd2, 0x79, 0x19, 0xc3, 0x65, 0xbc, 0x34, 0x92, 0x48, 0xe2, - 0xa8, 0xfe, 0x23, 0x58, 0x6d, 0xba, 0x8c, 0xf7, 0xa8, 0x1f, 0x5b, 0x12, 0x97, 0x97, 0x2a, 0xaa, - 0xef, 0x8d, 0x94, 0xd8, 0xb4, 0x86, 0x67, 0x36, 0x7e, 0x31, 0x7b, 0xd0, 0xfc, 0x5f, 0x0e, 0x73, - 0x58, 0x6e, 0x92, 0x0d, 0x9b, 0x8b, 0x60, 0xa6, 0x3a, 0xc0, 0x13, 0x38, 0xdd, 0xd5, 0x1f, 0x6c, - 0xd6, 0x6e, 0x45, 0x9e, 0x13, 0xcf, 0x67, 0xcf, 0xa9, 0xc9, 0xa7, 0x8d, 0x58, 0xa5, 0xec, 0x32, - 0x97, 0x7e, 0x3f, 0xf6, 0x4c, 0xa0, 0xeb, 0xd9, 0xeb, 0xea, 0xfb, 0xeb, 0x59, 0x94, 0xc9, 0xd5, - 0xcb, 0x86, 0xe7, 0xf5, 0x6d, 0x53, 0x5e, 0x9b, 0xf6, 0x3c, 0x60, 0x6e, 0xfd, 0x6c, 0x7a, 0xe7, - 0x55, 0xad, 0xc3, 0x58, 0xcd, 0xb1, 0x1d, 0xda, 0x38, 0x84, 0x6c, 0x4c, 0x40, 0x3e, 0xfd, 0x32, - 0x03, 0x8b, 0x50, 0xdc, 0x30, 0x02, 0xdb, 0x94, 0xef, 0x76, 0xa6, 0x80, 0xe0, 0xe2, 0xc8, 0x4b, - 0xbe, 0x58, 0xc8, 0x54, 0x8a, 0x4f, 0x6a, 0xcd, 0x07, 0x77, 0x6a, 0x77, 0xe9, 0x80, 0x64, 0xe0, - 0x5f, 0x68, 0xf8, 0xb2, 0xff, 0x03, 0x15, 0xb2, 0x4a, 0xae, 0x7e, 0x39, 0x71, 0x32, 0xc5, 0x5b, - 0x63, 0x46, 0xc8, 0x7b, 0x9a, 0xf8, 0x87, 0xf9, 0xf6, 0x4f, 0x68, 0x63, 0x6d, 0x32, 0x88, 0xb3, - 0x17, 0xd4, 0xdd, 0xf8, 0x39, 0x54, 0xa2, 0x41, 0x01, 0xe3, 0x5b, 0xbe, 0xe1, 0xf2, 0x80, 0x88, - 0x05, 0x31, 0x4c, 0x93, 0x06, 0x01, 0xac, 0xc6, 0xe3, 0x03, 0x5e, 0x8e, 0x0f, 0xe5, 0x2a, 0x39, - 0xdd, 0x84, 0x59, 0xc3, 0x72, 0x6c, 0x17, 0x37, 0x46, 0x44, 0x5d, 0x6b, 0x04, 0x46, 0x38, 0x23, - 0x12, 0x66, 0x07, 0x5c, 0xf4, 0xd3, 0x5d, 0x4a, 0x6c, 0xb7, 0xc3, 0x7c, 0x47, 0x86, 0xa5, 0xbd, - 0x06, 0xf3, 0xe9, 0x50, 0xcc, 0x8c, 0x8f, 0x34, 0xed, 0xab, 0x13, 0x87, 0x9a, 0x71, 0xa8, 0x7f, - 0x07, 0xce, 0xdd, 0x7b, 0x5d, 0x43, 0xe9, 0xd4, 0x98, 0x36, 0x25, 0x9e, 0x16, 0x87, 0xfd, 0xa5, - 0x9d, 0x97, 0x59, 0x79, 0xe3, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x60, 0xd8, 0x68, 0xe8, 0x2d, - 0x17, 0x00, 0x00, + proto.RegisterFile("examples/proto/examplepb/a_bit_of_everything.proto", fileDescriptor_a_bit_of_everything_cd9917162b8575c6) +} + +var fileDescriptor_a_bit_of_everything_cd9917162b8575c6 = []byte{ + // 2222 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x73, 0x1b, 0x49, + 0xd9, 0xf7, 0x48, 0xb6, 0x62, 0x3f, 0xfe, 0x92, 0xdb, 0xd9, 0xc4, 0xd1, 0x3a, 0xeb, 0x8e, 0x92, + 0x7d, 0x57, 0xf1, 0xc6, 0x33, 0x89, 0xe2, 0x77, 0x2b, 0x31, 0x05, 0x41, 0xb6, 0xb5, 0x89, 0x37, + 0x1b, 0xc7, 0x99, 0xec, 0x86, 0x54, 0x2a, 0x8b, 0x69, 0xcd, 0xb4, 0xa4, 0x49, 0x34, 0xd3, 0xc3, + 0x74, 0x8f, 0x6d, 0x61, 0x0c, 0x05, 0x54, 0x41, 0xed, 0x89, 0x2a, 0x73, 0xe3, 0xb0, 0x07, 0xa8, + 0xa2, 0xb8, 0x50, 0x9c, 0xb8, 0x40, 0x15, 0x9c, 0x38, 0xed, 0x91, 0x2a, 0x0e, 0xdc, 0xa8, 0xe2, + 0xc0, 0x9f, 0x41, 0x75, 0xcf, 0x8c, 0x3c, 0x92, 0x2d, 0x1c, 0x25, 0xd4, 0x5e, 0xec, 0xe9, 0xee, + 0xdf, 0xf3, 0xfd, 0xd1, 0x4f, 0x0b, 0xca, 0x74, 0x8f, 0xb8, 0x7e, 0x8b, 0x72, 0xc3, 0x0f, 0x98, + 0x60, 0x46, 0xbc, 0xf4, 0x6b, 0x06, 0xd9, 0xae, 0x39, 0x62, 0x9b, 0xd5, 0xb7, 0xe9, 0x0e, 0x0d, + 0xda, 0xa2, 0xe9, 0x78, 0x0d, 0x5d, 0x61, 0xd0, 0x42, 0x23, 0xf0, 0x2d, 0xbd, 0x41, 0x04, 0xdd, + 0x25, 0x6d, 0x3d, 0x61, 0xa0, 0x77, 0x48, 0x0b, 0xf3, 0x0d, 0xc6, 0x1a, 0x2d, 0x6a, 0x10, 0xdf, + 0x31, 0x88, 0xe7, 0x31, 0x41, 0x84, 0xc3, 0x3c, 0x1e, 0x91, 0x17, 0xde, 0x8e, 0x4f, 0xd5, 0xaa, + 0x16, 0xd6, 0x0d, 0xea, 0xfa, 0xa2, 0x1d, 0x1f, 0xbe, 0xd3, 0x7b, 0x68, 0x87, 0x81, 0xa2, 0x8e, + 0xcf, 0x71, 0x8f, 0xbe, 0x3c, 0xac, 0x19, 0x2e, 0xe5, 0x9c, 0x34, 0x68, 0x8c, 0xb8, 0x74, 0x1c, + 0x51, 0xee, 0x81, 0x2c, 0xf4, 0x0a, 0x11, 0x8e, 0x4b, 0xb9, 0x20, 0xae, 0x1f, 0x03, 0xae, 0xa9, + 0x7f, 0xd6, 0x52, 0x83, 0x7a, 0x4b, 0x7c, 0x97, 0x34, 0x1a, 0x34, 0x30, 0x98, 0xaf, 0x8c, 0x38, + 0x6e, 0x50, 0xf1, 0x57, 0x33, 0x90, 0xaf, 0xac, 0x3a, 0xe2, 0x61, 0xbd, 0xda, 0x71, 0x15, 0xfa, + 0x0c, 0x26, 0xb9, 0xe3, 0x35, 0x5a, 0x74, 0xdb, 0xa3, 0x5c, 0x50, 0x7b, 0xee, 0x02, 0xd6, 0x4a, + 0xe3, 0xe5, 0x5b, 0xfa, 0x29, 0xce, 0xd3, 0x7b, 0x39, 0xe9, 0x9b, 0x8a, 0xde, 0x9c, 0x88, 0xd8, + 0x45, 0x2b, 0x84, 0x60, 0x38, 0x0c, 0x1d, 0x7b, 0x4e, 0xc3, 0x5a, 0x69, 0xcc, 0x54, 0xdf, 0x68, + 0x0b, 0x72, 0xb1, 0xac, 0x0c, 0xce, 0xbe, 0x91, 0xac, 0x98, 0x0f, 0x5a, 0x80, 0xf1, 0x7a, 0x8b, + 0x11, 0xb1, 0xbd, 0x43, 0x5a, 0x21, 0x9d, 0xcb, 0x62, 0xad, 0x94, 0x31, 0x41, 0x6d, 0x3d, 0x91, + 0x3b, 0xe8, 0x12, 0x4c, 0xd8, 0x2c, 0xac, 0xb5, 0x68, 0x8c, 0x18, 0xc6, 0x5a, 0x49, 0x33, 0xc7, + 0xa3, 0xbd, 0x08, 0xb2, 0x00, 0xe3, 0x8e, 0x27, 0x3e, 0x58, 0x8e, 0x11, 0x23, 0x58, 0x2b, 0x65, + 0x4d, 0x50, 0x5b, 0x1d, 0x1e, 0x61, 0x1a, 0x91, 0xc3, 0x5a, 0x69, 0xd8, 0x1c, 0x0f, 0x53, 0x90, + 0x88, 0xc7, 0xcd, 0x72, 0x8c, 0x38, 0x83, 0xb5, 0xd2, 0x88, 0xe2, 0x71, 0xb3, 0x1c, 0x01, 0x2e, + 0xc3, 0x64, 0xdd, 0xd9, 0xa3, 0x76, 0x87, 0xc9, 0x28, 0xd6, 0x4a, 0x39, 0x73, 0x22, 0xde, 0xec, + 0x06, 0x75, 0xf8, 0x8c, 0x61, 0xad, 0x74, 0x26, 0x06, 0x25, 0x9c, 0x2e, 0x02, 0xd4, 0x18, 0x6b, + 0xc5, 0x08, 0xc0, 0x5a, 0x69, 0xd4, 0x1c, 0x93, 0x3b, 0x1d, 0x65, 0xb9, 0x08, 0x1c, 0xaf, 0x11, + 0x03, 0xc6, 0x95, 0xff, 0xc7, 0xa3, 0xbd, 0x8e, 0xb2, 0xb5, 0xb6, 0xa0, 0x3c, 0x46, 0x5c, 0xc4, + 0x5a, 0x69, 0xc2, 0x04, 0xb5, 0xd5, 0x65, 0x70, 0x47, 0x8d, 0x49, 0xac, 0x95, 0x26, 0x23, 0x83, + 0x13, 0x2d, 0xee, 0x03, 0x50, 0x2f, 0x74, 0x63, 0xc0, 0x14, 0xd6, 0x4a, 0x53, 0xe5, 0x6b, 0xa7, + 0x86, 0x73, 0x33, 0x74, 0x69, 0xe0, 0x58, 0x55, 0x2f, 0x74, 0xcd, 0x31, 0x49, 0x1f, 0x31, 0x7b, + 0x17, 0xa6, 0x78, 0xb7, 0xe1, 0xd3, 0x58, 0x2b, 0x4d, 0x9b, 0x93, 0xbc, 0xcb, 0xf2, 0x0e, 0xac, + 0xe3, 0xc4, 0x3c, 0xd6, 0x4a, 0xf9, 0x04, 0x96, 0x0a, 0x17, 0x4f, 0x6b, 0x3f, 0x83, 0xb5, 0xd2, + 0x8c, 0x39, 0xce, 0x53, 0xda, 0xc7, 0x90, 0x0e, 0x1f, 0x84, 0xb5, 0x12, 0x8a, 0x20, 0x09, 0x97, + 0x32, 0xbc, 0x15, 0x50, 0x9f, 0x12, 0x41, 0xed, 0xed, 0x2e, 0x87, 0xce, 0xe2, 0x6c, 0x69, 0xcc, + 0x9c, 0x4d, 0x0e, 0x1f, 0xa7, 0x1c, 0x7b, 0x1b, 0xc6, 0x99, 0x47, 0x65, 0x47, 0x92, 0x0d, 0x63, + 0xee, 0xac, 0x2a, 0xa8, 0x73, 0x7a, 0x54, 0xcc, 0x7a, 0x52, 0xcc, 0x7a, 0x55, 0x9e, 0xde, 0x1b, + 0x32, 0x41, 0x81, 0xd5, 0x0a, 0x5d, 0x86, 0x89, 0x88, 0x34, 0x92, 0x35, 0xf7, 0x96, 0x0c, 0xdb, + 0xbd, 0x21, 0x33, 0x62, 0x18, 0x09, 0x41, 0xcf, 0x61, 0xcc, 0x25, 0x7e, 0xac, 0xc7, 0x39, 0x55, + 0x42, 0x77, 0x06, 0x2f, 0xa1, 0x07, 0xc4, 0x57, 0xea, 0x56, 0x3d, 0x11, 0xb4, 0xcd, 0x51, 0x37, + 0x5e, 0xa2, 0x3d, 0x98, 0x75, 0x89, 0xef, 0xf7, 0xda, 0x7b, 0x5e, 0xc9, 0xb9, 0xf7, 0x5a, 0x72, + 0xfc, 0x2e, 0xff, 0x44, 0x02, 0x67, 0xdc, 0xde, 0xfd, 0x94, 0xe4, 0xa8, 0xac, 0x63, 0xc9, 0x73, + 0x6f, 0x26, 0x39, 0x6a, 0x15, 0xc7, 0x25, 0xa7, 0xf6, 0xd1, 0x0a, 0xcc, 0x79, 0xcc, 0x5b, 0x63, + 0xde, 0x0e, 0xf5, 0x64, 0xc7, 0x24, 0xad, 0x4d, 0xe2, 0x46, 0x7d, 0x61, 0xae, 0xa0, 0x2a, 0xa7, + 0xef, 0x39, 0x5a, 0x83, 0xe9, 0x4e, 0x5b, 0x8e, 0x35, 0x7e, 0x5b, 0x45, 0xbc, 0x70, 0x2c, 0xe2, + 0x9f, 0x24, 0x38, 0x73, 0xaa, 0x43, 0x12, 0x31, 0x79, 0x0e, 0x9d, 0x4c, 0xda, 0x4e, 0x15, 0xd4, + 0x3c, 0xce, 0x0e, 0x5c, 0x50, 0x33, 0x09, 0xa3, 0x6a, 0x52, 0x58, 0x85, 0xdf, 0x6a, 0x90, 0x3b, + 0xea, 0xc7, 0x1e, 0x71, 0x69, 0xd2, 0x8f, 0xe5, 0x37, 0x3a, 0x07, 0x39, 0xe2, 0xb2, 0xd0, 0x13, + 0x73, 0x19, 0x55, 0xe1, 0xf1, 0x0a, 0x3d, 0x82, 0x0c, 0x7b, 0xa9, 0x9a, 0xe9, 0x54, 0xb9, 0xf2, + 0xba, 0x3d, 0x5a, 0x5f, 0xa7, 0xd4, 0x57, 0x8a, 0x65, 0xd8, 0xcb, 0xe2, 0x02, 0x8c, 0x26, 0x6b, + 0x34, 0x06, 0x23, 0x1f, 0x56, 0x3e, 0x7e, 0x5c, 0xcd, 0x0f, 0xa1, 0x51, 0x18, 0xfe, 0xc4, 0xfc, + 0xb4, 0x9a, 0xd7, 0x0a, 0x0e, 0x4c, 0x76, 0x25, 0x26, 0xca, 0x43, 0xf6, 0x25, 0x6d, 0xc7, 0xfa, + 0xca, 0x4f, 0xb4, 0x0a, 0x23, 0x91, 0x77, 0x32, 0xaf, 0xd1, 0x6e, 0x22, 0xd2, 0x95, 0xcc, 0x2d, + 0xad, 0xb0, 0x0e, 0xe7, 0x4e, 0xce, 0xcd, 0x13, 0x64, 0x9e, 0x4d, 0xcb, 0x1c, 0x4b, 0x73, 0xf9, + 0x41, 0xc2, 0xa5, 0x37, 0xcf, 0x4e, 0xe0, 0xb2, 0x99, 0xe6, 0xf2, 0x26, 0xf7, 0xde, 0x91, 0xfc, + 0x95, 0x3f, 0x6b, 0x87, 0x95, 0x3f, 0x6a, 0xf0, 0x9d, 0xc5, 0xd9, 0x0a, 0xae, 0x39, 0x02, 0xb3, + 0x3a, 0x3e, 0x1a, 0x84, 0xca, 0x1b, 0x1b, 0x9e, 0x48, 0x52, 0xb6, 0x8d, 0x2d, 0xe6, 0xfa, 0x2d, + 0xc7, 0x92, 0xc9, 0x81, 0xe3, 0x49, 0x03, 0x8b, 0xb6, 0x4f, 0xb1, 0x60, 0xd8, 0x62, 0x3b, 0x34, + 0xc0, 0x6e, 0x68, 0x35, 0x71, 0x9d, 0x12, 0x11, 0x06, 0x94, 0x4b, 0x5e, 0x5b, 0x49, 0xee, 0x2e, + 0x3e, 0x81, 0x2b, 0x1f, 0x3a, 0x9e, 0x8d, 0x59, 0x28, 0xb0, 0xcb, 0x02, 0x8a, 0x49, 0x4d, 0x7e, + 0x1e, 0x1b, 0x28, 0xf4, 0xa6, 0x10, 0x3e, 0x5f, 0x31, 0x8c, 0x86, 0x23, 0x9a, 0x61, 0x4d, 0xb7, + 0x98, 0x6b, 0x48, 0x3b, 0x97, 0xa8, 0xc5, 0x78, 0x9b, 0x0b, 0x1a, 0x2f, 0x63, 0xb3, 0x57, 0x27, + 0x93, 0x6e, 0xa9, 0x6c, 0x2a, 0x16, 0x60, 0x78, 0x95, 0xd9, 0xed, 0x93, 0x12, 0xb5, 0xf8, 0x1c, + 0xa6, 0x1f, 0x44, 0x6a, 0x7f, 0xcb, 0x11, 0x4d, 0x05, 0x9b, 0x82, 0x4c, 0x67, 0xba, 0xc8, 0x38, + 0x36, 0xba, 0x0d, 0xc3, 0x36, 0x11, 0x24, 0xf6, 0xf0, 0xbb, 0xa7, 0x7a, 0x58, 0x32, 0x31, 0x15, + 0xc9, 0x22, 0x86, 0xf1, 0x54, 0xa6, 0xc8, 0x9c, 0x7c, 0x56, 0x35, 0x1f, 0xe6, 0x87, 0xd0, 0x19, + 0xc8, 0x3e, 0xdc, 0xac, 0xe6, 0xb5, 0xf2, 0xef, 0xcf, 0xc2, 0xf9, 0x5e, 0x7b, 0x1f, 0xd3, 0x60, + 0xc7, 0xb1, 0x28, 0xfa, 0x22, 0x0b, 0xb9, 0xb5, 0x40, 0x16, 0x1e, 0xba, 0x31, 0x70, 0x5c, 0x0b, + 0x83, 0x93, 0x14, 0x7f, 0x97, 0xf9, 0xf1, 0xdf, 0xfe, 0xf5, 0x8b, 0xcc, 0x6f, 0x32, 0xc5, 0x5f, + 0x67, 0x8c, 0x9d, 0x1b, 0xc9, 0x44, 0x7c, 0xd2, 0x3c, 0x6c, 0xec, 0xa7, 0xa6, 0xa3, 0x03, 0x63, + 0x3f, 0x3d, 0x0a, 0x1d, 0x18, 0xfb, 0xa9, 0x2b, 0xf0, 0xc0, 0xe0, 0xd4, 0x27, 0x01, 0x11, 0x2c, + 0x30, 0xf6, 0xc3, 0xae, 0x83, 0xfd, 0xd4, 0x65, 0x7a, 0x60, 0xec, 0x77, 0xdd, 0xc0, 0xc9, 0x3a, + 0x75, 0x7e, 0x34, 0x9c, 0x1c, 0x18, 0xfb, 0xe9, 0x9b, 0xe4, 0xeb, 0x5c, 0x04, 0x7e, 0x40, 0xeb, + 0xce, 0x9e, 0xb1, 0x78, 0x10, 0x09, 0x49, 0x91, 0xf1, 0x5e, 0x3e, 0xbc, 0x57, 0x10, 0xef, 0x21, + 0xe8, 0x56, 0xb2, 0x5f, 0x9b, 0x3e, 0x40, 0x5f, 0x68, 0x00, 0x51, 0x80, 0x54, 0xe2, 0x7c, 0x35, + 0x41, 0x5a, 0x54, 0x31, 0xba, 0x52, 0x5c, 0x38, 0x25, 0x42, 0x2b, 0xda, 0x22, 0xfa, 0x3e, 0xe4, + 0x3e, 0x66, 0xec, 0x65, 0xe8, 0xa3, 0x69, 0x5d, 0x3e, 0x06, 0xf4, 0x0d, 0x3b, 0xce, 0xf6, 0xd7, + 0x91, 0xac, 0x2b, 0xc9, 0x25, 0xf4, 0x7f, 0xa7, 0xe6, 0x86, 0x9c, 0xc9, 0x0f, 0xd0, 0x4f, 0x35, + 0xc8, 0x7d, 0xea, 0xdb, 0xaf, 0x99, 0xbf, 0x7d, 0xa6, 0x9b, 0xe2, 0x0d, 0xa5, 0xc5, 0xfb, 0x85, + 0x57, 0xd4, 0x42, 0xba, 0xe1, 0xe7, 0x1a, 0xe4, 0xd6, 0x69, 0x8b, 0x0a, 0x7a, 0xdc, 0x0f, 0xfd, + 0xc4, 0x3c, 0x3f, 0xac, 0xbc, 0x5f, 0xbb, 0x0a, 0x53, 0x00, 0x15, 0xdf, 0xb9, 0x4f, 0xdb, 0x95, + 0x50, 0x34, 0xd1, 0x10, 0x9c, 0x87, 0xdc, 0x43, 0xf9, 0x59, 0x46, 0x93, 0x30, 0x1c, 0x50, 0x62, + 0xc3, 0xc8, 0x6e, 0xe0, 0x08, 0x1a, 0xb9, 0x66, 0xf1, 0x55, 0x5d, 0xf3, 0x4f, 0x0d, 0x46, 0xef, + 0x52, 0xf1, 0x28, 0xa4, 0x41, 0xfb, 0x7f, 0xe9, 0x9c, 0xcf, 0xb5, 0xc3, 0x8a, 0x59, 0xdc, 0x84, + 0xf9, 0x93, 0xfa, 0x6a, 0x47, 0xe0, 0x80, 0xfd, 0xf4, 0xa9, 0xa6, 0xac, 0xd3, 0xd1, 0xb5, 0xd3, + 0xac, 0xfb, 0xae, 0x64, 0x9f, 0xd8, 0xf8, 0xd7, 0x2c, 0x0c, 0x57, 0xad, 0x26, 0x43, 0xa5, 0x3e, + 0xf6, 0xf1, 0xb0, 0xa6, 0x47, 0x17, 0x65, 0x12, 0x8c, 0x57, 0x46, 0x16, 0xff, 0x9d, 0x39, 0xac, + 0xfc, 0x28, 0x03, 0x13, 0xd4, 0x6a, 0x32, 0xcc, 0xa3, 0x86, 0x09, 0xa3, 0x6a, 0x15, 0xf8, 0x16, + 0x9a, 0x79, 0x1c, 0xba, 0x2e, 0x09, 0xda, 0x2b, 0xb8, 0x1a, 0x6f, 0x15, 0xf2, 0xeb, 0x94, 0x5b, + 0x81, 0xa3, 0x9e, 0xb2, 0x6a, 0xb7, 0xb8, 0x0e, 0xa8, 0xdb, 0x4d, 0x4a, 0xdb, 0x01, 0x9d, 0xf3, + 0xd1, 0x1d, 0xc8, 0xfe, 0xff, 0xf5, 0x9b, 0xe8, 0x16, 0x7c, 0x60, 0x52, 0x11, 0x06, 0x1e, 0xb5, + 0xf1, 0x6e, 0x93, 0x7a, 0x58, 0x34, 0x29, 0x0e, 0x28, 0x67, 0x61, 0x60, 0x51, 0xec, 0x70, 0x2c, + 0xa8, 0xeb, 0xb3, 0x80, 0x04, 0x4e, 0xab, 0x8d, 0x43, 0x8f, 0xec, 0x10, 0xa7, 0x45, 0x6a, 0x2d, + 0xaa, 0x7f, 0xf4, 0x35, 0xc8, 0x2e, 0x5f, 0x5f, 0x46, 0xcb, 0xb0, 0xf8, 0x5f, 0x18, 0xd8, 0x8c, + 0x72, 0xec, 0x31, 0x81, 0xe9, 0x9e, 0xc3, 0x85, 0x8e, 0x72, 0x30, 0xfc, 0xcb, 0x8c, 0x96, 0x55, + 0x81, 0xf9, 0xec, 0xf4, 0xc0, 0x48, 0xc7, 0x18, 0xfb, 0x51, 0x47, 0x7b, 0x76, 0xa1, 0x98, 0x37, + 0x76, 0xca, 0x1d, 0xbc, 0x3c, 0x5b, 0x89, 0xae, 0xff, 0x67, 0x08, 0x1d, 0x3b, 0x42, 0x7f, 0xd0, + 0x60, 0x42, 0x4e, 0x58, 0x5b, 0x44, 0x34, 0x95, 0x87, 0xbe, 0x9a, 0x3e, 0x77, 0x47, 0xd9, 0x76, + 0xbb, 0xb8, 0x7c, 0x6a, 0x49, 0x75, 0xfd, 0xd8, 0xa0, 0xcb, 0x6b, 0x5d, 0x55, 0x7d, 0x05, 0x60, + 0x93, 0xad, 0x3a, 0x9e, 0xed, 0x78, 0x0d, 0x8e, 0x2e, 0x1c, 0xab, 0x98, 0xf5, 0xf8, 0xe7, 0x95, + 0xbe, 0xc5, 0x34, 0x84, 0x9e, 0xc0, 0x19, 0x39, 0x60, 0xb3, 0x50, 0xa0, 0x3e, 0xa0, 0xbe, 0xc4, + 0x6f, 0x2b, 0xf5, 0xdf, 0x42, 0xb3, 0x69, 0x7f, 0x8a, 0x98, 0x59, 0x13, 0xf2, 0xd5, 0x20, 0x60, + 0x81, 0x9c, 0x39, 0xd6, 0xa9, 0x20, 0x4e, 0x8b, 0x0f, 0x2c, 0xe0, 0x8a, 0x12, 0xf0, 0x0e, 0x9a, + 0xef, 0x0a, 0x98, 0xe4, 0xba, 0xeb, 0x88, 0xa6, 0x1d, 0x73, 0xfd, 0x99, 0x06, 0xe8, 0x2e, 0x15, + 0xbd, 0x33, 0xce, 0xf5, 0x53, 0xe3, 0xd1, 0x43, 0xd1, 0x57, 0x8d, 0xf7, 0x94, 0x1a, 0x97, 0x8a, + 0x17, 0xd2, 0x6a, 0x48, 0x0d, 0x6a, 0xcc, 0x6e, 0x1b, 0xfb, 0xb2, 0x03, 0xab, 0x59, 0x08, 0xfd, + 0x44, 0x83, 0x99, 0x2d, 0xc6, 0x85, 0xe4, 0xa8, 0x48, 0x95, 0x22, 0xaf, 0x36, 0x4e, 0xf5, 0x95, + 0x6e, 0x28, 0xe9, 0x57, 0x8b, 0x57, 0xd2, 0xd2, 0x7d, 0xc6, 0x85, 0xd4, 0x40, 0xbd, 0x95, 0x23, + 0x35, 0x92, 0xa4, 0x28, 0xfc, 0x45, 0x3b, 0xac, 0xfc, 0x49, 0x43, 0xf5, 0x3e, 0x33, 0x17, 0xb6, + 0x53, 0x4d, 0x62, 0x69, 0x09, 0xef, 0x36, 0x1d, 0xab, 0x89, 0x79, 0x93, 0x85, 0x2d, 0x5b, 0x95, + 0x5f, 0x8d, 0xe2, 0x90, 0x53, 0x1b, 0x3b, 0x1e, 0xf6, 0x5b, 0xc4, 0xa2, 0x72, 0xa0, 0x95, 0x85, + 0x6a, 0x33, 0x2b, 0x74, 0xa9, 0x17, 0xfd, 0x3a, 0x26, 0xa7, 0x62, 0xb9, 0xb8, 0x54, 0x78, 0x04, + 0x0b, 0x27, 0x75, 0x62, 0x59, 0x46, 0xc9, 0x94, 0x37, 0x60, 0xbf, 0x29, 0xbf, 0x80, 0xb3, 0x16, + 0x71, 0x69, 0x6b, 0x8d, 0x70, 0x1a, 0xf3, 0x90, 0x23, 0x09, 0x32, 0x61, 0x24, 0x7a, 0xf0, 0x0f, + 0x9a, 0x48, 0x17, 0x94, 0x0f, 0x67, 0xd1, 0x4c, 0x57, 0x22, 0xc9, 0xa3, 0xf2, 0xb7, 0x61, 0xbe, + 0xe2, 0x31, 0xd1, 0xa4, 0x41, 0x2c, 0x49, 0x06, 0x2f, 0x55, 0x54, 0xdf, 0xe8, 0x2a, 0xb1, 0x41, + 0x05, 0x0f, 0xad, 0xfe, 0x23, 0x77, 0x58, 0xf9, 0x32, 0x87, 0x04, 0xcc, 0x56, 0xf0, 0x6a, 0xf4, + 0xd2, 0x48, 0x75, 0x80, 0xa7, 0x70, 0xb6, 0x61, 0x6e, 0xad, 0x2d, 0xdd, 0x8d, 0x2c, 0xc7, 0x7e, + 0xc0, 0x5e, 0x50, 0x4b, 0x0c, 0xea, 0xb1, 0x42, 0xde, 0x63, 0x1e, 0xfd, 0x66, 0x6c, 0x99, 0x44, + 0x97, 0xb3, 0x37, 0xf4, 0xeb, 0x8b, 0x59, 0x2d, 0x33, 0x5c, 0xce, 0x13, 0x3f, 0x7a, 0xbf, 0x38, + 0xcc, 0x33, 0x5e, 0x70, 0xe6, 0x95, 0xcf, 0xa5, 0x77, 0xf6, 0x96, 0xea, 0x8c, 0x2d, 0xb9, 0x8e, + 0x4b, 0x57, 0x8e, 0x21, 0x57, 0xfa, 0x20, 0xcd, 0x2d, 0xd9, 0xd0, 0x6f, 0xa2, 0x0d, 0xb8, 0x7b, + 0xbc, 0xa1, 0x87, 0x9c, 0x06, 0x47, 0xcd, 0xbc, 0x49, 0x76, 0x28, 0xf6, 0x69, 0xe0, 0x3a, 0x9c, + 0xcb, 0xbc, 0x11, 0x0c, 0x13, 0xcb, 0xa2, 0x9c, 0x77, 0x35, 0x7f, 0xdd, 0x7c, 0x83, 0x2b, 0xe2, + 0x8c, 0x79, 0x0f, 0xb2, 0xcb, 0x37, 0x6e, 0xa1, 0x0a, 0x4c, 0x6e, 0xbc, 0xe7, 0x62, 0x82, 0x05, + 0x25, 0x3e, 0x13, 0x3a, 0xba, 0x0e, 0x7a, 0x61, 0xa0, 0x97, 0xee, 0xb3, 0xcf, 0x33, 0x30, 0x0d, + 0x63, 0xab, 0x84, 0x3b, 0x96, 0x1a, 0x87, 0x32, 0xa3, 0x1a, 0x5c, 0xec, 0x1a, 0x90, 0xa6, 0x47, + 0x33, 0x85, 0xb1, 0xa7, 0x4b, 0x95, 0xad, 0x8d, 0xa5, 0xfb, 0xb4, 0x8d, 0x33, 0xf0, 0x77, 0xad, + 0x33, 0x30, 0x7d, 0xa9, 0x8d, 0x66, 0x4b, 0xc3, 0xe5, 0xcb, 0x49, 0xf4, 0x52, 0x01, 0x31, 0x18, + 0x09, 0x45, 0xd3, 0x90, 0x7f, 0x58, 0xe0, 0x7c, 0x8f, 0xae, 0x2c, 0xf4, 0x07, 0x09, 0xf6, 0x92, + 0x7a, 0xab, 0x3f, 0x84, 0x42, 0x34, 0x7f, 0x21, 0x74, 0x37, 0x20, 0x9e, 0xe0, 0x58, 0x2e, 0x62, + 0xef, 0xc1, 0x7c, 0x3c, 0x95, 0xa1, 0xd9, 0xf8, 0x50, 0xad, 0x92, 0xd3, 0x35, 0x18, 0x21, 0xb6, + 0xeb, 0x78, 0x68, 0xa5, 0x8b, 0xd4, 0xb3, 0xbb, 0x60, 0x2a, 0x18, 0x12, 0xe6, 0x70, 0x21, 0x2f, + 0x8a, 0x1d, 0x8a, 0x1d, 0xaf, 0xce, 0x02, 0x57, 0xc5, 0xbb, 0xb6, 0x00, 0x93, 0x69, 0x57, 0x0c, + 0xf5, 0x4e, 0x8a, 0xb5, 0xab, 0x7d, 0x67, 0xc5, 0x5e, 0x68, 0xb0, 0x01, 0xe7, 0x1f, 0x1c, 0x35, + 0x87, 0x74, 0xce, 0x0f, 0x9a, 0xeb, 0xcf, 0xc6, 0x3a, 0x91, 0xab, 0xe5, 0x54, 0xb9, 0xdd, 0xfc, + 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0x07, 0x5d, 0x72, 0xe8, 0x18, 0x00, 0x00, } diff --git a/examples/proto/examplepb/a_bit_of_everything.proto b/examples/proto/examplepb/a_bit_of_everything.proto index c7d5d597317..670bf6bb197 100644 --- a/examples/proto/examplepb/a_bit_of_everything.proto +++ b/examples/proto/examplepb/a_bit_of_everything.proto @@ -94,6 +94,34 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = { value: {}; } } + responses: { + key: "403"; + value: { + description: "Returned when the user does not have permission to access the resource."; + } + } + responses: { + key: "404"; + value: { + description: "Returned when the resource does not exist."; + schema: { + json_schema: { + type: STRING; + } + } + } + } + responses: { + key: "418"; + value: { + description: "I'm a teapot."; + schema: { + json_schema: { + ref: ".grpc.gateway.examples.examplepb.NumericEnum"; + } + } + } + } }; @@ -101,6 +129,10 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = { // NEXT ID: 30 message ABitOfEverything { option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = { + json_schema: { + title: "A bit of everything" + description: "Intentionaly complicated message type to cover much features of Protobuf." + } external_docs: { url: "https://github.com/grpc-ecosystem/grpc-gateway"; description: "Find out more about ABitOfEverything"; @@ -155,7 +187,7 @@ message ABitOfEverything { google.protobuf.Timestamp timestamp_value = 27; - // repeated enum value. it is comma-separated in query + // repeated enum value. it is comma-separated in query repeated NumericEnum repeated_enum_value = 28; } @@ -271,6 +303,24 @@ service ABitOfEverythingService { url: "https://github.com/grpc-ecosystem/grpc-gateway"; description: "Find out more Echo"; } + responses: { + key: "503"; + value: { + description: "Returned when the resource is temporarily unavailable."; + } + } + responses: { + // Overwrites global definition. + key: "404"; + value: { + description: "Returned when the resource does not exist."; + schema: { + json_schema: { + type: INTEGER; + } + } + } + } }; } rpc DeepPathEcho(ABitOfEverything) returns (ABitOfEverything) { diff --git a/examples/proto/examplepb/a_bit_of_everything.swagger.json b/examples/proto/examplepb/a_bit_of_everything.swagger.json index aa7f2479021..a9b9be6d15c 100644 --- a/examples/proto/examplepb/a_bit_of_everything.swagger.json +++ b/examples/proto/examplepb/a_bit_of_everything.swagger.json @@ -32,6 +32,22 @@ "schema": { "$ref": "#/definitions/examplepbABitOfEverything" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -60,6 +76,27 @@ "schema": { "$ref": "#/definitions/subStringMessage" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "type": "int32", + "format": "integer" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } + }, + "503": { + "description": "Returned when the resource is temporarily unavailable.", + "schema": {} } }, "parameters": [ @@ -89,6 +126,22 @@ "schema": { "$ref": "#/definitions/protobufEmpty" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -302,6 +355,22 @@ "schema": { "$ref": "#/definitions/examplepbABitOfEverything" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -423,6 +492,22 @@ "schema": { "$ref": "#/definitions/examplepbABitOfEverything" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -455,6 +540,22 @@ "schema": { "$ref": "#/definitions/examplepbABitOfEverything" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -477,6 +578,22 @@ "schema": { "$ref": "#/definitions/protobufEmpty" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -508,6 +625,22 @@ "schema": { "$ref": "#/definitions/protobufEmpty" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -542,6 +675,27 @@ "schema": { "$ref": "#/definitions/subStringMessage" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "type": "int32", + "format": "integer" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } + }, + "503": { + "description": "Returned when the resource is temporarily unavailable.", + "schema": {} } }, "parameters": [ @@ -571,6 +725,27 @@ "schema": { "$ref": "#/definitions/subStringMessage" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "type": "int32", + "format": "integer" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } + }, + "503": { + "description": "Returned when the resource is temporarily unavailable.", + "schema": {} } }, "parameters": [ @@ -602,6 +777,22 @@ "schema": { "$ref": "#/definitions/protobufEmpty" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "tags": [ @@ -618,6 +809,22 @@ "schema": { "$ref": "#/definitions/protobufEmpty" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "tags": [ @@ -634,6 +841,22 @@ "schema": { "$ref": "#/definitions/protobufEmpty" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -666,6 +889,22 @@ "schema": { "$ref": "#/definitions/protobufEmpty" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "tags": [ @@ -682,6 +921,22 @@ "schema": { "$ref": "#/definitions/protobufEmpty" } + }, + "403": { + "description": "Returned when the user does not have permission to access the resource.", + "schema": {} + }, + "404": { + "description": "Returned when the resource does not exist.", + "schema": { + "format": "string" + } + }, + "418": { + "description": "I'm a teapot.", + "schema": { + "$ref": "#/definitions/examplepbNumericEnum" + } } }, "parameters": [ @@ -855,7 +1110,8 @@ "title": "repeated enum value. it is comma-separated in query" } }, - "title": "Intentionaly complicated message type to cover much features of Protobuf.\nNEXT ID: 30", + "description": "Intentionaly complicated message type to cover much features of Protobuf.", + "title": "A bit of everything", "externalDocs": { "description": "Find out more about ABitOfEverything", "url": "https://github.com/grpc-ecosystem/grpc-gateway" diff --git a/examples/proto/examplepb/echo_service.pb.go b/examples/proto/examplepb/echo_service.pb.go index 42a70d155e9..c99f75b69cc 100644 --- a/examples/proto/examplepb/echo_service.pb.go +++ b/examples/proto/examplepb/echo_service.pb.go @@ -71,10 +71,10 @@ type isEmbedded_Mark interface { } type Embedded_Progress struct { - Progress int64 `protobuf:"varint,1,opt,name=progress,oneof"` + Progress int64 `protobuf:"varint,1,opt,name=progress,proto3,oneof"` } type Embedded_Note struct { - Note string `protobuf:"bytes,2,opt,name=note,oneof"` + Note string `protobuf:"bytes,2,opt,name=note,proto3,oneof"` } func (*Embedded_Progress) isEmbedded_Mark() {} @@ -169,13 +169,13 @@ func _Embedded_OneofSizer(msg proto.Message) (n int) { // SimpleMessage represents a simple message sent to the Echo service. type SimpleMessage struct { // Id represents the message identifier. - Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` - Num int64 `protobuf:"varint,2,opt,name=num" json:"num,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Num int64 `protobuf:"varint,2,opt,name=num,proto3" json:"num,omitempty"` // Types that are valid to be assigned to Code: // *SimpleMessage_LineNum // *SimpleMessage_Lang Code isSimpleMessage_Code `protobuf_oneof:"code"` - Status *Embedded `protobuf:"bytes,5,opt,name=status" json:"status,omitempty"` + Status *Embedded `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"` // Types that are valid to be assigned to Ext: // *SimpleMessage_En // *SimpleMessage_No @@ -217,16 +217,16 @@ type isSimpleMessage_Ext interface { } type SimpleMessage_LineNum struct { - LineNum int64 `protobuf:"varint,3,opt,name=line_num,json=lineNum,oneof"` + LineNum int64 `protobuf:"varint,3,opt,name=line_num,json=lineNum,proto3,oneof"` } type SimpleMessage_Lang struct { - Lang string `protobuf:"bytes,4,opt,name=lang,oneof"` + Lang string `protobuf:"bytes,4,opt,name=lang,proto3,oneof"` } type SimpleMessage_En struct { - En int64 `protobuf:"varint,6,opt,name=en,oneof"` + En int64 `protobuf:"varint,6,opt,name=en,proto3,oneof"` } type SimpleMessage_No struct { - No *Embedded `protobuf:"bytes,7,opt,name=no,oneof"` + No *Embedded `protobuf:"bytes,7,opt,name=no,proto3,oneof"` } func (*SimpleMessage_LineNum) isSimpleMessage_Code() {} diff --git a/examples/proto/examplepb/flow_combination.pb.go b/examples/proto/examplepb/flow_combination.pb.go index 55be4381b5e..25e2b775e50 100644 --- a/examples/proto/examplepb/flow_combination.pb.go +++ b/examples/proto/examplepb/flow_combination.pb.go @@ -55,9 +55,9 @@ func (m *EmptyProto) XXX_DiscardUnknown() { var xxx_messageInfo_EmptyProto proto.InternalMessageInfo type NonEmptyProto struct { - A string `protobuf:"bytes,1,opt,name=a" json:"a,omitempty"` - B string `protobuf:"bytes,2,opt,name=b" json:"b,omitempty"` - C string `protobuf:"bytes,3,opt,name=c" json:"c,omitempty"` + A string `protobuf:"bytes,1,opt,name=a,proto3" json:"a,omitempty"` + B string `protobuf:"bytes,2,opt,name=b,proto3" json:"b,omitempty"` + C string `protobuf:"bytes,3,opt,name=c,proto3" json:"c,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -109,7 +109,7 @@ func (m *NonEmptyProto) GetC() string { } type UnaryProto struct { - Str string `protobuf:"bytes,1,opt,name=str" json:"str,omitempty"` + Str string `protobuf:"bytes,1,opt,name=str,proto3" json:"str,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -147,9 +147,9 @@ func (m *UnaryProto) GetStr() string { } type NestedProto struct { - A *UnaryProto `protobuf:"bytes,1,opt,name=a" json:"a,omitempty"` - B string `protobuf:"bytes,2,opt,name=b" json:"b,omitempty"` - C string `protobuf:"bytes,3,opt,name=c" json:"c,omitempty"` + A *UnaryProto `protobuf:"bytes,1,opt,name=a,proto3" json:"a,omitempty"` + B string `protobuf:"bytes,2,opt,name=b,proto3" json:"b,omitempty"` + C string `protobuf:"bytes,3,opt,name=c,proto3" json:"c,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -201,7 +201,7 @@ func (m *NestedProto) GetC() string { } type SingleNestedProto struct { - A *UnaryProto `protobuf:"bytes,1,opt,name=a" json:"a,omitempty"` + A *UnaryProto `protobuf:"bytes,1,opt,name=a,proto3" json:"a,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/examples/proto/examplepb/unannotated_echo_service.pb.go b/examples/proto/examplepb/unannotated_echo_service.pb.go index 733ab6e8162..28f0d7311d0 100644 --- a/examples/proto/examplepb/unannotated_echo_service.pb.go +++ b/examples/proto/examplepb/unannotated_echo_service.pb.go @@ -37,9 +37,9 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // UnannotatedSimpleMessage represents a simple message sent to the unannotated Echo service. type UnannotatedSimpleMessage struct { // Id represents the message identifier. - Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` - Num int64 `protobuf:"varint,2,opt,name=num" json:"num,omitempty"` - Duration *duration.Duration `protobuf:"bytes,3,opt,name=duration" json:"duration,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Num int64 `protobuf:"varint,2,opt,name=num,proto3" json:"num,omitempty"` + Duration *duration.Duration `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/examples/proto/examplepb/wrappers.pb.go b/examples/proto/examplepb/wrappers.pb.go index a5065f9d378..f3caeaf4e6b 100644 --- a/examples/proto/examplepb/wrappers.pb.go +++ b/examples/proto/examplepb/wrappers.pb.go @@ -26,12 +26,12 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type Wrappers struct { - StringValue *wrappers.StringValue `protobuf:"bytes,1,opt,name=string_value,json=stringValue" json:"string_value,omitempty"` - Int32Value *wrappers.Int32Value `protobuf:"bytes,2,opt,name=int32_value,json=int32Value" json:"int32_value,omitempty"` - Int64Value *wrappers.Int64Value `protobuf:"bytes,3,opt,name=int64_value,json=int64Value" json:"int64_value,omitempty"` - FloatValue *wrappers.FloatValue `protobuf:"bytes,4,opt,name=float_value,json=floatValue" json:"float_value,omitempty"` - DoubleValue *wrappers.DoubleValue `protobuf:"bytes,5,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"` - BoolValue *wrappers.BoolValue `protobuf:"bytes,6,opt,name=bool_value,json=boolValue" json:"bool_value,omitempty"` + StringValue *wrappers.StringValue `protobuf:"bytes,1,opt,name=string_value,json=stringValue,proto3" json:"string_value,omitempty"` + Int32Value *wrappers.Int32Value `protobuf:"bytes,2,opt,name=int32_value,json=int32Value,proto3" json:"int32_value,omitempty"` + Int64Value *wrappers.Int64Value `protobuf:"bytes,3,opt,name=int64_value,json=int64Value,proto3" json:"int64_value,omitempty"` + FloatValue *wrappers.FloatValue `protobuf:"bytes,4,opt,name=float_value,json=floatValue,proto3" json:"float_value,omitempty"` + DoubleValue *wrappers.DoubleValue `protobuf:"bytes,5,opt,name=double_value,json=doubleValue,proto3" json:"double_value,omitempty"` + BoolValue *wrappers.BoolValue `protobuf:"bytes,6,opt,name=bool_value,json=boolValue,proto3" json:"bool_value,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/examples/proto/sub2/message.pb.go b/examples/proto/sub2/message.pb.go index a0a812c7d0f..6819b67ae3c 100644 --- a/examples/proto/sub2/message.pb.go +++ b/examples/proto/sub2/message.pb.go @@ -19,7 +19,7 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type IdMessage struct { - Uuid string `protobuf:"bytes,1,opt,name=uuid" json:"uuid,omitempty"` + Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` diff --git a/protoc-gen-swagger/genswagger/template.go b/protoc-gen-swagger/genswagger/template.go index c4f2b8d81aa..5f58e27cf0e 100644 --- a/protoc-gen-swagger/genswagger/template.go +++ b/protoc-gen-swagger/genswagger/template.go @@ -84,7 +84,7 @@ func queryParams(message *descriptor.Message, field *descriptor.Field, prefix st return nil, nil } } - schema := schemaOfField(field, reg) + schema := schemaOfField(field, reg, nil) fieldType := field.GetTypeName() if message.File != nil { comments := fieldProtoComments(reg, message, field) @@ -192,7 +192,7 @@ func findNestedMessagesAndEnumerations(message *descriptor.Message, reg *descrip } } -func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, reg *descriptor.Registry) { +func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, reg *descriptor.Registry, customRefs refMap) { for name, msg := range messages { switch name { case ".google.protobuf.Timestamp": @@ -229,23 +229,23 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, panic(err) } if opts != nil { - if opts.ExternalDocs != nil { - if schema.ExternalDocs == nil { - schema.ExternalDocs = &swaggerExternalDocumentationObject{} - } - if opts.ExternalDocs.Description != "" { - schema.ExternalDocs.Description = opts.ExternalDocs.Description - } - if opts.ExternalDocs.Url != "" { - schema.ExternalDocs.URL = opts.ExternalDocs.Url - } - } + protoSchema := swaggerSchemaFromProtoSchema(opts, reg, customRefs) - // TODO(ivucica): add remaining fields of schema object + // Warning: Make sure not to overwrite any fields already set on the schema type. + schema.ExternalDocs = protoSchema.ExternalDocs + if protoSchema.schemaCore.Type != "" || protoSchema.schemaCore.Ref != "" { + schema.schemaCore = protoSchema.schemaCore + } + if protoSchema.Title != "" { + schema.Title = protoSchema.Title + } + if protoSchema.Description != "" { + schema.Description = protoSchema.Description + } } for _, f := range msg.Fields { - fieldValue := schemaOfField(f, reg) + fieldValue := schemaOfField(f, reg, customRefs) comments := fieldProtoComments(reg, msg, f) if err := updateSwaggerDataFromComments(&fieldValue, comments); err != nil { panic(err) @@ -258,7 +258,7 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, } // schemaOfField returns a swagger Schema Object for a protobuf field. -func schemaOfField(f *descriptor.Field, reg *descriptor.Registry) swaggerSchemaObject { +func schemaOfField(f *descriptor.Field, reg *descriptor.Registry, refs refMap) swaggerSchemaObject { const ( singular = 0 array = 1 @@ -288,6 +288,9 @@ func schemaOfField(f *descriptor.Field, reg *descriptor.Registry) swaggerSchemaO core = schemaCore{ Ref: "#/definitions/" + fullyQualifiedNameToSwaggerName(fd.GetTypeName(), reg), } + if refs != nil { + refs[fd.GetTypeName()] = struct{}{} + } } default: ftype, format, ok := primitiveSchema(ft) @@ -512,7 +515,7 @@ func templateToSwaggerPath(path string) string { return strings.Join(parts, "/") } -func renderServices(services []*descriptor.Service, paths swaggerPathsObject, reg *descriptor.Registry, refs refMap) error { +func renderServices(services []*descriptor.Service, paths swaggerPathsObject, reg *descriptor.Registry, requestResponseRefs refMap, customRefs refMap) error { // Correctness of svcIdx and methIdx depends on 'services' containing the services in the same order as the 'file.Service' array. for svcIdx, svc := range services { for methIdx, meth := range svc.Methods { @@ -525,7 +528,7 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re switch pt := parameter.Target.GetType(); pt { case pbdescriptor.FieldDescriptorProto_TYPE_GROUP, pbdescriptor.FieldDescriptorProto_TYPE_MESSAGE: if descriptor.IsWellKnownType(parameter.Target.GetTypeName()) { - schema := schemaOfField(parameter.Target, reg) + schema := schemaOfField(parameter.Target, reg, customRefs) paramType = schema.Type paramFormat = schema.Format } else { @@ -563,7 +566,7 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re } } else { lastField := b.Body.FieldPath[len(b.Body.FieldPath)-1] - schema = schemaOfField(lastField.Target, reg) + schema = schemaOfField(lastField.Target, reg, customRefs) } desc := "" @@ -620,7 +623,7 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re // Fill reference map with referenced request messages for _, param := range operationObject.Parameters { if param.Schema != nil && param.Schema.Ref != "" { - refs[param.Schema.Ref] = struct{}{} + requestResponseRefs[param.Schema.Ref] = struct{}{} } } @@ -634,17 +637,7 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re if err != nil { panic(err) } - if opts.ExternalDocs != nil { - if operationObject.ExternalDocs == nil { - operationObject.ExternalDocs = &swaggerExternalDocumentationObject{} - } - if opts.ExternalDocs.Description != "" { - operationObject.ExternalDocs.Description = opts.ExternalDocs.Description - } - if opts.ExternalDocs.Url != "" { - operationObject.ExternalDocs.URL = opts.ExternalDocs.Url - } - } + operationObject.ExternalDocs = protoExternalDocumentationToSwaggerExternalDocumentation(opts.ExternalDocs) // TODO(ivucica): this would be better supported by looking whether the method is deprecated in the proto file operationObject.Deprecated = opts.Deprecated @@ -676,6 +669,14 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re } operationObject.Security = newSecurity } + if opts.Responses != nil { + for name, resp := range opts.Responses { + operationObject.Responses[name] = swaggerResponseObject{ + Description: resp.Description, + Schema: swaggerSchemaFromProtoSchema(resp.Schema, reg, customRefs), + } + } + } // TODO(ivucica): add remaining fields of operation object } @@ -726,17 +727,18 @@ func applyTemplate(p param) (*swaggerObject, error) { // Loops through all the services and their exposed GET/POST/PUT/DELETE definitions // and create entries for all of them. - refs := refMap{} - if err := renderServices(p.Services, s.Paths, p.reg, refs); err != nil { + // Also adds custom user specified references to second map. + requestResponseRefs, customRefs := refMap{}, refMap{} + if err := renderServices(p.Services, s.Paths, p.reg, requestResponseRefs, customRefs); err != nil { panic(err) } - // Find all the service's messages and enumerations that are defined (recursively) and then - // write their request and response types out as definition objects. + // Find all the service's messages and enumerations that are defined (recursively) + // and write request, response and referenced types out as definition objects. m := messageMap{} e := enumMap{} - findServicesMessagesAndEnumerations(p.Services, p.reg, m, e, refs) - renderMessagesAsDefinition(m, s.Definitions, p.reg) + findServicesMessagesAndEnumerations(p.Services, p.reg, m, e, requestResponseRefs) + renderMessagesAsDefinition(m, s.Definitions, p.reg, customRefs) renderEnumerationsAsDefinition(e, s.Definitions, p.reg) // File itself might have some comments and metadata. @@ -885,15 +887,40 @@ func applyTemplate(p param) (*swaggerObject, error) { } s.Security = newSecurity } - if spb.ExternalDocs != nil { - if s.ExternalDocs == nil { - s.ExternalDocs = &swaggerExternalDocumentationObject{} - } - if spb.ExternalDocs.Description != "" { - s.ExternalDocs.Description = spb.ExternalDocs.Description - } - if spb.ExternalDocs.Url != "" { - s.ExternalDocs.URL = spb.ExternalDocs.Url + s.ExternalDocs = protoExternalDocumentationToSwaggerExternalDocumentation(spb.ExternalDocs) + // Populate all Paths with Responses set at top level, + // preferring Responses already set over those at the top level. + if spb.Responses != nil { + for _, verbs := range s.Paths { + var maps []swaggerResponsesObject + if verbs.Delete != nil { + maps = append(maps, verbs.Delete.Responses) + } + if verbs.Get != nil { + maps = append(maps, verbs.Get.Responses) + } + if verbs.Post != nil { + maps = append(maps, verbs.Post.Responses) + } + if verbs.Put != nil { + maps = append(maps, verbs.Put.Responses) + } + if verbs.Patch != nil { + maps = append(maps, verbs.Patch.Responses) + } + + for k, v := range spb.Responses { + for _, respMap := range maps { + if _, ok := respMap[k]; ok { + // Don't overwrite already existing Responses + continue + } + respMap[k] = swaggerResponseObject{ + Description: v.Description, + Schema: swaggerSchemaFromProtoSchema(v.Schema, p.reg, customRefs), + } + } + } } } @@ -901,6 +928,10 @@ func applyTemplate(p param) (*swaggerObject, error) { // should be added here, once supported in the proto. } + // Finally add any references added by users that aren't + // otherwise rendered. + addCustomRefs(s.Definitions, p.reg, customRefs) + return &s, nil } @@ -1187,3 +1218,108 @@ func extractSwaggerOptionFromFileDescriptor(file *pbdescriptor.FileDescriptorPro } return opts, nil } + +func swaggerSchemaFromProtoSchema(s *swagger_options.Schema, reg *descriptor.Registry, refs refMap) swaggerSchemaObject { + ret := swaggerSchemaObject{ + ExternalDocs: protoExternalDocumentationToSwaggerExternalDocumentation(s.GetExternalDocs()), + Title: s.GetJsonSchema().GetTitle(), + Description: s.GetJsonSchema().GetDescription(), + // TODO(johanbrandhorst): Add more fields? + } + if s.GetJsonSchema().GetRef() != "" { + swaggerName := fullyQualifiedNameToSwaggerName(s.GetJsonSchema().GetRef(), reg) + if swaggerName != "" { + ret.schemaCore.Ref = "#/definitions/" + swaggerName + if refs != nil { + refs[s.GetJsonSchema().GetRef()] = struct{}{} + } + } else { + ret.schemaCore.Ref += s.GetJsonSchema().GetRef() + } + } else { + f, t := protoJSONSchemaTypeToFormat(s.GetJsonSchema().GetType()) + ret.schemaCore.Format = f + ret.schemaCore.Type = t + } + return ret +} + +func protoJSONSchemaTypeToFormat(in []swagger_options.JSONSchema_JSONSchemaSimpleTypes) (string, string) { + if len(in) == 0 { + return "", "" + } + + // Can't support more than 1 type, just return the first element. + // This is due to an inconsistency in the design of the openapiv2 proto + // and that used in schemaCore. schemaCore uses the v3 definition of types, + // which only allows a single string, while the openapiv2 proto uses the OpenAPI v2 + // definition, which defers to the JSON schema definition, which allows a string or an array. + // Sources: + // https://swagger.io/specification/#itemsObject + // https://tools.ietf.org/html/draft-fge-json-schema-validation-00#section-5.5.2 + switch in[0] { + case swagger_options.JSONSchema_UNKNOWN, swagger_options.JSONSchema_NULL: + return "", "" + case swagger_options.JSONSchema_OBJECT: + return "object", "" + case swagger_options.JSONSchema_ARRAY: + return "array", "" + case swagger_options.JSONSchema_BOOLEAN: + return "boolean", "boolean" + case swagger_options.JSONSchema_INTEGER: + return "integer", "int32" + case swagger_options.JSONSchema_NUMBER: + return "number", "double" + case swagger_options.JSONSchema_STRING: + // NOTE: in swagger specifition, format should be empty on string type + return "string", "" + default: + // Maybe panic? + return "", "" + } +} + +func protoExternalDocumentationToSwaggerExternalDocumentation(in *swagger_options.ExternalDocumentation) *swaggerExternalDocumentationObject { + if in == nil { + return nil + } + + return &swaggerExternalDocumentationObject{ + Description: in.Description, + URL: in.Url, + } +} + +func addCustomRefs(d swaggerDefinitionsObject, reg *descriptor.Registry, refs refMap) { + msgMap := make(messageMap) + enumMap := make(enumMap) + added := 0 + for ref := range refs { + if _, ok := d[fullyQualifiedNameToSwaggerName(ref, reg)]; ok { + // Skip already existing definitions + continue + } + added++ + + msg, err := reg.LookupMsg("", ref) + if err == nil { + msgMap[fullyQualifiedNameToSwaggerName(ref, reg)] = msg + continue + } + enum, err := reg.LookupEnum("", ref) + if err == nil { + enumMap[fullyQualifiedNameToSwaggerName(ref, reg)] = enum + continue + } + // ?? Should be either enum or msg + } + renderMessagesAsDefinition(msgMap, d, reg, refs) + renderEnumerationsAsDefinition(enumMap, d, reg) + + if added == 0 { + return + } + + // Run again in case any new refs were added + addCustomRefs(d, reg, refs) +} diff --git a/protoc-gen-swagger/genswagger/template_test.go b/protoc-gen-swagger/genswagger/template_test.go index e01bbc34ec2..115391ee352 100644 --- a/protoc-gen-swagger/genswagger/template_test.go +++ b/protoc-gen-swagger/genswagger/template_test.go @@ -1,6 +1,7 @@ package genswagger import ( + "fmt" "reflect" "testing" @@ -9,7 +10,6 @@ import ( plugin "github.com/golang/protobuf/protoc-gen-go/plugin" "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule" - "fmt" ) func crossLinkFixture(f *descriptor.File) *descriptor.File { @@ -773,6 +773,7 @@ func TestFQMNtoSwaggerName(t *testing.T) { func TestSchemaOfField(t *testing.T) { type test struct { field *descriptor.Field + refs refMap expected schemaCore } @@ -784,6 +785,7 @@ func TestSchemaOfField(t *testing.T) { Type: protodescriptor.FieldDescriptorProto_TYPE_STRING.Enum(), }, }, + refs: make(refMap), expected: schemaCore{ Type: "string", }, @@ -796,6 +798,7 @@ func TestSchemaOfField(t *testing.T) { Label: protodescriptor.FieldDescriptorProto_LABEL_REPEATED.Enum(), }, }, + refs: make(refMap), expected: schemaCore{ Type: "array", Items: &swaggerItemsObject{ @@ -811,6 +814,7 @@ func TestSchemaOfField(t *testing.T) { Type: protodescriptor.FieldDescriptorProto_TYPE_MESSAGE.Enum(), }, }, + refs: make(refMap), expected: schemaCore{ Type: "string", }, @@ -824,6 +828,7 @@ func TestSchemaOfField(t *testing.T) { Label: protodescriptor.FieldDescriptorProto_LABEL_REPEATED.Enum(), }, }, + refs: make(refMap), expected: schemaCore{ Type: "array", Items: &swaggerItemsObject{ @@ -839,6 +844,7 @@ func TestSchemaOfField(t *testing.T) { Type: protodescriptor.FieldDescriptorProto_TYPE_MESSAGE.Enum(), }, }, + refs: refMap{".example.Message": struct{}{}}, expected: schemaCore{ Ref: "#/definitions/exampleMessage", }, @@ -875,7 +881,8 @@ func TestSchemaOfField(t *testing.T) { }) for _, test := range tests { - actual := schemaOfField(test.field, reg) + refs := make(refMap) + actual := schemaOfField(test.field, reg, refs) if e, a := test.expected.Type, actual.Type; e != a { t.Errorf("Expected schemaOfField(%v).Type = %s, actual: %s", test.field, e, a) } @@ -885,5 +892,8 @@ func TestSchemaOfField(t *testing.T) { if e, a := test.expected.Items.getType(), actual.Items.getType(); e != a { t.Errorf("Expected schemaOfField(%v).Items.Type = %v, actual.Type: %v", test.field, e, a) } + if !reflect.DeepEqual(refs, test.refs) { + t.Errorf("Expected schemaOfField(%v) to add refs %v, not %v", test.field, test.refs, refs) + } } } diff --git a/protoc-gen-swagger/options/openapiv2.pb.go b/protoc-gen-swagger/options/openapiv2.pb.go index be2342b7154..931bc38f441 100644 --- a/protoc-gen-swagger/options/openapiv2.pb.go +++ b/protoc-gen-swagger/options/openapiv2.pb.go @@ -48,7 +48,7 @@ func (x Swagger_SwaggerScheme) String() string { return proto.EnumName(Swagger_SwaggerScheme_name, int32(x)) } func (Swagger_SwaggerScheme) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{0, 0} + return fileDescriptor_openapiv2_5363312922dcb572, []int{0, 0} } type JSONSchema_JSONSchemaSimpleTypes int32 @@ -89,7 +89,7 @@ func (x JSONSchema_JSONSchemaSimpleTypes) String() string { return proto.EnumName(JSONSchema_JSONSchemaSimpleTypes_name, int32(x)) } func (JSONSchema_JSONSchemaSimpleTypes) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{6, 0} + return fileDescriptor_openapiv2_5363312922dcb572, []int{7, 0} } // Required. The type of the security scheme. Valid values are "basic", @@ -120,7 +120,7 @@ func (x SecurityScheme_Type) String() string { return proto.EnumName(SecurityScheme_Type_name, int32(x)) } func (SecurityScheme_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{9, 0} + return fileDescriptor_openapiv2_5363312922dcb572, []int{10, 0} } // Required. The location of the API key. Valid values are "query" or "header". @@ -147,7 +147,7 @@ func (x SecurityScheme_In) String() string { return proto.EnumName(SecurityScheme_In_name, int32(x)) } func (SecurityScheme_In) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{9, 1} + return fileDescriptor_openapiv2_5363312922dcb572, []int{10, 1} } // Required. The flow used by the OAuth2 security scheme. Valid values are @@ -181,7 +181,7 @@ func (x SecurityScheme_Flow) String() string { return proto.EnumName(SecurityScheme_Flow_name, int32(x)) } func (SecurityScheme_Flow) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{9, 2} + return fileDescriptor_openapiv2_5363312922dcb572, []int{10, 2} } // `Swagger` is a representation of OpenAPI v2 specification's Swagger object. @@ -190,16 +190,17 @@ func (SecurityScheme_Flow) EnumDescriptor() ([]byte, []int) { // // TODO(ivucica): document fields type Swagger struct { - Swagger string `protobuf:"bytes,1,opt,name=swagger" json:"swagger,omitempty"` - Info *Info `protobuf:"bytes,2,opt,name=info" json:"info,omitempty"` - Host string `protobuf:"bytes,3,opt,name=host" json:"host,omitempty"` - BasePath string `protobuf:"bytes,4,opt,name=base_path,json=basePath" json:"base_path,omitempty"` - Schemes []Swagger_SwaggerScheme `protobuf:"varint,5,rep,packed,name=schemes,enum=grpc.gateway.protoc_gen_swagger.options.Swagger_SwaggerScheme" json:"schemes,omitempty"` - Consumes []string `protobuf:"bytes,6,rep,name=consumes" json:"consumes,omitempty"` - Produces []string `protobuf:"bytes,7,rep,name=produces" json:"produces,omitempty"` - SecurityDefinitions *SecurityDefinitions `protobuf:"bytes,11,opt,name=security_definitions,json=securityDefinitions" json:"security_definitions,omitempty"` - Security []*SecurityRequirement `protobuf:"bytes,12,rep,name=security" json:"security,omitempty"` - ExternalDocs *ExternalDocumentation `protobuf:"bytes,14,opt,name=external_docs,json=externalDocs" json:"external_docs,omitempty"` + Swagger string `protobuf:"bytes,1,opt,name=swagger,proto3" json:"swagger,omitempty"` + Info *Info `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"` + Host string `protobuf:"bytes,3,opt,name=host,proto3" json:"host,omitempty"` + BasePath string `protobuf:"bytes,4,opt,name=base_path,json=basePath,proto3" json:"base_path,omitempty"` + Schemes []Swagger_SwaggerScheme `protobuf:"varint,5,rep,packed,name=schemes,proto3,enum=grpc.gateway.protoc_gen_swagger.options.Swagger_SwaggerScheme" json:"schemes,omitempty"` + Consumes []string `protobuf:"bytes,6,rep,name=consumes,proto3" json:"consumes,omitempty"` + Produces []string `protobuf:"bytes,7,rep,name=produces,proto3" json:"produces,omitempty"` + Responses map[string]*Response `protobuf:"bytes,10,rep,name=responses,proto3" json:"responses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + SecurityDefinitions *SecurityDefinitions `protobuf:"bytes,11,opt,name=security_definitions,json=securityDefinitions,proto3" json:"security_definitions,omitempty"` + Security []*SecurityRequirement `protobuf:"bytes,12,rep,name=security,proto3" json:"security,omitempty"` + ExternalDocs *ExternalDocumentation `protobuf:"bytes,14,opt,name=external_docs,json=externalDocs,proto3" json:"external_docs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -209,7 +210,7 @@ func (m *Swagger) Reset() { *m = Swagger{} } func (m *Swagger) String() string { return proto.CompactTextString(m) } func (*Swagger) ProtoMessage() {} func (*Swagger) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{0} + return fileDescriptor_openapiv2_5363312922dcb572, []int{0} } func (m *Swagger) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Swagger.Unmarshal(m, b) @@ -278,6 +279,13 @@ func (m *Swagger) GetProduces() []string { return nil } +func (m *Swagger) GetResponses() map[string]*Response { + if m != nil { + return m.Responses + } + return nil +} + func (m *Swagger) GetSecurityDefinitions() *SecurityDefinitions { if m != nil { return m.SecurityDefinitions @@ -305,16 +313,17 @@ func (m *Swagger) GetExternalDocs() *ExternalDocumentation { // // TODO(ivucica): document fields type Operation struct { - Tags []string `protobuf:"bytes,1,rep,name=tags" json:"tags,omitempty"` - Summary string `protobuf:"bytes,2,opt,name=summary" json:"summary,omitempty"` - Description string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"` - ExternalDocs *ExternalDocumentation `protobuf:"bytes,4,opt,name=external_docs,json=externalDocs" json:"external_docs,omitempty"` - OperationId string `protobuf:"bytes,5,opt,name=operation_id,json=operationId" json:"operation_id,omitempty"` - Consumes []string `protobuf:"bytes,6,rep,name=consumes" json:"consumes,omitempty"` - Produces []string `protobuf:"bytes,7,rep,name=produces" json:"produces,omitempty"` - Schemes []string `protobuf:"bytes,10,rep,name=schemes" json:"schemes,omitempty"` - Deprecated bool `protobuf:"varint,11,opt,name=deprecated" json:"deprecated,omitempty"` - Security []*SecurityRequirement `protobuf:"bytes,12,rep,name=security" json:"security,omitempty"` + Tags []string `protobuf:"bytes,1,rep,name=tags,proto3" json:"tags,omitempty"` + Summary string `protobuf:"bytes,2,opt,name=summary,proto3" json:"summary,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + ExternalDocs *ExternalDocumentation `protobuf:"bytes,4,opt,name=external_docs,json=externalDocs,proto3" json:"external_docs,omitempty"` + OperationId string `protobuf:"bytes,5,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"` + Consumes []string `protobuf:"bytes,6,rep,name=consumes,proto3" json:"consumes,omitempty"` + Produces []string `protobuf:"bytes,7,rep,name=produces,proto3" json:"produces,omitempty"` + Responses map[string]*Response `protobuf:"bytes,9,rep,name=responses,proto3" json:"responses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Schemes []string `protobuf:"bytes,10,rep,name=schemes,proto3" json:"schemes,omitempty"` + Deprecated bool `protobuf:"varint,11,opt,name=deprecated,proto3" json:"deprecated,omitempty"` + Security []*SecurityRequirement `protobuf:"bytes,12,rep,name=security,proto3" json:"security,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -324,7 +333,7 @@ func (m *Operation) Reset() { *m = Operation{} } func (m *Operation) String() string { return proto.CompactTextString(m) } func (*Operation) ProtoMessage() {} func (*Operation) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{1} + return fileDescriptor_openapiv2_5363312922dcb572, []int{1} } func (m *Operation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Operation.Unmarshal(m, b) @@ -393,6 +402,13 @@ func (m *Operation) GetProduces() []string { return nil } +func (m *Operation) GetResponses() map[string]*Response { + if m != nil { + return m.Responses + } + return nil +} + func (m *Operation) GetSchemes() []string { if m != nil { return m.Schemes @@ -414,17 +430,71 @@ func (m *Operation) GetSecurity() []*SecurityRequirement { return nil } +// `Response` is a representation of OpenAPI v2 specification's Response object. +// +// See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#responseObject +// +type Response struct { + // `Description` is a short description of the response. + // GFM syntax can be used for rich text representation. + Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"` + // `Schema` optionally defines the structure of the response. + // If `Schema` is not provided, it means there is no content to the response. + Schema *Schema `protobuf:"bytes,2,opt,name=schema,proto3" json:"schema,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Response) Reset() { *m = Response{} } +func (m *Response) String() string { return proto.CompactTextString(m) } +func (*Response) ProtoMessage() {} +func (*Response) Descriptor() ([]byte, []int) { + return fileDescriptor_openapiv2_5363312922dcb572, []int{2} +} +func (m *Response) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Response.Unmarshal(m, b) +} +func (m *Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Response.Marshal(b, m, deterministic) +} +func (dst *Response) XXX_Merge(src proto.Message) { + xxx_messageInfo_Response.Merge(dst, src) +} +func (m *Response) XXX_Size() int { + return xxx_messageInfo_Response.Size(m) +} +func (m *Response) XXX_DiscardUnknown() { + xxx_messageInfo_Response.DiscardUnknown(m) +} + +var xxx_messageInfo_Response proto.InternalMessageInfo + +func (m *Response) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *Response) GetSchema() *Schema { + if m != nil { + return m.Schema + } + return nil +} + // `Info` is a representation of OpenAPI v2 specification's Info object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#infoObject // // TODO(ivucica): document fields type Info struct { - Title string `protobuf:"bytes,1,opt,name=title" json:"title,omitempty"` - Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"` - TermsOfService string `protobuf:"bytes,3,opt,name=terms_of_service,json=termsOfService" json:"terms_of_service,omitempty"` - Contact *Contact `protobuf:"bytes,4,opt,name=contact" json:"contact,omitempty"` - Version string `protobuf:"bytes,6,opt,name=version" json:"version,omitempty"` + Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + TermsOfService string `protobuf:"bytes,3,opt,name=terms_of_service,json=termsOfService,proto3" json:"terms_of_service,omitempty"` + Contact *Contact `protobuf:"bytes,4,opt,name=contact,proto3" json:"contact,omitempty"` + Version string `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -434,7 +504,7 @@ func (m *Info) Reset() { *m = Info{} } func (m *Info) String() string { return proto.CompactTextString(m) } func (*Info) ProtoMessage() {} func (*Info) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{2} + return fileDescriptor_openapiv2_5363312922dcb572, []int{3} } func (m *Info) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Info.Unmarshal(m, b) @@ -495,9 +565,9 @@ func (m *Info) GetVersion() string { // // TODO(ivucica): document fields type Contact struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Url string `protobuf:"bytes,2,opt,name=url" json:"url,omitempty"` - Email string `protobuf:"bytes,3,opt,name=email" json:"email,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"` + Email string `protobuf:"bytes,3,opt,name=email,proto3" json:"email,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -507,7 +577,7 @@ func (m *Contact) Reset() { *m = Contact{} } func (m *Contact) String() string { return proto.CompactTextString(m) } func (*Contact) ProtoMessage() {} func (*Contact) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{3} + return fileDescriptor_openapiv2_5363312922dcb572, []int{4} } func (m *Contact) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Contact.Unmarshal(m, b) @@ -555,8 +625,8 @@ func (m *Contact) GetEmail() string { // // TODO(ivucica): document fields type ExternalDocumentation struct { - Description string `protobuf:"bytes,1,opt,name=description" json:"description,omitempty"` - Url string `protobuf:"bytes,2,opt,name=url" json:"url,omitempty"` + Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"` + Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -566,7 +636,7 @@ func (m *ExternalDocumentation) Reset() { *m = ExternalDocumentation{} } func (m *ExternalDocumentation) String() string { return proto.CompactTextString(m) } func (*ExternalDocumentation) ProtoMessage() {} func (*ExternalDocumentation) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{4} + return fileDescriptor_openapiv2_5363312922dcb572, []int{5} } func (m *ExternalDocumentation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExternalDocumentation.Unmarshal(m, b) @@ -606,11 +676,11 @@ func (m *ExternalDocumentation) GetUrl() string { // // TODO(ivucica): document fields type Schema struct { - JsonSchema *JSONSchema `protobuf:"bytes,1,opt,name=json_schema,json=jsonSchema" json:"json_schema,omitempty"` - Discriminator string `protobuf:"bytes,2,opt,name=discriminator" json:"discriminator,omitempty"` - ReadOnly bool `protobuf:"varint,3,opt,name=read_only,json=readOnly" json:"read_only,omitempty"` - ExternalDocs *ExternalDocumentation `protobuf:"bytes,5,opt,name=external_docs,json=externalDocs" json:"external_docs,omitempty"` - Example *any.Any `protobuf:"bytes,6,opt,name=example" json:"example,omitempty"` + JsonSchema *JSONSchema `protobuf:"bytes,1,opt,name=json_schema,json=jsonSchema,proto3" json:"json_schema,omitempty"` + Discriminator string `protobuf:"bytes,2,opt,name=discriminator,proto3" json:"discriminator,omitempty"` + ReadOnly bool `protobuf:"varint,3,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"` + ExternalDocs *ExternalDocumentation `protobuf:"bytes,5,opt,name=external_docs,json=externalDocs,proto3" json:"external_docs,omitempty"` + Example *any.Any `protobuf:"bytes,6,opt,name=example,proto3" json:"example,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -620,7 +690,7 @@ func (m *Schema) Reset() { *m = Schema{} } func (m *Schema) String() string { return proto.CompactTextString(m) } func (*Schema) ProtoMessage() {} func (*Schema) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{5} + return fileDescriptor_openapiv2_5363312922dcb572, []int{6} } func (m *Schema) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Schema.Unmarshal(m, b) @@ -687,26 +757,33 @@ func (m *Schema) GetExample() *any.Any { // // TODO(ivucica): document fields type JSONSchema struct { - Title string `protobuf:"bytes,5,opt,name=title" json:"title,omitempty"` - Description string `protobuf:"bytes,6,opt,name=description" json:"description,omitempty"` - Default string `protobuf:"bytes,7,opt,name=default" json:"default,omitempty"` - MultipleOf float64 `protobuf:"fixed64,10,opt,name=multiple_of,json=multipleOf" json:"multiple_of,omitempty"` - Maximum float64 `protobuf:"fixed64,11,opt,name=maximum" json:"maximum,omitempty"` - ExclusiveMaximum bool `protobuf:"varint,12,opt,name=exclusive_maximum,json=exclusiveMaximum" json:"exclusive_maximum,omitempty"` - Minimum float64 `protobuf:"fixed64,13,opt,name=minimum" json:"minimum,omitempty"` - ExclusiveMinimum bool `protobuf:"varint,14,opt,name=exclusive_minimum,json=exclusiveMinimum" json:"exclusive_minimum,omitempty"` - MaxLength uint64 `protobuf:"varint,15,opt,name=max_length,json=maxLength" json:"max_length,omitempty"` - MinLength uint64 `protobuf:"varint,16,opt,name=min_length,json=minLength" json:"min_length,omitempty"` - Pattern string `protobuf:"bytes,17,opt,name=pattern" json:"pattern,omitempty"` - MaxItems uint64 `protobuf:"varint,20,opt,name=max_items,json=maxItems" json:"max_items,omitempty"` - MinItems uint64 `protobuf:"varint,21,opt,name=min_items,json=minItems" json:"min_items,omitempty"` - UniqueItems bool `protobuf:"varint,22,opt,name=unique_items,json=uniqueItems" json:"unique_items,omitempty"` - MaxProperties uint64 `protobuf:"varint,24,opt,name=max_properties,json=maxProperties" json:"max_properties,omitempty"` - MinProperties uint64 `protobuf:"varint,25,opt,name=min_properties,json=minProperties" json:"min_properties,omitempty"` - Required []string `protobuf:"bytes,26,rep,name=required" json:"required,omitempty"` + // Ref is used to define an external reference to include in the message. + // This could be a fully qualified proto message reference, and that type must be imported + // into the protofile. If no message is identified, the Ref will be used verbatim in + // the output. + // For example: + // `ref: ".google.protobuf.Timestamp"`. + Ref string `protobuf:"bytes,3,opt,name=ref,proto3" json:"ref,omitempty"` + Title string `protobuf:"bytes,5,opt,name=title,proto3" json:"title,omitempty"` + Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"` + Default string `protobuf:"bytes,7,opt,name=default,proto3" json:"default,omitempty"` + MultipleOf float64 `protobuf:"fixed64,10,opt,name=multiple_of,json=multipleOf,proto3" json:"multiple_of,omitempty"` + Maximum float64 `protobuf:"fixed64,11,opt,name=maximum,proto3" json:"maximum,omitempty"` + ExclusiveMaximum bool `protobuf:"varint,12,opt,name=exclusive_maximum,json=exclusiveMaximum,proto3" json:"exclusive_maximum,omitempty"` + Minimum float64 `protobuf:"fixed64,13,opt,name=minimum,proto3" json:"minimum,omitempty"` + ExclusiveMinimum bool `protobuf:"varint,14,opt,name=exclusive_minimum,json=exclusiveMinimum,proto3" json:"exclusive_minimum,omitempty"` + MaxLength uint64 `protobuf:"varint,15,opt,name=max_length,json=maxLength,proto3" json:"max_length,omitempty"` + MinLength uint64 `protobuf:"varint,16,opt,name=min_length,json=minLength,proto3" json:"min_length,omitempty"` + Pattern string `protobuf:"bytes,17,opt,name=pattern,proto3" json:"pattern,omitempty"` + MaxItems uint64 `protobuf:"varint,20,opt,name=max_items,json=maxItems,proto3" json:"max_items,omitempty"` + MinItems uint64 `protobuf:"varint,21,opt,name=min_items,json=minItems,proto3" json:"min_items,omitempty"` + UniqueItems bool `protobuf:"varint,22,opt,name=unique_items,json=uniqueItems,proto3" json:"unique_items,omitempty"` + MaxProperties uint64 `protobuf:"varint,24,opt,name=max_properties,json=maxProperties,proto3" json:"max_properties,omitempty"` + MinProperties uint64 `protobuf:"varint,25,opt,name=min_properties,json=minProperties,proto3" json:"min_properties,omitempty"` + Required []string `protobuf:"bytes,26,rep,name=required,proto3" json:"required,omitempty"` // Items in 'array' must be unique. - Array []string `protobuf:"bytes,34,rep,name=array" json:"array,omitempty"` - Type []JSONSchema_JSONSchemaSimpleTypes `protobuf:"varint,35,rep,packed,name=type,enum=grpc.gateway.protoc_gen_swagger.options.JSONSchema_JSONSchemaSimpleTypes" json:"type,omitempty"` + Array []string `protobuf:"bytes,34,rep,name=array,proto3" json:"array,omitempty"` + Type []JSONSchema_JSONSchemaSimpleTypes `protobuf:"varint,35,rep,packed,name=type,proto3,enum=grpc.gateway.protoc_gen_swagger.options.JSONSchema_JSONSchemaSimpleTypes" json:"type,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -716,7 +793,7 @@ func (m *JSONSchema) Reset() { *m = JSONSchema{} } func (m *JSONSchema) String() string { return proto.CompactTextString(m) } func (*JSONSchema) ProtoMessage() {} func (*JSONSchema) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{6} + return fileDescriptor_openapiv2_5363312922dcb572, []int{7} } func (m *JSONSchema) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JSONSchema.Unmarshal(m, b) @@ -736,6 +813,13 @@ func (m *JSONSchema) XXX_DiscardUnknown() { var xxx_messageInfo_JSONSchema proto.InternalMessageInfo +func (m *JSONSchema) GetRef() string { + if m != nil { + return m.Ref + } + return "" +} + func (m *JSONSchema) GetTitle() string { if m != nil { return m.Title @@ -877,8 +961,8 @@ func (m *JSONSchema) GetType() []JSONSchema_JSONSchemaSimpleTypes { type Tag struct { // TODO(ivucica): Description should be extracted from comments on the proto // service object. - Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"` - ExternalDocs *ExternalDocumentation `protobuf:"bytes,3,opt,name=external_docs,json=externalDocs" json:"external_docs,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + ExternalDocs *ExternalDocumentation `protobuf:"bytes,3,opt,name=external_docs,json=externalDocs,proto3" json:"external_docs,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -888,7 +972,7 @@ func (m *Tag) Reset() { *m = Tag{} } func (m *Tag) String() string { return proto.CompactTextString(m) } func (*Tag) ProtoMessage() {} func (*Tag) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{7} + return fileDescriptor_openapiv2_5363312922dcb572, []int{8} } func (m *Tag) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Tag.Unmarshal(m, b) @@ -932,7 +1016,7 @@ func (m *Tag) GetExternalDocs() *ExternalDocumentation { // and only serves to provide the relevant details for each scheme. type SecurityDefinitions struct { // A single security scheme definition, mapping a "name" to the scheme it defines. - Security map[string]*SecurityScheme `protobuf:"bytes,1,rep,name=security" json:"security,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Security map[string]*SecurityScheme `protobuf:"bytes,1,rep,name=security,proto3" json:"security,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -942,7 +1026,7 @@ func (m *SecurityDefinitions) Reset() { *m = SecurityDefinitions{} } func (m *SecurityDefinitions) String() string { return proto.CompactTextString(m) } func (*SecurityDefinitions) ProtoMessage() {} func (*SecurityDefinitions) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{8} + return fileDescriptor_openapiv2_5363312922dcb572, []int{9} } func (m *SecurityDefinitions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SecurityDefinitions.Unmarshal(m, b) @@ -981,36 +1065,36 @@ func (m *SecurityDefinitions) GetSecurity() map[string]*SecurityScheme { type SecurityScheme struct { // Required. The type of the security scheme. Valid values are "basic", // "apiKey" or "oauth2". - Type SecurityScheme_Type `protobuf:"varint,1,opt,name=type,enum=grpc.gateway.protoc_gen_swagger.options.SecurityScheme_Type" json:"type,omitempty"` + Type SecurityScheme_Type `protobuf:"varint,1,opt,name=type,proto3,enum=grpc.gateway.protoc_gen_swagger.options.SecurityScheme_Type" json:"type,omitempty"` // A short description for security scheme. - Description string `protobuf:"bytes,2,opt,name=description" json:"description,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` // Required. The name of the header or query parameter to be used. // // Valid for apiKey. - Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` // Required. The location of the API key. Valid values are "query" or "header". // // Valid for apiKey. - In SecurityScheme_In `protobuf:"varint,4,opt,name=in,enum=grpc.gateway.protoc_gen_swagger.options.SecurityScheme_In" json:"in,omitempty"` + In SecurityScheme_In `protobuf:"varint,4,opt,name=in,proto3,enum=grpc.gateway.protoc_gen_swagger.options.SecurityScheme_In" json:"in,omitempty"` // Required. The flow used by the OAuth2 security scheme. Valid values are // "implicit", "password", "application" or "accessCode". // // Valid for oauth2. - Flow SecurityScheme_Flow `protobuf:"varint,5,opt,name=flow,enum=grpc.gateway.protoc_gen_swagger.options.SecurityScheme_Flow" json:"flow,omitempty"` + Flow SecurityScheme_Flow `protobuf:"varint,5,opt,name=flow,proto3,enum=grpc.gateway.protoc_gen_swagger.options.SecurityScheme_Flow" json:"flow,omitempty"` // Required. The authorization URL to be used for this flow. This SHOULD be in // the form of a URL. // // Valid for oauth2/implicit and oauth2/accessCode. - AuthorizationUrl string `protobuf:"bytes,6,opt,name=authorization_url,json=authorizationUrl" json:"authorization_url,omitempty"` + AuthorizationUrl string `protobuf:"bytes,6,opt,name=authorization_url,json=authorizationUrl,proto3" json:"authorization_url,omitempty"` // Required. The token URL to be used for this flow. This SHOULD be in the // form of a URL. // // Valid for oauth2/password, oauth2/application and oauth2/accessCode. - TokenUrl string `protobuf:"bytes,7,opt,name=token_url,json=tokenUrl" json:"token_url,omitempty"` + TokenUrl string `protobuf:"bytes,7,opt,name=token_url,json=tokenUrl,proto3" json:"token_url,omitempty"` // Required. The available scopes for the OAuth2 security scheme. // // Valid for oauth2. - Scopes *Scopes `protobuf:"bytes,8,opt,name=scopes" json:"scopes,omitempty"` + Scopes *Scopes `protobuf:"bytes,8,opt,name=scopes,proto3" json:"scopes,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1020,7 +1104,7 @@ func (m *SecurityScheme) Reset() { *m = SecurityScheme{} } func (m *SecurityScheme) String() string { return proto.CompactTextString(m) } func (*SecurityScheme) ProtoMessage() {} func (*SecurityScheme) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{9} + return fileDescriptor_openapiv2_5363312922dcb572, []int{10} } func (m *SecurityScheme) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SecurityScheme.Unmarshal(m, b) @@ -1112,7 +1196,7 @@ type SecurityRequirement struct { // the Security Definitions. If the security scheme is of type "oauth2", // then the value is a list of scope names required for the execution. // For other security scheme types, the array MUST be empty. - SecurityRequirement map[string]*SecurityRequirement_SecurityRequirementValue `protobuf:"bytes,1,rep,name=security_requirement,json=securityRequirement" json:"security_requirement,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + SecurityRequirement map[string]*SecurityRequirement_SecurityRequirementValue `protobuf:"bytes,1,rep,name=security_requirement,json=securityRequirement,proto3" json:"security_requirement,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1122,7 +1206,7 @@ func (m *SecurityRequirement) Reset() { *m = SecurityRequirement{} } func (m *SecurityRequirement) String() string { return proto.CompactTextString(m) } func (*SecurityRequirement) ProtoMessage() {} func (*SecurityRequirement) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{10} + return fileDescriptor_openapiv2_5363312922dcb572, []int{11} } func (m *SecurityRequirement) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SecurityRequirement.Unmarshal(m, b) @@ -1153,7 +1237,7 @@ func (m *SecurityRequirement) GetSecurityRequirement() map[string]*SecurityRequi // scope names required for the execution. For other security scheme types, // the array MUST be empty. type SecurityRequirement_SecurityRequirementValue struct { - Scope []string `protobuf:"bytes,1,rep,name=scope" json:"scope,omitempty"` + Scope []string `protobuf:"bytes,1,rep,name=scope,proto3" json:"scope,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1167,7 +1251,7 @@ func (m *SecurityRequirement_SecurityRequirementValue) String() string { } func (*SecurityRequirement_SecurityRequirementValue) ProtoMessage() {} func (*SecurityRequirement_SecurityRequirementValue) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{10, 0} + return fileDescriptor_openapiv2_5363312922dcb572, []int{11, 0} } func (m *SecurityRequirement_SecurityRequirementValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SecurityRequirement_SecurityRequirementValue.Unmarshal(m, b) @@ -1202,7 +1286,7 @@ func (m *SecurityRequirement_SecurityRequirementValue) GetScope() []string { type Scopes struct { // Maps between a name of a scope to a short description of it (as the value // of the property). - Scope map[string]string `protobuf:"bytes,1,rep,name=scope" json:"scope,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Scope map[string]string `protobuf:"bytes,1,rep,name=scope,proto3" json:"scope,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1212,7 +1296,7 @@ func (m *Scopes) Reset() { *m = Scopes{} } func (m *Scopes) String() string { return proto.CompactTextString(m) } func (*Scopes) ProtoMessage() {} func (*Scopes) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_4346354ad6fc20e0, []int{11} + return fileDescriptor_openapiv2_5363312922dcb572, []int{12} } func (m *Scopes) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Scopes.Unmarshal(m, b) @@ -1241,7 +1325,10 @@ func (m *Scopes) GetScope() map[string]string { func init() { proto.RegisterType((*Swagger)(nil), "grpc.gateway.protoc_gen_swagger.options.Swagger") + proto.RegisterMapType((map[string]*Response)(nil), "grpc.gateway.protoc_gen_swagger.options.Swagger.ResponsesEntry") proto.RegisterType((*Operation)(nil), "grpc.gateway.protoc_gen_swagger.options.Operation") + proto.RegisterMapType((map[string]*Response)(nil), "grpc.gateway.protoc_gen_swagger.options.Operation.ResponsesEntry") + proto.RegisterType((*Response)(nil), "grpc.gateway.protoc_gen_swagger.options.Response") proto.RegisterType((*Info)(nil), "grpc.gateway.protoc_gen_swagger.options.Info") proto.RegisterType((*Contact)(nil), "grpc.gateway.protoc_gen_swagger.options.Contact") proto.RegisterType((*ExternalDocumentation)(nil), "grpc.gateway.protoc_gen_swagger.options.ExternalDocumentation") @@ -1264,113 +1351,119 @@ func init() { } func init() { - proto.RegisterFile("protoc-gen-swagger/options/openapiv2.proto", fileDescriptor_openapiv2_4346354ad6fc20e0) -} - -var fileDescriptor_openapiv2_4346354ad6fc20e0 = []byte{ - // 1664 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x5b, 0x73, 0xdb, 0xc6, - 0x15, 0x0e, 0xc8, 0x25, 0x09, 0x1e, 0x4a, 0xcc, 0x7a, 0x2d, 0xb7, 0x88, 0x12, 0xbb, 0x0a, 0x9a, - 0x4e, 0x35, 0xf6, 0x98, 0x4a, 0x95, 0x87, 0x66, 0x32, 0x9d, 0xce, 0x50, 0x12, 0x63, 0x03, 0x96, - 0x49, 0x16, 0xa4, 0xa2, 0xb8, 0x33, 0x1d, 0xcc, 0x1a, 0x5c, 0x52, 0x88, 0x71, 0x61, 0x70, 0x91, - 0xc4, 0xfe, 0x82, 0x3e, 0x77, 0xfa, 0xda, 0x9f, 0xd1, 0xa7, 0xf6, 0x67, 0xf4, 0x97, 0xb4, 0x6f, - 0x7d, 0xea, 0xec, 0x05, 0x24, 0x74, 0x49, 0x86, 0x91, 0xed, 0x27, 0xee, 0xf9, 0xce, 0x65, 0xf7, - 0x5c, 0xf6, 0x9c, 0x05, 0xe1, 0xf1, 0x3c, 0x89, 0xb3, 0xd8, 0x7b, 0x3a, 0x63, 0xd1, 0xd3, 0xf4, - 0x82, 0xce, 0x66, 0x2c, 0xd9, 0x8b, 0xe7, 0x99, 0x1f, 0x47, 0xe9, 0x5e, 0x3c, 0x67, 0x11, 0x9d, - 0xfb, 0xe7, 0xfb, 0x1d, 0x21, 0x44, 0x7e, 0x3d, 0x4b, 0xe6, 0x5e, 0x67, 0x46, 0x33, 0x76, 0x41, - 0x17, 0x12, 0xf3, 0xdc, 0x19, 0x8b, 0x5c, 0xa5, 0xd8, 0x51, 0x8a, 0xdb, 0x1f, 0xcd, 0xe2, 0x78, - 0x16, 0xb0, 0x3d, 0x21, 0xf2, 0x3a, 0x9f, 0xee, 0xd1, 0x48, 0xc9, 0x9b, 0xff, 0xa8, 0x41, 0x63, - 0x24, 0xc5, 0x89, 0x01, 0x0d, 0xa5, 0x69, 0x68, 0x3b, 0xda, 0x6e, 0xd3, 0x29, 0x48, 0xd2, 0x05, - 0xe4, 0x47, 0xd3, 0xd8, 0xa8, 0xec, 0x68, 0xbb, 0xad, 0xfd, 0xa7, 0x9d, 0x35, 0x37, 0xee, 0x58, - 0xd1, 0x34, 0x76, 0x84, 0x2a, 0x21, 0x80, 0xce, 0xe2, 0x34, 0x33, 0xaa, 0xc2, 0xb2, 0x58, 0x93, - 0x8f, 0xa1, 0xf9, 0x9a, 0xa6, 0xcc, 0x9d, 0xd3, 0xec, 0xcc, 0x40, 0x82, 0xa1, 0x73, 0x60, 0x48, - 0xb3, 0x33, 0xf2, 0x2d, 0x34, 0x52, 0xef, 0x8c, 0x85, 0x2c, 0x35, 0x6a, 0x3b, 0xd5, 0xdd, 0xf6, - 0xfe, 0xef, 0xd7, 0xde, 0x56, 0x39, 0x54, 0xfc, 0x8e, 0x84, 0x19, 0xa7, 0x30, 0x47, 0xb6, 0x41, - 0xf7, 0xe2, 0x28, 0xcd, 0xb9, 0xe9, 0xfa, 0x4e, 0x95, 0xef, 0x5a, 0xd0, 0x9c, 0x37, 0x4f, 0xe2, - 0x49, 0xee, 0xb1, 0xd4, 0x68, 0x48, 0x5e, 0x41, 0x93, 0x18, 0xb6, 0x52, 0xe6, 0xe5, 0x89, 0x9f, - 0x2d, 0xdc, 0x09, 0x9b, 0xfa, 0x91, 0x2f, 0xb6, 0x33, 0x5a, 0x22, 0x2a, 0xbf, 0x5b, 0xff, 0x78, - 0xca, 0xc8, 0xd1, 0xca, 0x86, 0x73, 0x3f, 0xbd, 0x09, 0x92, 0x6f, 0x41, 0x2f, 0x60, 0x63, 0x63, - 0xa7, 0x7a, 0xa7, 0x4d, 0x1c, 0xf6, 0x7d, 0xee, 0x27, 0x2c, 0x64, 0x51, 0xe6, 0x2c, 0xad, 0x11, - 0x0f, 0x36, 0xd9, 0x65, 0xc6, 0x92, 0x88, 0x06, 0xee, 0x24, 0xf6, 0x52, 0xa3, 0x2d, 0x7c, 0x58, - 0x3f, 0xc4, 0x3d, 0xa5, 0x7d, 0x14, 0x7b, 0x39, 0xb7, 0x4d, 0x39, 0xec, 0x6c, 0xb0, 0x15, 0x9c, - 0x9a, 0x07, 0xb0, 0x79, 0x25, 0x03, 0xa4, 0x05, 0x8d, 0x93, 0xfe, 0x8b, 0xfe, 0xe0, 0xb4, 0x8f, - 0x3f, 0x20, 0x3a, 0xa0, 0xe7, 0xe3, 0xf1, 0x10, 0x6b, 0xa4, 0x09, 0x35, 0xbe, 0x1a, 0xe1, 0x0a, - 0xa9, 0x43, 0xe5, 0x74, 0x84, 0xab, 0xa4, 0x01, 0xd5, 0xd3, 0xd1, 0x08, 0x23, 0x1b, 0xe9, 0x3a, - 0x6e, 0xda, 0x48, 0x6f, 0x62, 0xb0, 0x91, 0x0e, 0xb8, 0x65, 0x23, 0x7d, 0x13, 0xb7, 0xcd, 0x7f, - 0x56, 0xa1, 0x39, 0x98, 0xb3, 0x44, 0xec, 0xcb, 0x8b, 0x2b, 0xa3, 0xb3, 0xd4, 0xd0, 0x44, 0xc6, - 0xc4, 0x5a, 0x54, 0x73, 0x1e, 0x86, 0x34, 0x59, 0x88, 0xb2, 0xe5, 0xd5, 0x2c, 0x49, 0xb2, 0x03, - 0xad, 0x09, 0x4b, 0xbd, 0xc4, 0x17, 0xbe, 0xa8, 0x8a, 0x2c, 0x43, 0x37, 0xc3, 0x83, 0xde, 0x7d, - 0x78, 0xc8, 0xa7, 0xb0, 0x11, 0x17, 0x1e, 0xb8, 0xfe, 0xc4, 0xa8, 0xc9, 0x73, 0x2c, 0x31, 0x6b, - 0x72, 0xe7, 0x4a, 0x35, 0x56, 0x77, 0x07, 0x04, 0x6b, 0x59, 0xfb, 0x8f, 0x00, 0x26, 0x6c, 0x9e, - 0x30, 0x8f, 0x66, 0x6c, 0x22, 0x2a, 0x57, 0x77, 0x4a, 0xc8, 0xfb, 0x2b, 0xb9, 0x72, 0x26, 0xcd, - 0x7f, 0x6b, 0x80, 0x78, 0x6f, 0x20, 0x5b, 0x50, 0xcb, 0xfc, 0x2c, 0x60, 0xaa, 0xe1, 0x48, 0xe2, - 0x7a, 0x82, 0x2a, 0x37, 0x13, 0xb4, 0x0b, 0x38, 0x63, 0x49, 0x98, 0xba, 0xf1, 0xd4, 0x4d, 0x59, - 0x72, 0xee, 0x7b, 0x4c, 0xe5, 0xb1, 0x2d, 0xf0, 0xc1, 0x74, 0x24, 0x51, 0x62, 0x43, 0xc3, 0x8b, - 0xa3, 0x8c, 0x7a, 0x99, 0x4a, 0xe2, 0xe7, 0x6b, 0xfb, 0x73, 0x28, 0xf5, 0x9c, 0xc2, 0x00, 0x0f, - 0xeb, 0x39, 0x4b, 0x52, 0x7e, 0xa6, 0xba, 0x2c, 0x29, 0x45, 0xda, 0x48, 0xaf, 0xe1, 0xba, 0xd9, - 0x83, 0x86, 0xd2, 0xe1, 0x15, 0x19, 0xd1, 0xb0, 0xf0, 0x4b, 0xac, 0x09, 0x86, 0x6a, 0x9e, 0x04, - 0xca, 0x1d, 0xbe, 0xe4, 0xee, 0xb3, 0x90, 0xfa, 0x81, 0x3a, 0xbb, 0x24, 0xcc, 0x17, 0xf0, 0xe0, - 0xd6, 0xfa, 0xb9, 0x1e, 0x17, 0xed, 0x66, 0x5c, 0x6e, 0x6c, 0x61, 0xfe, 0xab, 0x02, 0x75, 0x71, - 0xfd, 0x28, 0x19, 0x43, 0xeb, 0xbb, 0x34, 0x8e, 0x5c, 0x51, 0x0b, 0x54, 0xa8, 0xb7, 0xf6, 0xbf, - 0x58, 0x3b, 0x1c, 0xf6, 0x68, 0xd0, 0x97, 0x96, 0x1c, 0xe0, 0x76, 0x94, 0xd5, 0xcf, 0x60, 0x73, - 0xe2, 0xf3, 0x13, 0x84, 0x7e, 0x44, 0xb3, 0x38, 0x51, 0x9b, 0x5f, 0x05, 0x79, 0xab, 0x4f, 0x18, - 0x9d, 0xb8, 0x71, 0x14, 0x2c, 0x84, 0xb7, 0xba, 0xa3, 0x73, 0x60, 0x10, 0x05, 0xb7, 0x74, 0xa3, - 0xda, 0x7b, 0xb8, 0x6e, 0x1d, 0x68, 0xb0, 0x4b, 0x1a, 0xce, 0x03, 0x26, 0x92, 0xd7, 0xda, 0xdf, - 0xea, 0xc8, 0xb1, 0xd8, 0x29, 0xc6, 0x62, 0xa7, 0x1b, 0x2d, 0x9c, 0x42, 0xc8, 0x46, 0x3a, 0xc2, - 0x35, 0xf3, 0x7f, 0x75, 0x80, 0x95, 0xe3, 0xab, 0x7a, 0xad, 0xfd, 0x48, 0xbd, 0xd6, 0x6f, 0xe6, - 0xc5, 0x80, 0xc6, 0x84, 0x4d, 0x69, 0x1e, 0x64, 0x46, 0x43, 0x56, 0x8e, 0x22, 0xc9, 0x2f, 0xa0, - 0x15, 0xe6, 0x41, 0xe6, 0xcf, 0x03, 0xe6, 0xc6, 0x53, 0x03, 0x76, 0xb4, 0x5d, 0xcd, 0x81, 0x02, - 0x1a, 0x4c, 0xb9, 0x6a, 0x48, 0x2f, 0xfd, 0x30, 0x0f, 0xc5, 0x75, 0xd5, 0x9c, 0x82, 0x24, 0x4f, - 0xe0, 0x1e, 0xbb, 0xf4, 0x82, 0x3c, 0xf5, 0xcf, 0x99, 0x5b, 0xc8, 0x6c, 0x88, 0xd8, 0xe2, 0x25, - 0xe3, 0xa5, 0x12, 0xe6, 0x66, 0xfc, 0x48, 0x88, 0x6c, 0x2a, 0x33, 0x92, 0xbc, 0x66, 0x46, 0xc9, - 0xb4, 0xaf, 0x9b, 0x51, 0xc2, 0x0f, 0x01, 0x42, 0x7a, 0xe9, 0x06, 0x2c, 0x9a, 0x65, 0x67, 0xc6, - 0x87, 0x3b, 0xda, 0x2e, 0x72, 0x9a, 0x21, 0xbd, 0x3c, 0x16, 0x80, 0x60, 0xfb, 0x51, 0xc1, 0xc6, - 0x8a, 0xed, 0x47, 0x8a, 0x6d, 0x40, 0x63, 0x4e, 0x33, 0x9e, 0x14, 0xe3, 0x9e, 0x0c, 0x83, 0x22, - 0x79, 0x7d, 0x70, 0xbb, 0x7e, 0xc6, 0xc2, 0xd4, 0xd8, 0x12, 0x7a, 0x7a, 0x48, 0x2f, 0x2d, 0x4e, - 0x0b, 0xa6, 0x1f, 0x29, 0xe6, 0x03, 0xc5, 0xf4, 0x23, 0xc9, 0xfc, 0x14, 0x36, 0xf2, 0xc8, 0xff, - 0x3e, 0x67, 0x8a, 0xff, 0x33, 0x71, 0xf2, 0x96, 0xc4, 0xa4, 0xc8, 0xaf, 0xa0, 0xcd, 0x8d, 0xcf, - 0x13, 0xde, 0x5b, 0x33, 0x9f, 0xa5, 0x86, 0x21, 0x8c, 0x6c, 0x86, 0xf4, 0x72, 0xb8, 0x04, 0x85, - 0x98, 0x1f, 0x95, 0xc5, 0x3e, 0x52, 0x62, 0x7e, 0x54, 0x12, 0xdb, 0x06, 0x3d, 0x91, 0x1d, 0x6e, - 0x62, 0x6c, 0xcb, 0xc6, 0x5b, 0xd0, 0xbc, 0x3e, 0x68, 0x92, 0xd0, 0x85, 0x61, 0x0a, 0x86, 0x24, - 0xc8, 0x9f, 0x00, 0x65, 0x8b, 0x39, 0x33, 0x7e, 0x29, 0xde, 0x31, 0xd6, 0x1d, 0x6e, 0x5c, 0x69, - 0x39, 0xf2, 0x79, 0x79, 0x8e, 0x17, 0x73, 0x96, 0x3a, 0xc2, 0xac, 0x79, 0x01, 0x0f, 0x6e, 0x65, - 0x5f, 0x9d, 0xb7, 0x4d, 0xa8, 0x75, 0x1d, 0xa7, 0xfb, 0x0a, 0x6b, 0x1c, 0x3f, 0x18, 0x0c, 0x8e, - 0x7b, 0xdd, 0x3e, 0xae, 0x70, 0xc2, 0xea, 0x8f, 0x7b, 0xcf, 0x7a, 0x0e, 0xae, 0xf2, 0xa1, 0xdc, - 0x3f, 0x39, 0x3e, 0xc6, 0x88, 0x00, 0xd4, 0xfb, 0x27, 0x2f, 0x0f, 0x7a, 0x0e, 0xae, 0xf1, 0xf5, - 0xe0, 0xc0, 0xee, 0x1d, 0x8e, 0x71, 0x9d, 0xaf, 0x47, 0x63, 0xc7, 0xea, 0x3f, 0xc3, 0x0d, 0x1b, - 0xe9, 0x1a, 0xae, 0xd8, 0x48, 0xaf, 0xe0, 0xaa, 0x8d, 0xf4, 0xaa, 0x18, 0xd7, 0x08, 0xd7, 0xae, - 0x0d, 0x6d, 0x82, 0xef, 0xdb, 0x48, 0xbf, 0x8f, 0xb7, 0x6c, 0xa4, 0xff, 0x1c, 0x1b, 0x36, 0xd2, - 0x3f, 0xc6, 0x9f, 0xd8, 0x48, 0xff, 0x04, 0x3f, 0xb4, 0x91, 0xfe, 0x10, 0x3f, 0xb2, 0x91, 0xfe, - 0x08, 0x9b, 0x36, 0xd2, 0x3f, 0xc3, 0x8f, 0x6d, 0xa4, 0x3f, 0xc6, 0x4f, 0x6c, 0xa4, 0x3f, 0xc1, - 0x1d, 0xf3, 0xaf, 0x1a, 0x54, 0xc7, 0x74, 0xb6, 0xc6, 0x3c, 0xb8, 0xd1, 0x41, 0xaa, 0xef, 0xbe, - 0x83, 0x48, 0x77, 0xcd, 0xff, 0x6a, 0x70, 0xff, 0x96, 0x17, 0x1c, 0x99, 0x96, 0x26, 0xa7, 0x26, - 0x26, 0xa7, 0xfd, 0x36, 0x2f, 0xc2, 0x25, 0xd6, 0x8b, 0xb2, 0x64, 0xb1, 0x9a, 0xa3, 0xdb, 0x19, - 0x6c, 0x5e, 0x61, 0xf1, 0x9e, 0xff, 0x86, 0x2d, 0xd4, 0x34, 0xe0, 0x4b, 0xf2, 0x12, 0x6a, 0xe7, - 0x34, 0xc8, 0x99, 0x7a, 0xaf, 0xff, 0xf6, 0x27, 0x9f, 0x43, 0xbd, 0x98, 0xa5, 0x95, 0xaf, 0x2a, - 0x5f, 0x6a, 0xfc, 0x3b, 0xa1, 0x7d, 0x95, 0x4b, 0x86, 0xaa, 0xaa, 0xf9, 0xc6, 0xed, 0x3b, 0x3c, - 0x13, 0xa4, 0x99, 0x0e, 0x2f, 0x55, 0x59, 0xc8, 0x6b, 0xe4, 0xb9, 0x18, 0xab, 0xd5, 0xd2, 0x58, - 0xb5, 0xa1, 0xe2, 0x47, 0x62, 0xb8, 0xb7, 0xf7, 0xbf, 0xba, 0xeb, 0x29, 0xac, 0xc8, 0xa9, 0xf8, - 0x11, 0xf7, 0x69, 0x1a, 0xc4, 0x17, 0xa2, 0xbd, 0xbf, 0x85, 0x4f, 0x5f, 0x07, 0xf1, 0x85, 0x23, - 0x2c, 0xf1, 0xee, 0x4a, 0xf3, 0xec, 0x2c, 0x4e, 0xfc, 0x3f, 0xcb, 0x97, 0x1e, 0x9f, 0xcf, 0x72, - 0x42, 0xe0, 0x2b, 0x8c, 0x93, 0x24, 0xe0, 0x8d, 0x2e, 0x8b, 0xdf, 0x30, 0x29, 0x24, 0x07, 0x85, - 0x2e, 0x00, 0xce, 0x7c, 0x06, 0xf5, 0xd4, 0x8b, 0xe7, 0x2c, 0x35, 0x74, 0x91, 0xd6, 0xbd, 0xf5, - 0x4f, 0x27, 0xd4, 0x1c, 0xa5, 0x6e, 0xbe, 0x00, 0xc4, 0x83, 0x4e, 0x30, 0x6c, 0x8c, 0x5f, 0x0d, - 0x7b, 0xae, 0xd5, 0xff, 0xa6, 0x7b, 0x6c, 0x1d, 0xe1, 0x0f, 0x48, 0x1b, 0x40, 0x20, 0x07, 0xdd, - 0x91, 0x75, 0x88, 0xb5, 0xa5, 0x44, 0x77, 0x68, 0xb9, 0x2f, 0x7a, 0xaf, 0x70, 0x85, 0x7c, 0x08, - 0x2d, 0x81, 0x0c, 0xba, 0x27, 0xe3, 0xe7, 0xfb, 0xb8, 0x6a, 0xfe, 0x06, 0x2a, 0x56, 0xc4, 0x15, - 0xad, 0x7e, 0xc9, 0xd0, 0x06, 0xe8, 0x56, 0xdf, 0xfd, 0xc3, 0x49, 0xcf, 0xe1, 0xfd, 0x66, 0x13, - 0x9a, 0x56, 0xdf, 0x7d, 0xde, 0xeb, 0x1e, 0xf5, 0x1c, 0x5c, 0x31, 0xbf, 0x03, 0xc4, 0x03, 0xc4, - 0xad, 0x7f, 0x7d, 0x3c, 0x38, 0x2d, 0xa9, 0xdd, 0x83, 0x4d, 0x89, 0xbc, 0x1c, 0x1e, 0x5b, 0x87, - 0xd6, 0x18, 0x6b, 0x4b, 0x68, 0xd8, 0x1d, 0x8d, 0x4e, 0x07, 0xce, 0x11, 0xae, 0x90, 0x2d, 0xc0, - 0x02, 0xea, 0x0e, 0xb9, 0x54, 0x77, 0x6c, 0x0d, 0xfa, 0xb8, 0xba, 0x42, 0x0f, 0x0f, 0x7b, 0xa3, - 0x91, 0x7b, 0x38, 0x38, 0xea, 0x61, 0x64, 0xfe, 0xa7, 0xb2, 0xba, 0xad, 0xa5, 0x77, 0x29, 0xf9, - 0x8b, 0x56, 0xfa, 0x98, 0x4b, 0x56, 0x0c, 0x75, 0x75, 0x4f, 0xde, 0xe6, 0xd1, 0x7b, 0x1b, 0x26, - 0x6f, 0xf1, 0xf2, 0x2b, 0xaf, 0xc4, 0xd9, 0xfe, 0x1c, 0x8c, 0x5b, 0x14, 0xbe, 0xe1, 0x57, 0x8f, - 0xcf, 0x13, 0x91, 0x34, 0xf5, 0x65, 0x23, 0x89, 0xed, 0xbf, 0x6b, 0xb7, 0xaa, 0xfc, 0x50, 0x3b, - 0x78, 0x73, 0xb5, 0x1d, 0xbc, 0x73, 0xdf, 0xc4, 0x51, 0xcb, 0xcd, 0xe2, 0x6f, 0x1a, 0x7f, 0x73, - 0xf2, 0x5a, 0x23, 0xc3, 0xb2, 0x03, 0xad, 0x9f, 0x72, 0x3f, 0x85, 0xbe, 0xfc, 0x91, 0xc1, 0x53, - 0xce, 0x7f, 0x09, 0xb0, 0x02, 0x6f, 0xf1, 0x76, 0xab, 0xec, 0x6d, 0xb3, 0x74, 0xac, 0x83, 0xc3, - 0x3f, 0x76, 0x67, 0x7e, 0x76, 0x96, 0xbf, 0xee, 0x78, 0x71, 0xb8, 0xc7, 0x0f, 0xf2, 0x94, 0x79, - 0x71, 0xba, 0x48, 0x33, 0xa6, 0x48, 0x75, 0xae, 0xbd, 0x1f, 0xfe, 0x13, 0xe6, 0x75, 0x5d, 0xf0, - 0xbe, 0xf8, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xb7, 0xe4, 0x3d, 0xa9, 0x11, 0x00, 0x00, + proto.RegisterFile("protoc-gen-swagger/options/openapiv2.proto", fileDescriptor_openapiv2_5363312922dcb572) +} + +var fileDescriptor_openapiv2_5363312922dcb572 = []byte{ + // 1753 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5f, 0x73, 0xdb, 0xc6, + 0x11, 0x0f, 0x48, 0x90, 0x04, 0x97, 0x22, 0x73, 0x3e, 0xcb, 0x2d, 0xa2, 0xc4, 0xae, 0xc2, 0xa6, + 0x53, 0x8d, 0x3d, 0xa6, 0x12, 0xe5, 0xa1, 0x99, 0x4c, 0xa7, 0x1d, 0x4a, 0x62, 0x6c, 0xc0, 0x32, + 0xc9, 0x82, 0x54, 0x14, 0x77, 0x26, 0x83, 0x81, 0xc1, 0x23, 0x85, 0x18, 0x38, 0x20, 0xf8, 0x23, + 0x89, 0x7d, 0xeb, 0x4b, 0xdb, 0xe7, 0x4e, 0x5f, 0xfb, 0x31, 0xfa, 0xd6, 0x8f, 0xd1, 0x4f, 0xd2, + 0x7e, 0x80, 0x76, 0xee, 0x0f, 0x48, 0x50, 0x62, 0x32, 0x94, 0xff, 0xf4, 0x89, 0xb7, 0xbf, 0xfd, + 0x73, 0xbb, 0x77, 0xbb, 0x7b, 0x0b, 0xc2, 0xc3, 0x28, 0x0e, 0xd3, 0xd0, 0x7d, 0x3c, 0x23, 0xf4, + 0x71, 0x72, 0xe9, 0xcc, 0x66, 0x24, 0xde, 0x0f, 0xa3, 0xd4, 0x0b, 0x69, 0xb2, 0x1f, 0x46, 0x84, + 0x3a, 0x91, 0x77, 0x71, 0xd0, 0xe1, 0x42, 0xf8, 0x97, 0xb3, 0x38, 0x72, 0x3b, 0x33, 0x27, 0x25, + 0x97, 0xce, 0x5c, 0x60, 0xae, 0x3d, 0x23, 0xd4, 0x96, 0x8a, 0x1d, 0xa9, 0xb8, 0xf3, 0xc1, 0x2c, + 0x0c, 0x67, 0x3e, 0xd9, 0xe7, 0x22, 0x2f, 0xb3, 0xe9, 0xbe, 0x43, 0xa5, 0x7c, 0xfb, 0xbf, 0x55, + 0xa8, 0x8d, 0x84, 0x38, 0xd6, 0xa1, 0x26, 0x35, 0x75, 0x65, 0x57, 0xd9, 0xab, 0x5b, 0x39, 0x89, + 0xbb, 0xa0, 0x7a, 0x74, 0x1a, 0xea, 0xa5, 0x5d, 0x65, 0xaf, 0x71, 0xf0, 0xb8, 0xb3, 0xe1, 0xc6, + 0x1d, 0x83, 0x4e, 0x43, 0x8b, 0xab, 0x62, 0x0c, 0xea, 0x79, 0x98, 0xa4, 0x7a, 0x99, 0x5b, 0xe6, + 0x6b, 0xfc, 0x21, 0xd4, 0x5f, 0x3a, 0x09, 0xb1, 0x23, 0x27, 0x3d, 0xd7, 0x55, 0xce, 0xd0, 0x18, + 0x30, 0x74, 0xd2, 0x73, 0xfc, 0x0d, 0xd4, 0x12, 0xf7, 0x9c, 0x04, 0x24, 0xd1, 0x2b, 0xbb, 0xe5, + 0xbd, 0xd6, 0xc1, 0x6f, 0x36, 0xde, 0x56, 0x06, 0x94, 0xff, 0x8e, 0xb8, 0x19, 0x2b, 0x37, 0x87, + 0x77, 0x40, 0x73, 0x43, 0x9a, 0x64, 0xcc, 0x74, 0x75, 0xb7, 0xcc, 0x76, 0xcd, 0x69, 0xc6, 0x8b, + 0xe2, 0x70, 0x92, 0xb9, 0x24, 0xd1, 0x6b, 0x82, 0x97, 0xd3, 0xf8, 0x5b, 0xa8, 0xc7, 0x24, 0x89, + 0x42, 0x9a, 0x90, 0x44, 0x87, 0xdd, 0xf2, 0x5e, 0xe3, 0xe0, 0xb7, 0xb7, 0xf6, 0xc9, 0xca, 0x2d, + 0xf4, 0x68, 0x1a, 0xcf, 0xad, 0xa5, 0x45, 0x1c, 0xc2, 0x76, 0x42, 0xdc, 0x2c, 0xf6, 0xd2, 0xb9, + 0x3d, 0x21, 0x53, 0x8f, 0x7a, 0x5c, 0x53, 0x6f, 0xf0, 0x43, 0xff, 0xf5, 0xe6, 0x3b, 0x49, 0x23, + 0xc7, 0x4b, 0x1b, 0xd6, 0xdd, 0xe4, 0x26, 0x88, 0xbf, 0x01, 0x2d, 0x87, 0xf5, 0x2d, 0x1e, 0xce, + 0xed, 0x37, 0xb1, 0xc8, 0xf7, 0x99, 0x17, 0x93, 0x80, 0xd0, 0xd4, 0x5a, 0x58, 0xc3, 0x2e, 0x34, + 0xc9, 0x55, 0x4a, 0x62, 0xea, 0xf8, 0xf6, 0x24, 0x74, 0x13, 0xbd, 0xc5, 0x63, 0xd8, 0xfc, 0x06, + 0x7b, 0x52, 0xfb, 0x38, 0x74, 0x33, 0x66, 0xdb, 0x61, 0xb0, 0xb5, 0x45, 0x96, 0x70, 0xb2, 0x13, + 0x42, 0x6b, 0xf5, 0x30, 0x31, 0x82, 0xf2, 0x2b, 0x32, 0x97, 0xc9, 0xcb, 0x96, 0xf8, 0x09, 0x54, + 0x2e, 0x1c, 0x3f, 0x23, 0x32, 0x73, 0x3f, 0xdb, 0xd8, 0x81, 0xdc, 0xb2, 0x25, 0xf4, 0xbf, 0x2c, + 0x7d, 0xa1, 0xb4, 0x0f, 0xa1, 0xb9, 0x92, 0x51, 0xb8, 0x01, 0xb5, 0xd3, 0xfe, 0xb3, 0xfe, 0xe0, + 0xac, 0x8f, 0xde, 0xc3, 0x1a, 0xa8, 0x4f, 0xc7, 0xe3, 0x21, 0x52, 0x70, 0x1d, 0x2a, 0x6c, 0x35, + 0x42, 0x25, 0x5c, 0x85, 0xd2, 0xd9, 0x08, 0x95, 0x71, 0x0d, 0xca, 0x67, 0xa3, 0x11, 0x52, 0x4d, + 0x55, 0xd3, 0x50, 0xdd, 0x54, 0xb5, 0x3a, 0x02, 0x53, 0xd5, 0x9a, 0xa8, 0xd5, 0xfe, 0x73, 0x05, + 0xea, 0x83, 0x88, 0xc4, 0x3c, 0x44, 0x56, 0x26, 0xa9, 0x33, 0x4b, 0x74, 0x85, 0xe7, 0x1e, 0x5f, + 0xf3, 0xba, 0xcc, 0x82, 0xc0, 0x89, 0xe7, 0x3c, 0x0c, 0x56, 0x97, 0x82, 0xc4, 0xbb, 0xd0, 0x98, + 0x90, 0xc4, 0x8d, 0x3d, 0xee, 0xb5, 0xac, 0xad, 0x22, 0x74, 0xf3, 0x26, 0xd4, 0xb7, 0x7f, 0x13, + 0xf8, 0x63, 0xd8, 0x0a, 0xf3, 0x08, 0x6c, 0x6f, 0xa2, 0x57, 0x84, 0x1f, 0x0b, 0xcc, 0x98, 0xbc, + 0x76, 0xcd, 0xd9, 0xc5, 0x9a, 0xab, 0xf3, 0x24, 0xed, 0x6e, 0xec, 0xfb, 0xe2, 0x58, 0x7f, 0xa4, + 0xea, 0xf4, 0x65, 0x9b, 0x01, 0xbe, 0xf7, 0xa2, 0x4d, 0x3c, 0x00, 0x98, 0x90, 0x28, 0x26, 0xae, + 0x93, 0x92, 0x09, 0xaf, 0x42, 0xcd, 0x2a, 0x20, 0xef, 0xae, 0x7c, 0xfe, 0xef, 0x99, 0x2d, 0xb2, + 0xb2, 0xfd, 0x47, 0x05, 0xb4, 0x9c, 0x7b, 0x3d, 0xb5, 0x94, 0x9b, 0xa9, 0xf5, 0x04, 0xaa, 0xfc, + 0xa8, 0x1c, 0xe9, 0xc2, 0xfe, 0xe6, 0xd1, 0x73, 0x35, 0x4b, 0xaa, 0x9b, 0xaa, 0x56, 0xe6, 0x95, + 0xa1, 0xa2, 0x4a, 0xfb, 0x5f, 0x0a, 0xa8, 0xec, 0xd5, 0xc0, 0xdb, 0x50, 0x49, 0xbd, 0xd4, 0x27, + 0x72, 0x67, 0x41, 0x5c, 0xf7, 0xaa, 0x74, 0xd3, 0xab, 0x3d, 0x40, 0x29, 0x89, 0x83, 0xc4, 0x0e, + 0xa7, 0x76, 0x42, 0xe2, 0x0b, 0xcf, 0x25, 0xb2, 0x2e, 0x5a, 0x1c, 0x1f, 0x4c, 0x47, 0x02, 0xc5, + 0x26, 0xd4, 0xdc, 0x90, 0xa6, 0x8e, 0x9b, 0xca, 0xa2, 0xf8, 0x74, 0xe3, 0x00, 0x8e, 0x84, 0x9e, + 0x95, 0x1b, 0x60, 0x59, 0x74, 0x41, 0xe2, 0x84, 0xf9, 0x54, 0x15, 0x25, 0x2a, 0x49, 0x53, 0xd5, + 0x2a, 0xa8, 0xda, 0xee, 0x41, 0x4d, 0xea, 0xb0, 0x0a, 0xa7, 0x4e, 0x90, 0xc7, 0xc5, 0xd7, 0xec, + 0x7a, 0xb3, 0xd8, 0x97, 0xe1, 0xb0, 0x25, 0x0b, 0x9f, 0x04, 0x8e, 0xe7, 0x4b, 0xdf, 0x05, 0xd1, + 0x7e, 0x06, 0xf7, 0xd6, 0xd6, 0xe3, 0x06, 0xb7, 0x75, 0x63, 0x8b, 0xf6, 0x3f, 0x4b, 0x50, 0x15, + 0x37, 0x81, 0xc7, 0xd0, 0xf8, 0x2e, 0x09, 0xa9, 0x2d, 0xef, 0x53, 0xe1, 0xc7, 0xf1, 0xf9, 0xc6, + 0xc7, 0x61, 0x8e, 0x06, 0x7d, 0x79, 0xa7, 0xc0, 0xec, 0x48, 0xab, 0x9f, 0x40, 0x73, 0xe2, 0x31, + 0x0f, 0x02, 0x8f, 0x3a, 0x69, 0x18, 0xcb, 0xcd, 0x57, 0x41, 0x36, 0x04, 0xc4, 0xc4, 0x99, 0xd8, + 0x21, 0xf5, 0xe7, 0x3c, 0x5a, 0xcd, 0xd2, 0x18, 0x30, 0xa0, 0xfe, 0x9a, 0x87, 0xa4, 0xf2, 0x0e, + 0xda, 0x57, 0x07, 0x6a, 0xe4, 0xca, 0x09, 0x22, 0x9f, 0xf0, 0xcb, 0x6b, 0x1c, 0x6c, 0x77, 0xc4, + 0xc0, 0xd4, 0xc9, 0x07, 0xa6, 0x4e, 0x97, 0xce, 0xad, 0x5c, 0x48, 0x66, 0xea, 0x9f, 0x6a, 0x00, + 0xcb, 0xc0, 0xd9, 0xf9, 0xc6, 0x64, 0x2a, 0xaf, 0x8b, 0x2d, 0x97, 0x19, 0x5c, 0xf9, 0x91, 0x0c, + 0xae, 0xde, 0xbc, 0x29, 0x1d, 0x6a, 0x13, 0x32, 0x75, 0x32, 0x3f, 0xd5, 0x6b, 0x22, 0x97, 0x24, + 0x89, 0x7f, 0x06, 0x8d, 0x20, 0xf3, 0x53, 0x2f, 0xf2, 0x89, 0x1d, 0x4e, 0x75, 0xd8, 0x55, 0xf6, + 0x14, 0x0b, 0x72, 0x68, 0x30, 0x65, 0xaa, 0x81, 0x73, 0xe5, 0x05, 0x59, 0xc0, 0xfb, 0x95, 0x62, + 0xe5, 0x24, 0x7e, 0x04, 0x77, 0xc8, 0x95, 0xeb, 0x67, 0x89, 0x77, 0x41, 0xec, 0x5c, 0x66, 0x8b, + 0x9f, 0x36, 0x5a, 0x30, 0x9e, 0x4b, 0x61, 0x66, 0xc6, 0xa3, 0x5c, 0xa4, 0x29, 0xcd, 0x08, 0xf2, + 0x9a, 0x19, 0x29, 0xd3, 0xba, 0x6e, 0x46, 0x0a, 0xdf, 0x07, 0x08, 0x9c, 0x2b, 0xdb, 0x27, 0x74, + 0x96, 0x9e, 0xeb, 0xef, 0xef, 0x2a, 0x7b, 0xaa, 0x55, 0x0f, 0x9c, 0xab, 0x13, 0x0e, 0x70, 0xb6, + 0x47, 0x73, 0x36, 0x92, 0x6c, 0x8f, 0x4a, 0xb6, 0x0e, 0xb5, 0xc8, 0x49, 0xd9, 0x35, 0xe9, 0x77, + 0xc4, 0x31, 0x48, 0x92, 0x65, 0x0c, 0xb3, 0xeb, 0xa5, 0x24, 0x48, 0xf4, 0x6d, 0xae, 0xa7, 0x05, + 0xce, 0x95, 0xc1, 0x68, 0xce, 0xf4, 0xa8, 0x64, 0xde, 0x93, 0x4c, 0x8f, 0x0a, 0xe6, 0xc7, 0xb0, + 0x95, 0x51, 0xef, 0xfb, 0x8c, 0x48, 0xfe, 0x4f, 0xb8, 0xe7, 0x0d, 0x81, 0x09, 0x91, 0x5f, 0x40, + 0x8b, 0x19, 0x8f, 0x62, 0xf6, 0x7a, 0xa5, 0x1e, 0x49, 0x74, 0x9d, 0x1b, 0x69, 0x06, 0xce, 0xd5, + 0x70, 0x01, 0x72, 0x31, 0x8f, 0x16, 0xc5, 0x3e, 0x90, 0x62, 0x1e, 0x2d, 0x88, 0xed, 0x80, 0x16, + 0x8b, 0x16, 0x3f, 0xd1, 0x77, 0xc4, 0xd3, 0x96, 0xd3, 0x2c, 0x3f, 0x9c, 0x38, 0x76, 0xe6, 0x7a, + 0x9b, 0x33, 0x04, 0x81, 0xbf, 0x05, 0x35, 0x9d, 0x47, 0x44, 0xff, 0x39, 0x9f, 0x79, 0x8d, 0xd7, + 0xa8, 0xc1, 0xc2, 0x72, 0xe4, 0xb1, 0x84, 0x1d, 0xcf, 0x23, 0x92, 0x58, 0xdc, 0x6c, 0xfb, 0x12, + 0xee, 0xad, 0x65, 0xaf, 0xce, 0x32, 0x75, 0xa8, 0x74, 0x2d, 0xab, 0xfb, 0x02, 0x29, 0x0c, 0x3f, + 0x1c, 0x0c, 0x4e, 0x7a, 0xdd, 0x3e, 0x2a, 0x31, 0xc2, 0xe8, 0x8f, 0x7b, 0x4f, 0x7a, 0x16, 0x2a, + 0xb3, 0x81, 0xa7, 0x7f, 0x7a, 0x72, 0x82, 0x54, 0x0c, 0x50, 0xed, 0x9f, 0x3e, 0x3f, 0xec, 0x59, + 0xa8, 0xc2, 0xd6, 0x83, 0x43, 0xb3, 0x77, 0x34, 0x46, 0x55, 0xb6, 0x1e, 0x8d, 0x2d, 0xa3, 0xff, + 0x04, 0xd5, 0x4c, 0x55, 0x53, 0x50, 0xc9, 0x54, 0xb5, 0x12, 0x2a, 0x8b, 0x02, 0xba, 0x36, 0x0a, + 0x61, 0x74, 0xd7, 0x54, 0xb5, 0xbb, 0x68, 0xdb, 0x54, 0xb5, 0x9f, 0x22, 0xdd, 0x54, 0xb5, 0x0f, + 0xd1, 0x47, 0xa6, 0xaa, 0x7d, 0x84, 0xee, 0x9b, 0xaa, 0x76, 0x1f, 0x3d, 0x30, 0x55, 0xed, 0x01, + 0x6a, 0x9b, 0xaa, 0xf6, 0x09, 0x7a, 0x68, 0xaa, 0xda, 0x43, 0xf4, 0xc8, 0x54, 0xb5, 0x47, 0xa8, + 0xd3, 0xfe, 0xab, 0x02, 0xe5, 0xb1, 0x33, 0xdb, 0xe0, 0x6d, 0xb8, 0xd1, 0x4d, 0xca, 0x6f, 0xbf, + 0x9b, 0x88, 0x40, 0xdb, 0xff, 0x51, 0xe0, 0xee, 0x9a, 0x41, 0x1c, 0x4f, 0x0b, 0x43, 0x83, 0xc2, + 0x87, 0x06, 0xf3, 0x4d, 0x06, 0xfb, 0x05, 0x26, 0xe6, 0x9a, 0xe5, 0x08, 0x91, 0x42, 0x73, 0x85, + 0xb5, 0x66, 0x82, 0x78, 0xbe, 0x3a, 0x41, 0xfc, 0xea, 0xd6, 0x7e, 0xc8, 0xef, 0xaa, 0xc2, 0x84, + 0xfc, 0x8f, 0x0a, 0xb4, 0x56, 0xb9, 0x78, 0x28, 0xf3, 0x99, 0x6d, 0xdc, 0x7a, 0x8d, 0x09, 0x49, + 0x98, 0xe9, 0xb0, 0x24, 0x15, 0x29, 0xbc, 0xc1, 0x3d, 0xe7, 0x4f, 0x6c, 0xb9, 0xf0, 0xc4, 0x9a, + 0x50, 0xf2, 0x28, 0x7f, 0xe8, 0x5b, 0x07, 0x5f, 0xbe, 0xae, 0x17, 0x06, 0xb5, 0x4a, 0x1e, 0x65, + 0x31, 0x4d, 0xfd, 0xf0, 0x92, 0x37, 0xf6, 0x37, 0x88, 0xe9, 0x2b, 0x3f, 0xbc, 0xb4, 0xb8, 0x25, + 0xd6, 0x57, 0x9d, 0x2c, 0x3d, 0x0f, 0x63, 0xef, 0x0f, 0x62, 0x8a, 0x66, 0x6f, 0xb5, 0x78, 0x1b, + 0xd0, 0x0a, 0xe3, 0x34, 0xf6, 0x59, 0x8b, 0x4b, 0xc3, 0x57, 0x44, 0x08, 0x89, 0x27, 0x42, 0xe3, + 0x00, 0x63, 0xf2, 0xa9, 0x2c, 0x8c, 0x48, 0xa2, 0x6b, 0xb7, 0x9e, 0xca, 0x98, 0x9a, 0x25, 0xd5, + 0xdb, 0xcf, 0x40, 0x65, 0x87, 0x8e, 0x11, 0x6c, 0x8d, 0x5f, 0x0c, 0x7b, 0xb6, 0xd1, 0xff, 0xba, + 0x7b, 0x62, 0x1c, 0xa3, 0xf7, 0x70, 0x0b, 0x80, 0x23, 0x87, 0xdd, 0x91, 0x71, 0x84, 0x94, 0x85, + 0x44, 0x77, 0x68, 0xd8, 0xcf, 0x7a, 0x2f, 0x50, 0x09, 0xbf, 0x0f, 0x0d, 0x8e, 0x0c, 0xba, 0xa7, + 0xe3, 0xa7, 0x07, 0xa8, 0xdc, 0xfe, 0x0c, 0x4a, 0x06, 0x65, 0x8a, 0x46, 0xbf, 0x60, 0x68, 0x0b, + 0x34, 0xa3, 0x6f, 0xff, 0xee, 0xb4, 0x67, 0xb1, 0x4e, 0xd3, 0x84, 0xba, 0xd1, 0xb7, 0x9f, 0xf6, + 0xba, 0xc7, 0x3d, 0x0b, 0x95, 0xda, 0xdf, 0x81, 0xca, 0x0e, 0x88, 0x59, 0xff, 0xea, 0x64, 0x70, + 0x56, 0x50, 0xbb, 0x03, 0x4d, 0x81, 0x3c, 0x1f, 0x9e, 0x18, 0x47, 0xc6, 0x18, 0x29, 0x0b, 0x68, + 0xd8, 0x1d, 0x8d, 0xce, 0x06, 0xd6, 0x31, 0x2a, 0xe1, 0x6d, 0x40, 0x1c, 0xea, 0x0e, 0x99, 0x54, + 0x77, 0x6c, 0x0c, 0xfa, 0xa8, 0xbc, 0x44, 0x8f, 0x8e, 0x7a, 0xa3, 0x91, 0x7d, 0x34, 0x38, 0xee, + 0x21, 0xb5, 0xfd, 0xef, 0xd2, 0xb2, 0x5a, 0x0b, 0x23, 0x39, 0xfe, 0x8b, 0x52, 0xf8, 0x26, 0x8f, + 0x97, 0x0c, 0x59, 0xba, 0xa7, 0x6f, 0x32, 0xef, 0xaf, 0xc3, 0x44, 0x15, 0x2f, 0x3e, 0xd6, 0x0b, + 0x9c, 0x9d, 0x4f, 0x41, 0x5f, 0xa3, 0xf0, 0x35, 0x2b, 0x3d, 0xf6, 0x92, 0xf0, 0x4b, 0x93, 0x5f, + 0x8d, 0x82, 0xd8, 0xf9, 0xbb, 0xb2, 0x56, 0xe5, 0x87, 0xda, 0xc1, 0xab, 0xd5, 0x76, 0xf0, 0xd6, + 0x63, 0xe3, 0xae, 0x16, 0x9b, 0xc5, 0xdf, 0x14, 0x36, 0x7f, 0xb2, 0x5c, 0xc3, 0xc3, 0x62, 0x00, + 0x8d, 0xdb, 0xd4, 0x27, 0xd7, 0x17, 0x3f, 0xe2, 0xf0, 0x64, 0xf0, 0x5f, 0x00, 0x2c, 0xc1, 0x35, + 0xd1, 0x6e, 0x17, 0xa3, 0xad, 0x17, 0xdc, 0x3a, 0x3c, 0xfa, 0x7d, 0x77, 0xe6, 0xa5, 0xe7, 0xd9, + 0xcb, 0x8e, 0x1b, 0x06, 0xfb, 0xcc, 0x91, 0xc7, 0xc4, 0x0d, 0x93, 0x79, 0x92, 0x12, 0x49, 0x4a, + 0xbf, 0xf6, 0x7f, 0xf8, 0xaf, 0xba, 0x97, 0x55, 0xce, 0xfb, 0xfc, 0x7f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xab, 0x81, 0x5a, 0xfc, 0xcf, 0x13, 0x00, 0x00, } diff --git a/protoc-gen-swagger/options/openapiv2.proto b/protoc-gen-swagger/options/openapiv2.proto index b3b9b89d995..c9f0386564c 100644 --- a/protoc-gen-swagger/options/openapiv2.proto +++ b/protoc-gen-swagger/options/openapiv2.proto @@ -31,8 +31,7 @@ message Swagger { // field 9 is reserved for 'definitions', which at this time are already // exposed as and customizable as proto messages. reserved 9; - // field 10 is reserved for 'responses'. - reserved 10; + map responses = 10; SecurityDefinitions security_definitions = 11; repeated SecurityRequirement security = 12; // field 13 is reserved for 'tags', which are supposed to be exposed as and @@ -57,13 +56,29 @@ message Operation { repeated string produces = 7; // field 8 is reserved for 'parameters'. reserved 8; - // field 9 is reserved for 'responses'. - reserved 9; + map responses = 9; repeated string schemes = 10; bool deprecated = 11; repeated SecurityRequirement security = 12; } +// `Response` is a representation of OpenAPI v2 specification's Response object. +// +// See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#responseObject +// +message Response { + // `Description` is a short description of the response. + // GFM syntax can be used for rich text representation. + string description = 1; + // `Schema` optionally defines the structure of the response. + // If `Schema` is not provided, it means there is no content to the response. + Schema schema = 2; + // field 3 is reserved for 'headers'. + reserved 3; + // field 3 is reserved for 'example'. + reserved 4; +} + // `Info` is a representation of OpenAPI v2 specification's Info object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#infoObject @@ -132,8 +147,13 @@ message JSONSchema { reserved 1; // field 2 is reserved for '$schema', omitted from OpenAPI v2. reserved 2; - // field 3 is reserved for '$ref', although it is unclear how it would be used. - reserved 3; + // Ref is used to define an external reference to include in the message. + // This could be a fully qualified proto message reference, and that type must be imported + // into the protofile. If no message is identified, the Ref will be used verbatim in + // the output. + // For example: + // `ref: ".google.protobuf.Timestamp"`. + string ref = 3; // field 4 is reserved for '$comment', omitted from OpenAPI v2. reserved 4; string title = 5; diff --git a/runtime/internal/stream_chunk.pb.go b/runtime/internal/stream_chunk.pb.go index a06c722c167..f4af074808b 100644 --- a/runtime/internal/stream_chunk.pb.go +++ b/runtime/internal/stream_chunk.pb.go @@ -22,11 +22,11 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // StreamError is a response type which is returned when // streaming rpc returns an error. type StreamError struct { - GrpcCode int32 `protobuf:"varint,1,opt,name=grpc_code,json=grpcCode" json:"grpc_code,omitempty"` - HttpCode int32 `protobuf:"varint,2,opt,name=http_code,json=httpCode" json:"http_code,omitempty"` - Message string `protobuf:"bytes,3,opt,name=message" json:"message,omitempty"` - HttpStatus string `protobuf:"bytes,4,opt,name=http_status,json=httpStatus" json:"http_status,omitempty"` - Details []*any.Any `protobuf:"bytes,5,rep,name=details" json:"details,omitempty"` + GrpcCode int32 `protobuf:"varint,1,opt,name=grpc_code,json=grpcCode,proto3" json:"grpc_code,omitempty"` + HttpCode int32 `protobuf:"varint,2,opt,name=http_code,json=httpCode,proto3" json:"http_code,omitempty"` + Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` + HttpStatus string `protobuf:"bytes,4,opt,name=http_status,json=httpStatus,proto3" json:"http_status,omitempty"` + Details []*any.Any `protobuf:"bytes,5,rep,name=details,proto3" json:"details,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"`