merge master #6

Closed
vtolstov wants to merge 24 commits from master into v3
9 changed files with 22 additions and 22 deletions
Showing only changes of commit 63b581f38f - Show all commits

View File

@ -14,8 +14,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.26.0 // protoc-gen-go v1.27.1
// protoc v3.15.6 // protoc v3.17.3
// source: api/annotations.proto // source: api/annotations.proto
package api package api
@ -38,9 +38,9 @@ var file_api_annotations_proto_extTypes = []protoimpl.ExtensionInfo{
{ {
ExtendedType: (*descriptorpb.MethodOptions)(nil), ExtendedType: (*descriptorpb.MethodOptions)(nil),
ExtensionType: (*HttpRule)(nil), ExtensionType: (*HttpRule)(nil),
Field: 72295728, Field: 65535654,
Name: "micro.api.http", Name: "micro.api.http",
Tag: "bytes,72295728,opt,name=http", Tag: "bytes,65535654,opt,name=http",
Filename: "api/annotations.proto", Filename: "api/annotations.proto",
}, },
{ {
@ -65,7 +65,7 @@ var file_api_annotations_proto_extTypes = []protoimpl.ExtensionInfo{
var ( var (
// See `HttpRule`. // See `HttpRule`.
// //
// optional micro.api.HttpRule http = 72295728; // optional micro.api.HttpRule http = 65535654;
E_Http = &file_api_annotations_proto_extTypes[0] E_Http = &file_api_annotations_proto_extTypes[0]
// See `MicroMethod`. // See `MicroMethod`.
// //
@ -92,8 +92,8 @@ var file_api_annotations_proto_rawDesc = []byte{
0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3a, 0x4a, 0x0a, 0x04, 0x68, 0x74, 0x74, 0x70, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3a, 0x4a, 0x0a, 0x04, 0x68, 0x74, 0x74, 0x70, 0x12, 0x1e, 0x2e,
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xb0, 0xca, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xa6, 0xfd,
0xbc, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x61, 0x9f, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x61,
0x70, 0x69, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x04, 0x68, 0x74, 0x74, 0x70, 0x69, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x04, 0x68, 0x74, 0x74,
0x70, 0x3a, 0x5c, 0x0a, 0x0c, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x70, 0x3a, 0x5c, 0x0a, 0x0c, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f,
0x64, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x64, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,

View File

@ -28,7 +28,7 @@ option objc_class_prefix = "MAPI";
extend google.protobuf.MethodOptions { extend google.protobuf.MethodOptions {
// See `HttpRule`. // See `HttpRule`.
HttpRule http = 72295728; HttpRule http = 65535654;
} }
extend google.protobuf.MethodOptions { extend google.protobuf.MethodOptions {

View File

@ -14,8 +14,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.26.0 // protoc-gen-go v1.27.1
// protoc v3.15.6 // protoc v3.17.3
// source: api/field_behavior.proto // source: api/field_behavior.proto
package api package api

View File

@ -14,8 +14,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.26.0 // protoc-gen-go v1.27.1
// protoc v3.15.6 // protoc v3.17.3
// source: api/http.proto // source: api/http.proto
package api package api

View File

@ -14,8 +14,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.26.0 // protoc-gen-go v1.27.1
// protoc v3.15.6 // protoc v3.17.3
// source: api/httpbody.proto // source: api/httpbody.proto
package api package api

View File

@ -14,8 +14,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.26.0 // protoc-gen-go v1.27.1
// protoc v3.15.6 // protoc v3.17.3
// source: api/micro.proto // source: api/micro.proto
package api package api

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.26.0 // protoc-gen-go v1.27.1
// protoc v3.15.6 // protoc v3.17.3
// source: openapiv2/annotations.proto // source: openapiv2/annotations.proto
package openapiv2 package openapiv2

View File

@ -16,8 +16,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.26.0 // protoc-gen-go v1.27.1
// protoc v3.15.6 // protoc v3.17.3
// source: openapiv2/gopenapiv2.proto // source: openapiv2/gopenapiv2.proto
package openapiv2 package openapiv2

View File

@ -16,8 +16,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.26.0 // protoc-gen-go v1.27.1
// protoc v3.15.6 // protoc v3.17.3
// source: openapiv3/gopenapiv3.proto // source: openapiv3/gopenapiv3.proto
package openapiv3 package openapiv3