diff --git a/client/drpc/proto/test.pb.go b/client/drpc/proto/test.pb.go index a34f7e0..3123968 100644 --- a/client/drpc/proto/test.pb.go +++ b/client/drpc/proto/test.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: test.proto package pb import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -146,11 +147,14 @@ func file_test_proto_rawDescGZIP() []byte { return file_test_proto_rawDescData } -var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_test_proto_goTypes = []interface{}{ - (*CallReq)(nil), // 0: Test.CallReq - (*CallRsp)(nil), // 1: Test.CallRsp -} +var ( + file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_test_proto_goTypes = []interface{}{ + (*CallReq)(nil), // 0: Test.CallReq + (*CallRsp)(nil), // 1: Test.CallRsp + } +) + var file_test_proto_depIdxs = []int32{ 0, // 0: Test.TestService.Call:input_type -> Test.CallReq 0, // 1: Test.TestService.Hello:input_type -> Test.CallReq diff --git a/client/drpc/proto/test_drpc.pb.go b/client/drpc/proto/test_drpc.pb.go index 3ae0683..15faa19 100644 --- a/client/drpc/proto/test_drpc.pb.go +++ b/client/drpc/proto/test_drpc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-drpc. DO NOT EDIT. -// protoc-gen-go-drpc version: v0.0.27 +// protoc-gen-go-drpc version: v0.0.26 // source: test.proto package pb @@ -7,6 +7,7 @@ package pb import ( context "context" errors "errors" + proto "google.golang.org/protobuf/proto" drpc "storj.io/drpc" drpcerr "storj.io/drpc/drpcerr" diff --git a/client/drpc/proto/test_micro.pb.go b/client/drpc/proto/test_micro.pb.go index 64d1c57..61e7d9f 100644 --- a/client/drpc/proto/test_micro.pb.go +++ b/client/drpc/proto/test_micro.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" ) diff --git a/client/drpc/proto/test_micro_rpc.pb.go b/client/drpc/proto/test_micro_rpc.pb.go index 3866d04..2554d79 100644 --- a/client/drpc/proto/test_micro_rpc.pb.go +++ b/client/drpc/proto/test_micro_rpc.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" server "go.unistack.org/micro/v3/server" diff --git a/client/grpc/gproto/test_micro.pb.go b/client/grpc/gproto/test_micro.pb.go index 49c0e32..735b740 100644 --- a/client/grpc/gproto/test_micro.pb.go +++ b/client/grpc/gproto/test_micro.pb.go @@ -6,6 +6,7 @@ package helloworld import ( context "context" + proto "go.unistack.org/micro-tests/client/grpc/proto" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" diff --git a/client/grpc/gproto/test_micro_rpc.pb.go b/client/grpc/gproto/test_micro_rpc.pb.go index 0eb10c7..bb12265 100644 --- a/client/grpc/gproto/test_micro_rpc.pb.go +++ b/client/grpc/gproto/test_micro_rpc.pb.go @@ -6,6 +6,7 @@ package helloworld import ( context "context" + proto "go.unistack.org/micro-tests/client/grpc/proto" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" diff --git a/client/grpc/proto/test.pb.go b/client/grpc/proto/test.pb.go index 5060e72..880d320 100644 --- a/client/grpc/proto/test.pb.go +++ b/client/grpc/proto/test.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: test.proto package helloworld import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -158,11 +159,14 @@ func file_test_proto_rawDescGZIP() []byte { return file_test_proto_rawDescData } -var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_test_proto_goTypes = []interface{}{ - (*Request)(nil), // 0: helloworld.Request - (*Response)(nil), // 1: helloworld.Response -} +var ( + file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_test_proto_goTypes = []interface{}{ + (*Request)(nil), // 0: helloworld.Request + (*Response)(nil), // 1: helloworld.Response + } +) + var file_test_proto_depIdxs = []int32{ 0, // 0: helloworld.Test.Call:input_type -> helloworld.Request 0, // 1: helloworld.Test.Stream:input_type -> helloworld.Request diff --git a/client/grpc/proto/test_grpc.pb.go b/client/grpc/proto/test_grpc.pb.go index 53965d8..02068cd 100644 --- a/client/grpc/proto/test_grpc.pb.go +++ b/client/grpc/proto/test_grpc.pb.go @@ -1,13 +1,14 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.19.4 +// - protoc v3.19.1 // source: test.proto package helloworld import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -84,12 +85,12 @@ type TestServer interface { } // UnimplementedTestServer must be embedded to have forward compatible implementations. -type UnimplementedTestServer struct { -} +type UnimplementedTestServer struct{} func (UnimplementedTestServer) Call(context.Context, *Request) (*Response, error) { return nil, status.Errorf(codes.Unimplemented, "method Call not implemented") } + func (UnimplementedTestServer) Stream(Test_StreamServer) error { return status.Errorf(codes.Unimplemented, "method Stream not implemented") } diff --git a/client/http/proto/github.pb.go b/client/http/proto/github.pb.go index 586991a..d92009f 100644 --- a/client/http/proto/github.pb.go +++ b/client/http/proto/github.pb.go @@ -1,18 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: github.proto package pb import ( + reflect "reflect" + sync "sync" + _ "go.unistack.org/micro-proto/v3/api" _ "go.unistack.org/micro-proto/v3/openapiv3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -225,12 +226,15 @@ func file_github_proto_rawDescGZIP() []byte { return file_github_proto_rawDescData } -var file_github_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_proto_goTypes = []interface{}{ - (*LookupUserReq)(nil), // 0: github.LookupUserReq - (*LookupUserRsp)(nil), // 1: github.LookupUserRsp - (*Error)(nil), // 2: github.Error -} +var ( + file_github_proto_msgTypes = make([]protoimpl.MessageInfo, 3) + file_github_proto_goTypes = []interface{}{ + (*LookupUserReq)(nil), // 0: github.LookupUserReq + (*LookupUserRsp)(nil), // 1: github.LookupUserRsp + (*Error)(nil), // 2: github.Error + } +) + var file_github_proto_depIdxs = []int32{ 0, // 0: github.Github.LookupUser:input_type -> github.LookupUserReq 0, // 1: github.Github.LookupUserWithoutPath:input_type -> github.LookupUserReq diff --git a/client/http/proto/github_micro.pb.go b/client/http/proto/github_micro.pb.go index f3de394..fe19d9a 100644 --- a/client/http/proto/github_micro.pb.go +++ b/client/http/proto/github_micro.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" ) diff --git a/client/http/proto/github_micro_http.pb.go b/client/http/proto/github_micro_http.pb.go index 88065e2..59bba74 100644 --- a/client/http/proto/github_micro_http.pb.go +++ b/client/http/proto/github_micro_http.pb.go @@ -6,11 +6,12 @@ package pb import ( context "context" + http "net/http" + v3 "go.unistack.org/micro-client-http/v3" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" server "go.unistack.org/micro/v3/server" - http "net/http" ) type githubClient struct { @@ -23,11 +24,6 @@ func NewGithubClient(name string, c client.Client) GithubClient { } func (c *githubClient) LookupUser(ctx context.Context, req *LookupUserReq, opts ...client.CallOption) (*LookupUserRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodGet), v3.Path("/users/{username}"), @@ -41,11 +37,6 @@ func (c *githubClient) LookupUser(ctx context.Context, req *LookupUserReq, opts } func (c *githubClient) LookupUserWithoutPath(ctx context.Context, req *LookupUserReq, opts ...client.CallOption) (*LookupUserRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodGet), v3.Path("/{username}"), diff --git a/codec/proto/test.pb.go b/codec/proto/test.pb.go index 67c7c31..cbd3617 100644 --- a/codec/proto/test.pb.go +++ b/codec/proto/test.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: test.proto package pb import ( + reflect "reflect" + codec "go.unistack.org/micro/v3/codec" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" ) const ( @@ -38,6 +39,7 @@ var file_test_proto_rawDesc = []byte{ var file_test_proto_goTypes = []interface{}{ (*codec.Frame)(nil), // 0: micro.codec.Frame } + var file_test_proto_depIdxs = []int32{ 0, // 0: helloworld.Test.Call:input_type -> micro.codec.Frame 0, // 1: helloworld.Test.Call:output_type -> micro.codec.Frame diff --git a/codec/proto/test_micro.pb.go b/codec/proto/test_micro.pb.go index 73536c4..ef78b5c 100644 --- a/codec/proto/test_micro.pb.go +++ b/codec/proto/test_micro.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" codec "go.unistack.org/micro/v3/codec" diff --git a/codec/proto/test_micro_http.pb.go b/codec/proto/test_micro_http.pb.go index 15e8350..94455aa 100644 --- a/codec/proto/test_micro_http.pb.go +++ b/codec/proto/test_micro_http.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + _ "go.unistack.org/micro-client-http/v3" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" diff --git a/codec/segmentio/proto/test.pb.go b/codec/segmentio/proto/test.pb.go index c6a0771..573bc3e 100644 --- a/codec/segmentio/proto/test.pb.go +++ b/codec/segmentio/proto/test.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: test.proto package pb import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -154,11 +155,14 @@ func file_test_proto_rawDescGZIP() []byte { return file_test_proto_rawDescData } -var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_test_proto_goTypes = []interface{}{ - (*Request)(nil), // 0: helloworld.Request - (*Response)(nil), // 1: helloworld.Response -} +var ( + file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_test_proto_goTypes = []interface{}{ + (*Request)(nil), // 0: helloworld.Request + (*Response)(nil), // 1: helloworld.Response + } +) + var file_test_proto_depIdxs = []int32{ 0, // 0: helloworld.Test.Call:input_type -> helloworld.Request 1, // 1: helloworld.Test.Call:output_type -> helloworld.Response diff --git a/codec/segmentio/proto/test_micro.pb.go b/codec/segmentio/proto/test_micro.pb.go index dba20c9..4a00633 100644 --- a/codec/segmentio/proto/test_micro.pb.go +++ b/codec/segmentio/proto/test_micro.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" ) diff --git a/codec/segmentio/proto/test_micro_http.pb.go b/codec/segmentio/proto/test_micro_http.pb.go index a335999..6f4ccb7 100644 --- a/codec/segmentio/proto/test_micro_http.pb.go +++ b/codec/segmentio/proto/test_micro_http.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + _ "go.unistack.org/micro-client-http/v3" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" diff --git a/flow/proto/test.pb.go b/flow/proto/test.pb.go index 503db31..b83e67d 100644 --- a/flow/proto/test.pb.go +++ b/flow/proto/test.pb.go @@ -1,18 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: test.proto package pb import ( + reflect "reflect" + sync "sync" + _ "go.unistack.org/micro-proto/v3/api" _ "go.unistack.org/micro-proto/v3/openapiv3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -503,18 +504,21 @@ func file_test_proto_rawDescGZIP() []byte { return file_test_proto_rawDescData } -var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_test_proto_goTypes = []interface{}{ - (*MailUserReq)(nil), // 0: test.MailUserReq - (*MailUserRsp)(nil), // 1: test.MailUserRsp - (*UpdateUserReq)(nil), // 2: test.UpdateUserReq - (*UpdateUserRsp)(nil), // 3: test.UpdateUserRsp - (*DeleteUserReq)(nil), // 4: test.DeleteUserReq - (*DeleteUserRsp)(nil), // 5: test.DeleteUserRsp - (*LookupUserReq)(nil), // 6: test.LookupUserReq - (*LookupUserRsp)(nil), // 7: test.LookupUserRsp - (*Error)(nil), // 8: test.Error -} +var ( + file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 9) + file_test_proto_goTypes = []interface{}{ + (*MailUserReq)(nil), // 0: test.MailUserReq + (*MailUserRsp)(nil), // 1: test.MailUserRsp + (*UpdateUserReq)(nil), // 2: test.UpdateUserReq + (*UpdateUserRsp)(nil), // 3: test.UpdateUserRsp + (*DeleteUserReq)(nil), // 4: test.DeleteUserReq + (*DeleteUserRsp)(nil), // 5: test.DeleteUserRsp + (*LookupUserReq)(nil), // 6: test.LookupUserReq + (*LookupUserRsp)(nil), // 7: test.LookupUserRsp + (*Error)(nil), // 8: test.Error + } +) + var file_test_proto_depIdxs = []int32{ 6, // 0: test.TestService.LookupUser:input_type -> test.LookupUserReq 2, // 1: test.TestService.UpdateUser:input_type -> test.UpdateUserReq diff --git a/flow/proto/test_micro.pb.go b/flow/proto/test_micro.pb.go index 17bf334..098ceab 100644 --- a/flow/proto/test_micro.pb.go +++ b/flow/proto/test_micro.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" ) diff --git a/flow/proto/test_micro_http.pb.go b/flow/proto/test_micro_http.pb.go index 3c7c08a..522a1ad 100644 --- a/flow/proto/test_micro_http.pb.go +++ b/flow/proto/test_micro_http.pb.go @@ -6,12 +6,13 @@ package pb import ( context "context" + http "net/http" + time "time" + v3 "go.unistack.org/micro-client-http/v3" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" server "go.unistack.org/micro/v3/server" - http "net/http" - time "time" ) type testServiceClient struct { @@ -24,11 +25,6 @@ func NewTestServiceClient(name string, c client.Client) TestServiceClient { } func (c *testServiceClient) LookupUser(ctx context.Context, req *LookupUserReq, opts ...client.CallOption) (*LookupUserRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodGet), v3.Path("/v1/user/{name}"), @@ -43,11 +39,6 @@ func (c *testServiceClient) LookupUser(ctx context.Context, req *LookupUserReq, } func (c *testServiceClient) UpdateUser(ctx context.Context, req *UpdateUserReq, opts ...client.CallOption) (*UpdateUserRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodPut), v3.Path("/v1/user/{name}"), @@ -63,11 +54,6 @@ func (c *testServiceClient) UpdateUser(ctx context.Context, req *UpdateUserReq, } func (c *testServiceClient) DeleteUser(ctx context.Context, req *DeleteUserReq, opts ...client.CallOption) (*DeleteUserRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodDelete), v3.Path("/v1/user/{name}"), @@ -82,11 +68,6 @@ func (c *testServiceClient) DeleteUser(ctx context.Context, req *DeleteUserReq, } func (c *testServiceClient) MailUser(ctx context.Context, req *MailUserReq, opts ...client.CallOption) (*MailUserRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodPost), v3.Path("/v1/user/{name}/mail"), diff --git a/go.mod b/go.mod index 744654c..22ab931 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,11 @@ require ( github.com/opentracing/opentracing-go v1.2.0 github.com/segmentio/kafka-go v0.4.28 github.com/stretchr/testify v1.7.0 - github.com/twmb/franz-go v1.3.4 + github.com/twmb/franz-go v1.4.0 go.unistack.org/micro-broker-kgo/v3 v3.8.2 go.unistack.org/micro-broker-segmentio/v3 v3.8.0 go.unistack.org/micro-client-grpc/v3 v3.8.2 - go.unistack.org/micro-client-http/v3 v3.8.6 + go.unistack.org/micro-client-http/v3 v3.8.4 go.unistack.org/micro-codec-grpc/v3 v3.8.1 go.unistack.org/micro-codec-json/v3 v3.8.0 go.unistack.org/micro-codec-jsonpb/v3 v3.8.1 @@ -24,7 +24,7 @@ require ( go.unistack.org/micro-config-vault/v3 v3.8.4 go.unistack.org/micro-meter-prometheus/v3 v3.8.1 go.unistack.org/micro-meter-victoriametrics/v3 v3.8.6 - go.unistack.org/micro-proto/v3 v3.2.7 + go.unistack.org/micro-proto/v3 v3.2.5 go.unistack.org/micro-router-register/v3 v3.8.1 go.unistack.org/micro-server-grpc/v3 v3.8.0 go.unistack.org/micro-server-http/v3 v3.9.5 @@ -33,10 +33,8 @@ require ( go.unistack.org/micro-wrapper-sql/v3 v3.0.1 go.unistack.org/micro-wrapper-trace-opentracing/v3 v3.8.0 go.unistack.org/micro/v3 v3.8.21 - golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect - golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect golang.org/x/tools v0.1.5 // indirect - google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a // indirect + google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 // indirect google.golang.org/grpc v1.44.0 google.golang.org/protobuf v1.27.1 modernc.org/sqlite v1.14.7 diff --git a/go.sum b/go.sum index e437928..932748f 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,9 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -293,8 +294,9 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNU github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.9.8/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.14.4 h1:eijASRJcobkVtSt81Olfh7JX43osYLwy5krOJo6YEu4= +github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/cpuid/v2 v2.0.6 h1:dQ5ueTiftKxp0gyjKSx5+8BtPWkyQbd95m8Gys/RarI= github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -369,8 +371,9 @@ github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.11/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.12 h1:44l88ehTZAUGW4VlO1QC4zkilL99M6Y9MXNwEs0uzP8= github.com/pierrec/lz4/v4 v4.1.12/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= +github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -441,12 +444,12 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/twmb/franz-go v1.2.6/go.mod h1:P+i2DnBaec1o0z9EI8CyAM/WAjG99CHI3oCAhZDoy48= -github.com/twmb/franz-go v1.3.4 h1:8ON6aAqm1RrfAXbXPH39JD1RU9EH5kX5t6UtQPJhIp8= -github.com/twmb/franz-go v1.3.4/go.mod h1:sSAjFZNo2ux82hEhK45VobRGImo9zwlNK0yWqz2QYIk= +github.com/twmb/franz-go v1.4.0 h1:AH/wEqRD4a8EGQkakQjR+5GFNR515BfJVX2xeUCeSzw= +github.com/twmb/franz-go v1.4.0/go.mod h1:FfwAqMS5PQ6P7DLY539GrvmT6NorjIXU/uFCLoEDybQ= github.com/twmb/franz-go/pkg/kmsg v0.0.0-20211127185622-3b34db0c6d1e/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY= github.com/twmb/franz-go/pkg/kmsg v0.0.0-20211207071611-6a03ca9e400b/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY= -github.com/twmb/franz-go/pkg/kmsg v0.0.0-20220222041924-02560c7b49ca h1:TtTuEMxsLQ6xwtDzov7wCcP08Zsdua/9+mB2nEtNY5w= -github.com/twmb/franz-go/pkg/kmsg v0.0.0-20220222041924-02560c7b49ca/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY= +github.com/twmb/franz-go/pkg/kmsg v0.0.0-20220301191019-c3fc8e03e6f4 h1:M1kTQy+dMZWjXW2Ps1XBPwhbmV3xjR8XAtQ4Vlwx8gU= +github.com/twmb/franz-go/pkg/kmsg v0.0.0-20220301191019-c3fc8e03e6f4/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY= github.com/twmb/go-rbtree v1.0.0 h1:KxN7dXJ8XaZ4cvmHV1qqXTshxX3EBvX/toG5+UR49Mg= github.com/twmb/go-rbtree v1.0.0/go.mod h1:UlIAI8gu3KRPkXSobZnmJfVwCJgEhD/liWzT5ppzIyc= github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg= @@ -484,32 +487,50 @@ go.unistack.org/micro-broker-segmentio/v3 v3.8.0 h1:Nm9BaS4eD6kuewHRGmUd/QFbdv4F go.unistack.org/micro-broker-segmentio/v3 v3.8.0/go.mod h1:Q3mavh0ZoNRO6mw31USvE760lDWB1nQHWiE64F6s8rs= go.unistack.org/micro-client-grpc/v3 v3.8.2 h1:BPlIQr90hW2fXPat9vg5SsoV9Xy8XHrEdimmgLVriWM= go.unistack.org/micro-client-grpc/v3 v3.8.2/go.mod h1:n6vtmUoHgnOaYFLmG+aa4a52lhlA5BzAQsELbzktKv4= -go.unistack.org/micro-client-http/v3 v3.8.6 h1:hV1ozchmh3rXenfGo/YN+Vq3NrxyK+/J7JxaVy4nOkk= -go.unistack.org/micro-client-http/v3 v3.8.6/go.mod h1:Z2O3/RPMXL0U9aYdiiLUID4FdfhPnEp6UCI/Y73w9S8= +go.unistack.org/micro-client-http/v3 v3.8.4 h1:XJPdp5AIXbl7MXO1qOgSMMtW1Qufg2H9tVBf3d+md+U= +go.unistack.org/micro-client-http/v3 v3.8.4/go.mod h1:J5EsA/EC5Fll8JrXCESNAQ3tPwPKR1cJg9OrPH7q2BM= +go.unistack.org/micro-codec-grpc/v3 v3.8.1 h1:vZrR07L8NKziG1dtzCBKoooaHpV3oP2c7rh93ClbUGI= go.unistack.org/micro-codec-grpc/v3 v3.8.1/go.mod h1:RawS1ObPRsjsdvDXrGcLNnTexOHdU9yRZbF4QhWkRWw= +go.unistack.org/micro-codec-json/v3 v3.8.0 h1:sQ6xdHaNUCxCiUakGaV1t8lbX1rGWlgnF/HbsXyhkGg= go.unistack.org/micro-codec-json/v3 v3.8.0/go.mod h1:+F7S3ZNTKdMsu6pYFeNdKNT8G8b/nXugdln/lUY1kO8= +go.unistack.org/micro-codec-jsonpb/v3 v3.8.1 h1:JO5KVUC/fL0CephI42xwkKZt0SLNpP4w66nAk7O9oi8= go.unistack.org/micro-codec-jsonpb/v3 v3.8.1/go.mod h1:igXQT6P1wibc9mVjYS99w56s4M2DlIUCl4GQmUQrtQU= +go.unistack.org/micro-codec-proto/v3 v3.8.1 h1:86bJca4JnE4Qp8u9sdUGyKi8n19c+3tXdDYN39KAkIY= go.unistack.org/micro-codec-proto/v3 v3.8.1/go.mod h1:KawLWwswDCunabwWv3QvXVJWwKNhv6WiSbR3GQ4JHHA= +go.unistack.org/micro-codec-segmentio/v3 v3.8.1 h1:e8/8aDlTfSFM7T3azEGxUE9xQ6FPid124Uo+2p/ZCXA= go.unistack.org/micro-codec-segmentio/v3 v3.8.1/go.mod h1:d7xjN5JwqNXTHi9wVLZimOcKjXtZzScLbgCKeBuosPM= +go.unistack.org/micro-codec-urlencode/v3 v3.8.1 h1:p1VzzvuQnbm2CQnn/qr7NDiuaEuM6eXuh2oExWIUFmk= go.unistack.org/micro-codec-urlencode/v3 v3.8.1/go.mod h1:TxaelCAvvXLyZpMIhZUvsMi6Xy2J3rvKKI7WOQhb5wI= +go.unistack.org/micro-codec-xml/v3 v3.8.1 h1:hE211qCnyjdPt33ub1cg4HbHaKtHx0tNDXtq5xwLjQ4= go.unistack.org/micro-codec-xml/v3 v3.8.1/go.mod h1:sNwBgamgKsumUV06rk8Z+Gutzshfm0VnCYH+YTUCqqU= +go.unistack.org/micro-config-consul/v3 v3.8.1 h1:9LAzRHjV89e/qP5jEDCFdmW9Dm6SX7u4BbkksL+uXd4= go.unistack.org/micro-config-consul/v3 v3.8.1/go.mod h1:GXJySsspDNaPSiUseVxKpDfC1bWqsxiZXFd6T2GdMww= +go.unistack.org/micro-config-env/v3 v3.8.2 h1:RwcSRJW5mX7e71Xr18GMGEQWmJQBuQk+gxE3nX3G/xA= go.unistack.org/micro-config-env/v3 v3.8.2/go.mod h1:3CSfYNEXi3U+FtOQT9pYD7cGHXMSOJX3We1XZ5rCVvI= +go.unistack.org/micro-config-vault/v3 v3.8.4 h1:Z3vXMurW1mQ5Gpwex7Tf/4vb0YSiAZUFK5MvCOHdCGE= go.unistack.org/micro-config-vault/v3 v3.8.4/go.mod h1:LYy5hBXzKCwsuaNCkj841n3elt0rKicsR2bDq3kTLNI= +go.unistack.org/micro-meter-prometheus/v3 v3.8.1 h1:C26yE+8Im/wnpRfMAsB9DJLdDru2qtHiF9QZpUSOPao= go.unistack.org/micro-meter-prometheus/v3 v3.8.1/go.mod h1:DRYX6LfXZkhD8CfOUTKaP46fmiWsHefsPIlB3uruRfM= +go.unistack.org/micro-meter-victoriametrics/v3 v3.8.6 h1:Zrh7RDu7IuaCTb2MG4HQ4B8ePe5HpwX+rfq9QHwwkUQ= go.unistack.org/micro-meter-victoriametrics/v3 v3.8.6/go.mod h1:mZu8a/71EWh+sjuVvvZEsUNkrhrnSddXIwE3/E9NVIg= go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= go.unistack.org/micro-proto/v3 v3.1.1/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= go.unistack.org/micro-proto/v3 v3.2.1/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM= -go.unistack.org/micro-proto/v3 v3.2.7 h1:zG6d69kHc+oij2lwQ3AfrCgdjiEVRG2A7TlsxjusWs4= -go.unistack.org/micro-proto/v3 v3.2.7/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM= +go.unistack.org/micro-proto/v3 v3.2.5 h1:qaMr9oaO8J2X9nvcZfQ+JriuEFfoMzRvFfQdKoVlWgU= +go.unistack.org/micro-proto/v3 v3.2.5/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM= +go.unistack.org/micro-router-register/v3 v3.8.1 h1:7pxbBxT4gk9XfigpHYWHFEljWpwVXm2QndZhX75ZAqU= go.unistack.org/micro-router-register/v3 v3.8.1/go.mod h1:JKRDKYMl6A/ZqIux2D4txgerRfT+HJdPbo0Ik6nKo98= +go.unistack.org/micro-server-grpc/v3 v3.8.0 h1:/cP4WBftiO7Vlj9D5YUShqmnw7CxyobXZCVshs5YfY8= go.unistack.org/micro-server-grpc/v3 v3.8.0/go.mod h1:UcevUkT7vZwDVxWWHWg+GtSDG6ro5doNxihNKdDCr1o= go.unistack.org/micro-server-http/v3 v3.9.5 h1:qmsCEVIIysI0u3k8jGQaLnT7iJQVDJaSnPHnLKhMcQI= go.unistack.org/micro-server-http/v3 v3.9.5/go.mod h1:yUSA+FHQT7RFIq8eB24mShtATkOE2uSI/PO4FL7GFzs= +go.unistack.org/micro-server-tcp/v3 v3.8.0 h1:J6vuctWx/A4FRrY4FuS5KUGPopLEpB8/2c8ntWQfWXk= go.unistack.org/micro-server-tcp/v3 v3.8.0/go.mod h1:U2LjBk52yxq6QyOmZomS2FJTqca6E0q71UJrW4QgoNk= +go.unistack.org/micro-wrapper-recovery/v3 v3.8.0 h1:ivobT81NUA/74hshbbXM7iOcgODYDHvD2JOHVas6qxU= go.unistack.org/micro-wrapper-recovery/v3 v3.8.0/go.mod h1:22Ik6keu5Q1Pix6M3gMDAYbAa7cr9pfM6l7XbIuKCvg= +go.unistack.org/micro-wrapper-sql/v3 v3.0.1 h1:lrnSN8GL0c4lkL0ud0PbI6sbRjkQNxE1pQXIccQr+uw= go.unistack.org/micro-wrapper-sql/v3 v3.0.1/go.mod h1:yRjdEDz6Ak1ZnlPC0o7pxtCOBuOSdc2BSDQZu/fpbYk= +go.unistack.org/micro-wrapper-trace-opentracing/v3 v3.8.0 h1:3MboqNLqh+L2Dvj2Azsf+a+HJMkO1Nb8HIBCkcxCrhE= go.unistack.org/micro-wrapper-trace-opentracing/v3 v3.8.0/go.mod h1:+QJ8gVq8CG/6RJfj1rCZlHMHTiWrMEIRVFmwlFPxZKM= go.unistack.org/micro/v3 v3.8.0/go.mod h1:Tkteri0wiiybbH6aPqay26pZHFIAwL9LXJc2x1Jkakk= go.unistack.org/micro/v3 v3.8.4/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= @@ -534,6 +555,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -564,6 +587,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -624,6 +648,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -680,9 +705,8 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -698,6 +722,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -741,10 +766,12 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -801,8 +828,8 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a h1:uqouglH745GoGeZ1YFZbPBiu961tgi/9Qm5jaorajjQ= -google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= +google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -840,9 +867,11 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -851,6 +880,7 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -863,6 +893,7 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= @@ -879,6 +910,7 @@ modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.22 h1:BzShpwCAP7TWzFppM4k2t03RhXhgYqaibROWkrWq7lE= modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60= modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw= @@ -922,9 +954,12 @@ modernc.org/ccgo/v3 v3.15.1/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0= modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8= modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I= +modernc.org/ccgo/v3 v3.15.13 h1:hqlCzNJTXLrhS70y1PqWckrF9x1btSQRC7JFuQcBg5c= modernc.org/ccgo/v3 v3.15.13/go.mod h1:QHtvdpeODlXjdK3tsbpyK+7U9JV4PQsrPGIbtmc0KfY= modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +modernc.org/ccorpus v1.11.4 h1:YOmQBBzE8GC/puUx76D5j/gJYIZQsydrh6VMJVfXF0M= modernc.org/ccorpus v1.11.4/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM= modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= @@ -967,18 +1002,27 @@ modernc.org/libc v1.12.0/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ= modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk= modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34= modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ= +modernc.org/libc v1.14.5 h1:DAHvwGoVRDZs5iJXnX9RJrgXSsorupCWmJ2ac964Owk= modernc.org/libc v1.14.5/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak= modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8= modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= +modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14= modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM= +modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A= modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/sqlite v1.14.7 h1:A+6rGjtRQbt9SORXfV+hUyXOP3mDf7J5uz+EES/CNPE= modernc.org/sqlite v1.14.7/go.mod h1:yiCvMv3HblGmzENNIaNtFhfaNIwcla4u2JQEwJPzfEc= +modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs= modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= +modernc.org/tcl v1.11.0 h1:B/zzEYjINeaki38KcIqdQRQx7W3WE7TkrlTwGnbm2II= modernc.org/tcl v1.11.0/go.mod h1:zsTUpbQ+NxQEjOjCUlImDLPv1sG8Ww0qp66ZvyOxCgw= +modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= +modernc.org/z v1.3.0 h1:4RWULo1Nvaq5ZBhbLe74u8p6tV4Mmm0ZrPBXYPm/xjM= modernc.org/z v1.3.0/go.mod h1:+mvgLH814oDjtATDdT3rs84JnUIpkvAF5B8AVkNlE2g= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/protoc-gen-go-micro/generate.sh b/protoc-gen-go-micro/generate.sh index 3755057..3ec113f 100755 --- a/protoc-gen-go-micro/generate.sh +++ b/protoc-gen-go-micro/generate.sh @@ -5,8 +5,6 @@ INC_CODEC=$(go list -f '{{ .Dir }}' -m go.unistack.org/micro/v3) ARGS="-I${INC}" CODEC_ARGS="-I${INC_CODEC}" -protoc $ARGS $CODEC_ARGS -Iproto --go_out=paths=source_relative:./proto/ proto/*.proto - protoc $ARGS $CODEC_ARGS -Iproto --go-micro_out=components="micro|http",debug=true,tag_path=./proto/,paths=source_relative:./proto/ proto/*.proto protoc $ARGS $CODEC_ARGS -Iproto --go-micro_out=openapi_file=apidocs.swagger.json,components="openapiv3",debug=true,paths=source_relative:./proto/ proto/*.proto diff --git a/protoc-gen-go-micro/proto/apidocs.swagger.json b/protoc-gen-go-micro/proto/apidocs.swagger.json index 62fc05a..ad222ac 100644 --- a/protoc-gen-go-micro/proto/apidocs.swagger.json +++ b/protoc-gen-go-micro/proto/apidocs.swagger.json @@ -1,207 +1,478 @@ -# Generated with protoc-gen-go-micro - -openapi: 3.0.3 -info: - title: test title - description: test desc - version: 0.0.5 -servers: - - url: '{proto}://{sub}.example.com/v1' - description: server - variables: - proto: - enum: - - http - - https - default: http - description: protocols - sub: - enum: - - test - - prod - default: test - description: subdomain - - url: https://other.example.com/v1 - description: other test server -paths: - /aml: - post: - tags: - - TestService - operationId: TestService_KzAmlRs - parameters: - - name: kzAmlNewOnlineRs.rquid - in: query - schema: - type: string - - name: kzAmlNewOnlineRs.rqtm - in: query - schema: - type: string - - name: kzAmlNewOnlineRs.status.status_code - in: query - schema: - type: integer - format: int64 - - name: kzAmlNewOnlineRs.terr_status - in: query - schema: - type: integer - format: int64 - - name: kzAmlNewOnlineRs.aml_status - in: query - schema: - type: integer - format: int64 - responses: - "200": - description: OK - content: - application/json: - schema: - $ref: '#/components/schemas/ResponseAml' - /users/image/upload: - post: - tags: - - TestService - operationId: TestService_UploadFile - parameters: - - name: image - in: query - schema: - type: string - format: bytes - - name: file_name - in: query - schema: - type: string - - name: doc_type - in: query - schema: - type: string - responses: - "200": - description: OK - content: - application/json: - schema: - $ref: '#/components/schemas/ResponseImage' - /users/multipart: - post: - tags: - - TestService - operationId: TestMultipart - requestBody: - content: - multipart/form-data: - schema: - $ref: '#/components/schemas/MultipartReq' - required: true - responses: - "200": - description: OK - content: - application/json: - schema: - $ref: '#/components/schemas/MultipartRsp' - /users/test: - get: - tags: - - TestService - operationId: TestEndpoint - parameters: - - name: client_uid - in: header - required: true - schema: - type: string - - name: csrftoken - in: cookie - required: true - schema: - type: string - - name: id - in: query - schema: - type: string - - name: client_uid - in: query - schema: - type: string - responses: - "200": - description: OK - content: - application/json: - schema: - $ref: '#/components/schemas/Response' - /users/{id}: - get: - tags: - - TestService - operationId: TestService_UserByID - parameters: - - name: id - in: path - required: true - schema: - type: string - - name: client_uid - in: query - schema: - type: string - responses: - "200": - description: OK - content: - application/json: - schema: - $ref: '#/components/schemas/Response' - /users/{id}/image: - get: - tags: - - TestService - operationId: TestService_UserImageByID - parameters: - - name: id - in: path - required: true - schema: - type: string - - name: client_uid - in: query - schema: - type: string - responses: - "200": - description: OK - content: - application/octet-stream: {} -components: - schemas: - MultipartReq: - type: object - properties: - prefix: - type: string - body: - type: string - format: bytes - MultipartRsp: - type: object - properties: {} - Response: - type: object - properties: - encoded_id: - type: string - ResponseAml: - type: object - properties: - resp: - type: string - ResponseImage: - type: object - properties: {} -tags: - - name: TestService +{ + "openapi": "3.0.3", + "info": { + "title": "test title", + "description": "test desc", + "version": "0.0.5" + }, + "servers": [ + { + "url": "{proto}://{sub}.example.com/v1", + "description": "server", + "variables": { + "additionalProperties": [ + { + "name": "proto", + "value": { + "enum": [ + "http", + "https" + ], + "default": "http", + "description": "protocols" + } + }, + { + "name": "sub", + "value": { + "enum": [ + "test", + "prod" + ], + "default": "test", + "description": "subdomain" + } + } + ] + } + }, + { + "url": "https://other.example.com/v1", + "description": "other test server" + } + ], + "paths": { + "path": [ + { + "name": "/aml", + "value": { + "post": { + "tags": [ + "TestService" + ], + "operationId": "TestService_KzAmlRs", + "parameters": [ + { + "parameter": { + "name": "kzAmlNewOnlineRs.rquid", + "in": "query", + "schema": { + "schema": { + "type": "string" + } + } + } + }, + { + "parameter": { + "name": "kzAmlNewOnlineRs.rqtm", + "in": "query", + "schema": { + "schema": { + "type": "string" + } + } + } + }, + { + "parameter": { + "name": "kzAmlNewOnlineRs.status.status_code", + "in": "query", + "schema": { + "schema": { + "type": "integer", + "format": "int64" + } + } + } + }, + { + "parameter": { + "name": "kzAmlNewOnlineRs.terr_status", + "in": "query", + "schema": { + "schema": { + "type": "integer", + "format": "int64" + } + } + } + }, + { + "parameter": { + "name": "kzAmlNewOnlineRs.aml_status", + "in": "query", + "schema": { + "schema": { + "type": "integer", + "format": "int64" + } + } + } + } + ], + "responses": { + "responseOrReference": [ + { + "name": "200", + "value": { + "response": { + "description": "OK", + "content": { + "additionalProperties": [ + { + "name": "application/json", + "value": { + "schema": { + "reference": { + "Ref": "#/components/schemas/ResponseAml" + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "name": "/users/image/upload", + "value": { + "post": { + "tags": [ + "TestService" + ], + "operationId": "TestService_UploadFile", + "parameters": [ + { + "parameter": { + "name": "image", + "in": "query", + "schema": { + "schema": { + "type": "string", + "format": "bytes" + } + } + } + }, + { + "parameter": { + "name": "file_name", + "in": "query", + "schema": { + "schema": { + "type": "string" + } + } + } + }, + { + "parameter": { + "name": "doc_type", + "in": "query", + "schema": { + "schema": { + "type": "string" + } + } + } + } + ], + "responses": { + "responseOrReference": [ + { + "name": "200", + "value": { + "response": { + "description": "OK", + "content": { + "additionalProperties": [ + { + "name": "application/json", + "value": { + "schema": { + "reference": { + "Ref": "#/components/schemas/ResponseImage" + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "name": "/users/test", + "value": { + "get": { + "tags": [ + "TestService" + ], + "operationId": "TestEndpoint", + "parameters": [ + { + "parameter": { + "name": "client_uid", + "in": "header", + "required": true, + "schema": { + "schema": { + "type": "string" + } + } + } + }, + { + "parameter": { + "name": "csrftoken", + "in": "cookie", + "required": true, + "schema": { + "schema": { + "type": "string" + } + } + } + }, + { + "parameter": { + "name": "id", + "in": "query", + "schema": { + "schema": { + "type": "string" + } + } + } + }, + { + "parameter": { + "name": "client_uid", + "in": "query", + "schema": { + "schema": { + "type": "string" + } + } + } + } + ], + "responses": { + "responseOrReference": [ + { + "name": "200", + "value": { + "response": { + "description": "OK", + "content": { + "additionalProperties": [ + { + "name": "application/json", + "value": { + "schema": { + "reference": { + "Ref": "#/components/schemas/Response" + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "name": "/users/{id}", + "value": { + "get": { + "tags": [ + "TestService" + ], + "operationId": "TestService_UserByID", + "parameters": [ + { + "parameter": { + "name": "id", + "in": "path", + "required": true, + "schema": { + "schema": { + "type": "string" + } + } + } + }, + { + "parameter": { + "name": "client_uid", + "in": "query", + "schema": { + "schema": { + "type": "string" + } + } + } + } + ], + "responses": { + "responseOrReference": [ + { + "name": "200", + "value": { + "response": { + "description": "OK", + "content": { + "additionalProperties": [ + { + "name": "application/json", + "value": { + "schema": { + "reference": { + "Ref": "#/components/schemas/Response" + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "name": "/users/{id}/image", + "value": { + "get": { + "tags": [ + "TestService" + ], + "operationId": "TestService_UserImageByID", + "parameters": [ + { + "parameter": { + "name": "id", + "in": "path", + "required": true, + "schema": { + "schema": { + "type": "string" + } + } + } + }, + { + "parameter": { + "name": "client_uid", + "in": "query", + "schema": { + "schema": { + "type": "string" + } + } + } + } + ], + "responses": { + "responseOrReference": [ + { + "name": "200", + "value": { + "response": { + "description": "OK", + "content": { + "additionalProperties": [ + { + "name": "application/octet-stream", + "value": {} + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "components": { + "schemas": { + "additionalProperties": [ + { + "name": "Response", + "value": { + "schema": { + "properties": { + "additionalProperties": [ + { + "name": "encoded_id", + "value": { + "schema": { + "type": "string" + } + } + } + ] + } + } + } + }, + { + "name": "ResponseAml", + "value": { + "schema": { + "properties": { + "additionalProperties": [ + { + "name": "resp", + "value": { + "schema": { + "type": "string" + } + } + } + ] + } + } + } + }, + { + "name": "ResponseImage", + "value": { + "schema": { + "properties": {} + } + } + } + ] + } + }, + "tags": [ + { + "name": "TestService" + } + ] +} \ No newline at end of file diff --git a/protoc-gen-go-micro/proto/test.pb.go b/protoc-gen-go-micro/proto/test.pb.go index 4c37d22..17eb6e6 100644 --- a/protoc-gen-go-micro/proto/test.pb.go +++ b/protoc-gen-go-micro/proto/test.pb.go @@ -1,20 +1,21 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.17.3 // source: test.proto package pb import ( + reflect "reflect" + sync "sync" + _ "go.unistack.org/micro-proto/v3/api" _ "go.unistack.org/micro-proto/v3/openapiv3" _ "go.unistack.org/micro-proto/v3/tag" codec "go.unistack.org/micro/v3/codec" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -24,99 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type MultipartReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Prefix string `protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"` - Body []byte `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"` -} - -func (x *MultipartReq) Reset() { - *x = MultipartReq{} - if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MultipartReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MultipartReq) ProtoMessage() {} - -func (x *MultipartReq) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MultipartReq.ProtoReflect.Descriptor instead. -func (*MultipartReq) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{0} -} - -func (x *MultipartReq) GetPrefix() string { - if x != nil { - return x.Prefix - } - return "" -} - -func (x *MultipartReq) GetBody() []byte { - if x != nil { - return x.Body - } - return nil -} - -type MultipartRsp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *MultipartRsp) Reset() { - *x = MultipartRsp{} - if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MultipartRsp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MultipartRsp) ProtoMessage() {} - -func (x *MultipartRsp) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MultipartRsp.ProtoReflect.Descriptor instead. -func (*MultipartRsp) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{1} -} - type RequestAml struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -128,7 +36,7 @@ type RequestAml struct { func (x *RequestAml) Reset() { *x = RequestAml{} if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[2] + mi := &file_test_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -141,7 +49,7 @@ func (x *RequestAml) String() string { func (*RequestAml) ProtoMessage() {} func (x *RequestAml) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[2] + mi := &file_test_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -154,7 +62,7 @@ func (x *RequestAml) ProtoReflect() protoreflect.Message { // Deprecated: Use RequestAml.ProtoReflect.Descriptor instead. func (*RequestAml) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{2} + return file_test_proto_rawDescGZIP(), []int{0} } func (x *RequestAml) GetKzAmlNewOnlineRs() *KZAmlNewOnlineRs { @@ -179,7 +87,7 @@ type KZAmlNewOnlineRs struct { func (x *KZAmlNewOnlineRs) Reset() { *x = KZAmlNewOnlineRs{} if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[3] + mi := &file_test_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -192,7 +100,7 @@ func (x *KZAmlNewOnlineRs) String() string { func (*KZAmlNewOnlineRs) ProtoMessage() {} func (x *KZAmlNewOnlineRs) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[3] + mi := &file_test_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -205,7 +113,7 @@ func (x *KZAmlNewOnlineRs) ProtoReflect() protoreflect.Message { // Deprecated: Use KZAmlNewOnlineRs.ProtoReflect.Descriptor instead. func (*KZAmlNewOnlineRs) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{3} + return file_test_proto_rawDescGZIP(), []int{1} } func (x *KZAmlNewOnlineRs) GetRquid() string { @@ -254,7 +162,7 @@ type Status struct { func (x *Status) Reset() { *x = Status{} if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[4] + mi := &file_test_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -267,7 +175,7 @@ func (x *Status) String() string { func (*Status) ProtoMessage() {} func (x *Status) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[4] + mi := &file_test_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -280,7 +188,7 @@ func (x *Status) ProtoReflect() protoreflect.Message { // Deprecated: Use Status.ProtoReflect.Descriptor instead. func (*Status) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{4} + return file_test_proto_rawDescGZIP(), []int{2} } func (x *Status) GetStatusCode() int64 { @@ -301,7 +209,7 @@ type ResponseAml struct { func (x *ResponseAml) Reset() { *x = ResponseAml{} if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[5] + mi := &file_test_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -314,7 +222,7 @@ func (x *ResponseAml) String() string { func (*ResponseAml) ProtoMessage() {} func (x *ResponseAml) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[5] + mi := &file_test_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -327,7 +235,7 @@ func (x *ResponseAml) ProtoReflect() protoreflect.Message { // Deprecated: Use ResponseAml.ProtoReflect.Descriptor instead. func (*ResponseAml) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{5} + return file_test_proto_rawDescGZIP(), []int{3} } func (x *ResponseAml) GetResp() string { @@ -350,7 +258,7 @@ type RequestImage struct { func (x *RequestImage) Reset() { *x = RequestImage{} if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[6] + mi := &file_test_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -363,7 +271,7 @@ func (x *RequestImage) String() string { func (*RequestImage) ProtoMessage() {} func (x *RequestImage) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[6] + mi := &file_test_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -376,7 +284,7 @@ func (x *RequestImage) ProtoReflect() protoreflect.Message { // Deprecated: Use RequestImage.ProtoReflect.Descriptor instead. func (*RequestImage) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{6} + return file_test_proto_rawDescGZIP(), []int{4} } func (x *RequestImage) GetImage() []byte { @@ -409,7 +317,7 @@ type ResponseImage struct { func (x *ResponseImage) Reset() { *x = ResponseImage{} if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[7] + mi := &file_test_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -422,7 +330,7 @@ func (x *ResponseImage) String() string { func (*ResponseImage) ProtoMessage() {} func (x *ResponseImage) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[7] + mi := &file_test_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -435,7 +343,7 @@ func (x *ResponseImage) ProtoReflect() protoreflect.Message { // Deprecated: Use ResponseImage.ProtoReflect.Descriptor instead. func (*ResponseImage) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{7} + return file_test_proto_rawDescGZIP(), []int{5} } type Request struct { @@ -443,14 +351,13 @@ type Request struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - ClientUid string `protobuf:"bytes,2,opt,name=client_uid,json=clientUid,proto3" json:"client_uid,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } func (x *Request) Reset() { *x = Request{} if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[8] + mi := &file_test_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -463,7 +370,7 @@ func (x *Request) String() string { func (*Request) ProtoMessage() {} func (x *Request) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[8] + mi := &file_test_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -476,7 +383,7 @@ func (x *Request) ProtoReflect() protoreflect.Message { // Deprecated: Use Request.ProtoReflect.Descriptor instead. func (*Request) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{8} + return file_test_proto_rawDescGZIP(), []int{6} } func (x *Request) GetId() string { @@ -486,13 +393,6 @@ func (x *Request) GetId() string { return "" } -func (x *Request) GetClientUid() string { - if x != nil { - return x.ClientUid - } - return "" -} - type Response struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -504,7 +404,7 @@ type Response struct { func (x *Response) Reset() { *x = Response{} if protoimpl.UnsafeEnabled { - mi := &file_test_proto_msgTypes[9] + mi := &file_test_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -517,7 +417,7 @@ func (x *Response) String() string { func (*Response) ProtoMessage() {} func (x *Response) ProtoReflect() protoreflect.Message { - mi := &file_test_proto_msgTypes[9] + mi := &file_test_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -530,7 +430,7 @@ func (x *Response) ProtoReflect() protoreflect.Message { // Deprecated: Use Response.ProtoReflect.Descriptor instead. func (*Response) Descriptor() ([]byte, []int) { - return file_test_proto_rawDescGZIP(), []int{9} + return file_test_proto_rawDescGZIP(), []int{7} } func (x *Response) GetEncodedId() string { @@ -549,110 +449,77 @@ var file_test_proto_rawDesc = []byte{ 0x2f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x74, 0x61, 0x67, 0x2f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x33, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0x0a, 0x0c, 0x4d, 0x75, 0x6c, 0x74, - 0x69, 0x70, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x65, 0x66, - 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, - 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, - 0x62, 0x6f, 0x64, 0x79, 0x22, 0x0e, 0x0a, 0x0c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x72, - 0x74, 0x52, 0x73, 0x70, 0x22, 0x6d, 0x0a, 0x0a, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, - 0x6d, 0x6c, 0x12, 0x5f, 0x0a, 0x10, 0x6b, 0x7a, 0x41, 0x6d, 0x6c, 0x4e, 0x65, 0x77, 0x4f, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x2e, 0x4b, 0x5a, 0x41, 0x6d, 0x6c, 0x4e, 0x65, 0x77, 0x4f, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x52, 0x73, 0x42, 0x1b, 0x9a, 0x84, 0x9e, 0x03, 0x16, 0x78, 0x6d, 0x6c, 0x3a, 0x22, - 0x4b, 0x5a, 0x41, 0x6d, 0x6c, 0x4e, 0x65, 0x77, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x73, - 0x22, 0x52, 0x10, 0x6b, 0x7a, 0x41, 0x6d, 0x6c, 0x4e, 0x65, 0x77, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, - 0x65, 0x52, 0x73, 0x22, 0x85, 0x02, 0x0a, 0x10, 0x4b, 0x5a, 0x41, 0x6d, 0x6c, 0x4e, 0x65, 0x77, - 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x73, 0x12, 0x26, 0x0a, 0x05, 0x72, 0x71, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x10, 0x9a, 0x84, 0x9e, 0x03, 0x0b, 0x78, 0x6d, - 0x6c, 0x3a, 0x22, 0x52, 0x71, 0x55, 0x49, 0x44, 0x22, 0x52, 0x05, 0x72, 0x71, 0x75, 0x69, 0x64, - 0x12, 0x23, 0x0a, 0x04, 0x72, 0x71, 0x74, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, - 0x9a, 0x84, 0x9e, 0x03, 0x0a, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x52, 0x71, 0x54, 0x6d, 0x22, 0x52, - 0x04, 0x72, 0x71, 0x74, 0x6d, 0x12, 0x37, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x42, 0x11, 0x9a, 0x84, 0x9e, 0x03, 0x0c, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x53, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x36, - 0x0a, 0x0b, 0x74, 0x65, 0x72, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x03, 0x42, 0x15, 0x9a, 0x84, 0x9e, 0x03, 0x10, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x54, - 0x65, 0x72, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x52, 0x0a, 0x74, 0x65, 0x72, 0x72, - 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x33, 0x0a, 0x0a, 0x61, 0x6d, 0x6c, 0x5f, 0x73, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x42, 0x14, 0x9a, 0x84, 0x9e, 0x03, - 0x0f, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x41, 0x4d, 0x4c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, - 0x52, 0x09, 0x61, 0x6d, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x40, 0x0a, 0x06, 0x53, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x36, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, - 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x15, 0x9a, 0x84, 0x9e, 0x03, - 0x10, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, - 0x22, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x21, 0x0a, - 0x0b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x6d, 0x6c, 0x12, 0x12, 0x0a, 0x04, - 0x72, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x65, 0x73, 0x70, - 0x22, 0x5c, 0x0a, 0x0c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, - 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x6f, 0x63, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6f, 0x63, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0f, - 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, - 0x38, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, - 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x55, 0x69, 0x64, 0x22, 0x45, 0x0a, 0x08, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, 0x0a, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, - 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x1a, 0x9a, 0x84, 0x9e, 0x03, 0x15, - 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x2c, - 0x61, 0x74, 0x74, 0x72, 0x22, 0x52, 0x09, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x49, 0x64, - 0x32, 0xf0, 0x04, 0x0a, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x12, 0x9a, 0x01, 0x0a, 0x0d, 0x54, 0x65, 0x73, 0x74, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, - 0x72, 0x74, 0x12, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, - 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x75, - 0x6c, 0x74, 0x69, 0x70, 0x61, 0x72, 0x74, 0x52, 0x73, 0x70, 0x22, 0x61, 0xb2, 0xea, 0xff, 0xf9, - 0x01, 0x15, 0x22, 0x10, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x6d, 0x75, 0x6c, 0x74, 0x69, - 0x70, 0x61, 0x72, 0x74, 0x3a, 0x01, 0x2a, 0xaa, 0x84, 0x9e, 0x03, 0x41, 0x2a, 0x0d, 0x54, 0x65, - 0x73, 0x74, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x72, 0x74, 0x3a, 0x30, 0x0a, 0x2e, 0x12, - 0x2c, 0x0a, 0x2a, 0x0a, 0x13, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x72, 0x74, 0x2f, 0x66, - 0x6f, 0x72, 0x6d, 0x2d, 0x64, 0x61, 0x74, 0x61, 0x12, 0x13, 0x0a, 0x11, 0x12, 0x0f, 0x0a, 0x0d, - 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0xa2, 0x01, - 0x0a, 0x0c, 0x54, 0x65, 0x73, 0x74, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x0d, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x73, 0xb2, - 0xea, 0xff, 0xf9, 0x01, 0x0d, 0x12, 0x0b, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x74, 0x65, - 0x73, 0x74, 0xaa, 0x84, 0x9e, 0x03, 0x5b, 0x2a, 0x0c, 0x54, 0x65, 0x73, 0x74, 0x45, 0x6e, 0x64, - 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x32, 0x25, 0x0a, 0x23, 0x0a, 0x0a, 0x63, 0x6c, 0x69, 0x65, 0x6e, - 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x20, 0x01, 0x52, - 0x0b, 0x0a, 0x09, 0xca, 0x01, 0x06, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x32, 0x24, 0x0a, 0x22, - 0x0a, 0x09, 0x63, 0x73, 0x72, 0x66, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x06, 0x63, 0x6f, 0x6f, - 0x6b, 0x69, 0x65, 0x20, 0x01, 0x52, 0x0b, 0x0a, 0x09, 0xca, 0x01, 0x06, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x12, 0x3e, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x49, 0x44, 0x12, 0x0d, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x13, 0xb2, - 0xea, 0xff, 0xf9, 0x01, 0x0d, 0x12, 0x0b, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, - 0x64, 0x7d, 0x12, 0x4d, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x42, - 0x79, 0x49, 0x44, 0x12, 0x0d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x63, - 0x2e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x19, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x13, 0x12, 0x11, - 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x2f, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x12, 0x52, 0x0a, 0x0a, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x46, 0x69, 0x6c, 0x65, 0x12, - 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x1a, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x1b, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x15, - 0x22, 0x13, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x75, - 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x3c, 0x0a, 0x07, 0x4b, 0x7a, 0x41, 0x6d, 0x6c, 0x52, 0x73, - 0x12, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, - 0x6d, 0x6c, 0x1a, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x41, 0x6d, 0x6c, 0x22, 0x0c, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x06, 0x22, 0x04, 0x2f, - 0x61, 0x6d, 0x6c, 0x42, 0xdf, 0x01, 0x5a, 0x09, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x70, - 0x62, 0xaa, 0x84, 0x9e, 0x03, 0xce, 0x01, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x20, - 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x09, 0x74, 0x65, 0x73, 0x74, 0x20, 0x64, 0x65, 0x73, 0x63, - 0x32, 0x05, 0x30, 0x2e, 0x30, 0x2e, 0x35, 0x1a, 0x79, 0x0a, 0x1e, 0x7b, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x7d, 0x3a, 0x2f, 0x2f, 0x7b, 0x73, 0x75, 0x62, 0x7d, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, - 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x31, 0x12, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x1a, 0x4f, 0x0a, 0x27, 0x0a, 0x05, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1e, 0x0a, 0x04, - 0x68, 0x74, 0x74, 0x70, 0x0a, 0x05, 0x68, 0x74, 0x74, 0x70, 0x73, 0x12, 0x04, 0x68, 0x74, 0x74, - 0x70, 0x1a, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x0a, 0x24, 0x0a, 0x03, - 0x73, 0x75, 0x62, 0x12, 0x1d, 0x0a, 0x04, 0x74, 0x65, 0x73, 0x74, 0x0a, 0x04, 0x70, 0x72, 0x6f, - 0x64, 0x12, 0x04, 0x74, 0x65, 0x73, 0x74, 0x1a, 0x09, 0x73, 0x75, 0x62, 0x64, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x1a, 0x31, 0x0a, 0x1c, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x6f, 0x74, - 0x68, 0x65, 0x72, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x76, 0x31, 0x12, 0x11, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x65, 0x73, 0x74, 0x20, 0x73, - 0x65, 0x72, 0x76, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6d, 0x0a, 0x0a, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x41, 0x6d, 0x6c, 0x12, 0x5f, 0x0a, 0x10, 0x6b, 0x7a, 0x41, 0x6d, 0x6c, 0x4e, + 0x65, 0x77, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x4b, 0x5a, 0x41, 0x6d, 0x6c, 0x4e, 0x65, 0x77, + 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x73, 0x42, 0x1b, 0x9a, 0x84, 0x9e, 0x03, 0x16, 0x78, + 0x6d, 0x6c, 0x3a, 0x22, 0x4b, 0x5a, 0x41, 0x6d, 0x6c, 0x4e, 0x65, 0x77, 0x4f, 0x6e, 0x6c, 0x69, + 0x6e, 0x65, 0x52, 0x73, 0x22, 0x52, 0x10, 0x6b, 0x7a, 0x41, 0x6d, 0x6c, 0x4e, 0x65, 0x77, 0x4f, + 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x73, 0x22, 0x85, 0x02, 0x0a, 0x10, 0x4b, 0x5a, 0x41, 0x6d, + 0x6c, 0x4e, 0x65, 0x77, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x73, 0x12, 0x26, 0x0a, 0x05, + 0x72, 0x71, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x10, 0x9a, 0x84, 0x9e, + 0x03, 0x0b, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x52, 0x71, 0x55, 0x49, 0x44, 0x22, 0x52, 0x05, 0x72, + 0x71, 0x75, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x04, 0x72, 0x71, 0x74, 0x6d, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x0f, 0x9a, 0x84, 0x9e, 0x03, 0x0a, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x52, 0x71, + 0x54, 0x6d, 0x22, 0x52, 0x04, 0x72, 0x71, 0x74, 0x6d, 0x12, 0x37, 0x0a, 0x06, 0x73, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x11, 0x9a, 0x84, 0x9e, 0x03, 0x0c, 0x78, 0x6d, + 0x6c, 0x3a, 0x22, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, + 0x75, 0x73, 0x12, 0x36, 0x0a, 0x0b, 0x74, 0x65, 0x72, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x42, 0x15, 0x9a, 0x84, 0x9e, 0x03, 0x10, 0x78, 0x6d, + 0x6c, 0x3a, 0x22, 0x54, 0x65, 0x72, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x52, 0x0a, + 0x74, 0x65, 0x72, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x33, 0x0a, 0x0a, 0x61, 0x6d, + 0x6c, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x42, 0x14, + 0x9a, 0x84, 0x9e, 0x03, 0x0f, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x41, 0x4d, 0x4c, 0x53, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x22, 0x52, 0x09, 0x61, 0x6d, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, + 0x40, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x36, 0x0a, 0x0b, 0x73, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x15, + 0x9a, 0x84, 0x9e, 0x03, 0x10, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x43, 0x6f, 0x64, 0x65, 0x22, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, + 0x65, 0x22, 0x21, 0x0a, 0x0b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x6d, 0x6c, + 0x12, 0x12, 0x0a, 0x04, 0x72, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x72, 0x65, 0x73, 0x70, 0x22, 0x5c, 0x0a, 0x0c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, + 0x6d, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x69, + 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, + 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x6f, 0x63, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6f, 0x63, 0x54, 0x79, + 0x70, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x22, 0x19, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x45, + 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, 0x0a, 0x65, 0x6e, + 0x63, 0x6f, 0x64, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x1a, + 0x9a, 0x84, 0x9e, 0x03, 0x15, 0x78, 0x6d, 0x6c, 0x3a, 0x22, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, + 0x64, 0x5f, 0x69, 0x64, 0x2c, 0x61, 0x74, 0x74, 0x72, 0x22, 0x52, 0x09, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x65, 0x64, 0x49, 0x64, 0x32, 0xf2, 0x02, 0x0a, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x0c, 0x54, 0x65, 0x73, 0x74, 0x45, 0x6e, 0x64, + 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x0d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x13, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x0d, 0x12, 0x0b, 0x2f, 0x75, + 0x73, 0x65, 0x72, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x12, 0x3e, 0x0a, 0x08, 0x55, 0x73, 0x65, + 0x72, 0x42, 0x79, 0x49, 0x44, 0x12, 0x0d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x13, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x0d, 0x12, 0x0b, 0x2f, 0x75, + 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x4d, 0x0a, 0x0d, 0x55, 0x73, 0x65, + 0x72, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x42, 0x79, 0x49, 0x44, 0x12, 0x0d, 0x2e, 0x74, 0x65, 0x73, + 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x6d, 0x69, 0x63, 0x72, + 0x6f, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x2e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x19, 0xb2, + 0xea, 0xff, 0xf9, 0x01, 0x13, 0x12, 0x11, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, + 0x64, 0x7d, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x52, 0x0a, 0x0a, 0x55, 0x70, 0x6c, 0x6f, + 0x61, 0x64, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x1a, 0x13, 0x2e, 0x74, 0x65, 0x73, + 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x1b, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x15, 0x22, 0x13, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x3c, 0x0a, 0x07, + 0x4b, 0x7a, 0x41, 0x6d, 0x6c, 0x52, 0x73, 0x12, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, 0x6d, 0x6c, 0x1a, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x6d, 0x6c, 0x22, 0x0c, 0xb2, 0xea, + 0xff, 0xf9, 0x01, 0x06, 0x22, 0x04, 0x2f, 0x61, 0x6d, 0x6c, 0x42, 0x30, 0x5a, 0x09, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x70, 0x62, 0xaa, 0x84, 0x9e, 0x03, 0x20, 0x12, 0x1e, 0x0a, 0x0a, + 0x74, 0x65, 0x73, 0x74, 0x20, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x09, 0x74, 0x65, 0x73, 0x74, + 0x20, 0x64, 0x65, 0x73, 0x63, 0x32, 0x05, 0x30, 0x2e, 0x30, 0x2e, 0x35, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -667,40 +534,39 @@ func file_test_proto_rawDescGZIP() []byte { return file_test_proto_rawDescData } -var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_test_proto_goTypes = []interface{}{ - (*MultipartReq)(nil), // 0: test.MultipartReq - (*MultipartRsp)(nil), // 1: test.MultipartRsp - (*RequestAml)(nil), // 2: test.RequestAml - (*KZAmlNewOnlineRs)(nil), // 3: test.KZAmlNewOnlineRs - (*Status)(nil), // 4: test.Status - (*ResponseAml)(nil), // 5: test.ResponseAml - (*RequestImage)(nil), // 6: test.RequestImage - (*ResponseImage)(nil), // 7: test.ResponseImage - (*Request)(nil), // 8: test.Request - (*Response)(nil), // 9: test.Response - (*codec.Frame)(nil), // 10: micro.codec.Frame -} +var ( + file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 8) + file_test_proto_goTypes = []interface{}{ + (*RequestAml)(nil), // 0: test.RequestAml + (*KZAmlNewOnlineRs)(nil), // 1: test.KZAmlNewOnlineRs + (*Status)(nil), // 2: test.Status + (*ResponseAml)(nil), // 3: test.ResponseAml + (*RequestImage)(nil), // 4: test.RequestImage + (*ResponseImage)(nil), // 5: test.ResponseImage + (*Request)(nil), // 6: test.Request + (*Response)(nil), // 7: test.Response + (*codec.Frame)(nil), // 8: micro.codec.Frame + } +) + var file_test_proto_depIdxs = []int32{ - 3, // 0: test.RequestAml.kzAmlNewOnlineRs:type_name -> test.KZAmlNewOnlineRs - 4, // 1: test.KZAmlNewOnlineRs.status:type_name -> test.Status - 0, // 2: test.TestService.TestMultipart:input_type -> test.MultipartReq - 8, // 3: test.TestService.TestEndpoint:input_type -> test.Request - 8, // 4: test.TestService.UserByID:input_type -> test.Request - 8, // 5: test.TestService.UserImageByID:input_type -> test.Request - 6, // 6: test.TestService.UploadFile:input_type -> test.RequestImage - 2, // 7: test.TestService.KzAmlRs:input_type -> test.RequestAml - 1, // 8: test.TestService.TestMultipart:output_type -> test.MultipartRsp - 9, // 9: test.TestService.TestEndpoint:output_type -> test.Response - 9, // 10: test.TestService.UserByID:output_type -> test.Response - 10, // 11: test.TestService.UserImageByID:output_type -> micro.codec.Frame - 7, // 12: test.TestService.UploadFile:output_type -> test.ResponseImage - 5, // 13: test.TestService.KzAmlRs:output_type -> test.ResponseAml - 8, // [8:14] is the sub-list for method output_type - 2, // [2:8] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 1, // 0: test.RequestAml.kzAmlNewOnlineRs:type_name -> test.KZAmlNewOnlineRs + 2, // 1: test.KZAmlNewOnlineRs.status:type_name -> test.Status + 6, // 2: test.TestService.TestEndpoint:input_type -> test.Request + 6, // 3: test.TestService.UserByID:input_type -> test.Request + 6, // 4: test.TestService.UserImageByID:input_type -> test.Request + 4, // 5: test.TestService.UploadFile:input_type -> test.RequestImage + 0, // 6: test.TestService.KzAmlRs:input_type -> test.RequestAml + 7, // 7: test.TestService.TestEndpoint:output_type -> test.Response + 7, // 8: test.TestService.UserByID:output_type -> test.Response + 8, // 9: test.TestService.UserImageByID:output_type -> micro.codec.Frame + 5, // 10: test.TestService.UploadFile:output_type -> test.ResponseImage + 3, // 11: test.TestService.KzAmlRs:output_type -> test.ResponseAml + 7, // [7:12] is the sub-list for method output_type + 2, // [2:7] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name } func init() { file_test_proto_init() } @@ -710,30 +576,6 @@ func file_test_proto_init() { } if !protoimpl.UnsafeEnabled { file_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MultipartReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MultipartRsp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RequestAml); i { case 0: return &v.state @@ -745,7 +587,7 @@ func file_test_proto_init() { return nil } } - file_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*KZAmlNewOnlineRs); i { case 0: return &v.state @@ -757,7 +599,7 @@ func file_test_proto_init() { return nil } } - file_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Status); i { case 0: return &v.state @@ -769,7 +611,7 @@ func file_test_proto_init() { return nil } } - file_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ResponseAml); i { case 0: return &v.state @@ -781,7 +623,7 @@ func file_test_proto_init() { return nil } } - file_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RequestImage); i { case 0: return &v.state @@ -793,7 +635,7 @@ func file_test_proto_init() { return nil } } - file_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ResponseImage); i { case 0: return &v.state @@ -805,7 +647,7 @@ func file_test_proto_init() { return nil } } - file_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Request); i { case 0: return &v.state @@ -817,7 +659,7 @@ func file_test_proto_init() { return nil } } - file_test_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Response); i { case 0: return &v.state @@ -836,7 +678,7 @@ func file_test_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_test_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 8, NumExtensions: 0, NumServices: 1, }, diff --git a/protoc-gen-go-micro/proto/test.proto b/protoc-gen-go-micro/proto/test.proto index c8a8db9..9b53475 100644 --- a/protoc-gen-go-micro/proto/test.proto +++ b/protoc-gen-go-micro/proto/test.proto @@ -44,30 +44,6 @@ option (micro.openapiv3.openapiv3_swagger) = { }; service TestService { - rpc TestMultipart(MultipartReq) returns (MultipartRsp) { - option (micro.api.http) = { - post: "/users/multipart"; body: "*"; - }; - option (micro.openapiv3.openapiv3_operation) = { - operation_id: "TestMultipart"; - request_body: { - request_body: { - content: { - additional_properties: { - name: "multipart/form-data"; - value: { - schema: { - reference: { - _ref: ".MultipartReq"; - }; - }; - }; - }; - }; - }; - }; - }; - }; rpc TestEndpoint(Request) returns (Response) { option (micro.api.http) = { get: "/users/test" @@ -122,15 +98,6 @@ service TestService { } }; -message MultipartReq { - string prefix = 1; - bytes body = 2; -}; - -message MultipartRsp { - -}; - message RequestAml { KZAmlNewOnlineRs kzAmlNewOnlineRs = 1 [(micro.tag.tags) = "xml:\"KZAmlNewOnlineRs\"" ]; } diff --git a/protoc-gen-go-micro/proto/test_micro.pb.go b/protoc-gen-go-micro/proto/test_micro.pb.go index d1ef2cd..75fefe5 100644 --- a/protoc-gen-go-micro/proto/test_micro.pb.go +++ b/protoc-gen-go-micro/proto/test_micro.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" codec "go.unistack.org/micro/v3/codec" @@ -15,13 +16,6 @@ var ( TestServiceName = "TestService" TestServiceEndpoints = []api.Endpoint{ - { - Name: "TestService.TestMultipart", - Path: []string{"/users/multipart"}, - Method: []string{"POST"}, - Body: "*", - Handler: "rpc", - }, { Name: "TestService.TestEndpoint", Path: []string{"/users/test"}, @@ -60,7 +54,6 @@ func NewTestServiceEndpoints() []api.Endpoint { } type TestServiceClient interface { - TestMultipart(ctx context.Context, req *MultipartReq, opts ...client.CallOption) (*MultipartRsp, error) TestEndpoint(ctx context.Context, req *Request, opts ...client.CallOption) (*Response, error) UserByID(ctx context.Context, req *Request, opts ...client.CallOption) (*Response, error) UserImageByID(ctx context.Context, req *Request, opts ...client.CallOption) (*codec.Frame, error) @@ -69,7 +62,6 @@ type TestServiceClient interface { } type TestServiceServer interface { - TestMultipart(ctx context.Context, req *MultipartReq, rsp *MultipartRsp) error TestEndpoint(ctx context.Context, req *Request, rsp *Response) error UserByID(ctx context.Context, req *Request, rsp *Response) error UserImageByID(ctx context.Context, req *Request, rsp *codec.Frame) error diff --git a/protoc-gen-go-micro/proto/test_micro_http.pb.go b/protoc-gen-go-micro/proto/test_micro_http.pb.go index c1aecad..0377358 100644 --- a/protoc-gen-go-micro/proto/test_micro_http.pb.go +++ b/protoc-gen-go-micro/proto/test_micro_http.pb.go @@ -6,13 +6,14 @@ package pb import ( context "context" + http "net/http" + v3 "go.unistack.org/micro-client-http/v3" v31 "go.unistack.org/micro-server-http/v3" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" codec "go.unistack.org/micro/v3/codec" server "go.unistack.org/micro/v3/server" - http "net/http" ) type testServiceClient struct { @@ -24,20 +25,6 @@ func NewTestServiceClient(name string, c client.Client) TestServiceClient { return &testServiceClient{c: c, name: name} } -func (c *testServiceClient) TestMultipart(ctx context.Context, req *MultipartReq, opts ...client.CallOption) (*MultipartRsp, error) { - opts = append(opts, - v3.Method(http.MethodPost), - v3.Path("/users/multipart"), - v3.Body("*"), - ) - rsp := &MultipartRsp{} - err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.TestMultipart", req), rsp, opts...) - if err != nil { - return nil, err - } - return rsp, nil -} - func (c *testServiceClient) TestEndpoint(ctx context.Context, req *Request, opts ...client.CallOption) (*Response, error) { opts = append(opts, v3.Method(http.MethodGet), @@ -111,10 +98,6 @@ type testServiceServer struct { TestServiceServer } -func (h *testServiceServer) TestMultipart(ctx context.Context, req *MultipartReq, rsp *MultipartRsp) error { - return h.TestServiceServer.TestMultipart(ctx, req, rsp) -} - func (h *testServiceServer) TestEndpoint(ctx context.Context, req *Request, rsp *Response) error { v31.FillRequest(ctx, req, v31.Header("client_uid", "true"), @@ -141,7 +124,6 @@ func (h *testServiceServer) KzAmlRs(ctx context.Context, req *RequestAml, rsp *R func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...server.HandlerOption) error { type testService interface { - TestMultipart(ctx context.Context, req *MultipartReq, rsp *MultipartRsp) error TestEndpoint(ctx context.Context, req *Request, rsp *Response) error UserByID(ctx context.Context, req *Request, rsp *Response) error UserImageByID(ctx context.Context, req *Request, rsp *codec.Frame) error diff --git a/server/grpc/gproto/test_micro.pb.go b/server/grpc/gproto/test_micro.pb.go index d985134..7423051 100644 --- a/server/grpc/gproto/test_micro.pb.go +++ b/server/grpc/gproto/test_micro.pb.go @@ -6,6 +6,7 @@ package helloworld import ( context "context" + proto "go.unistack.org/micro-tests/server/grpc/proto" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" diff --git a/server/grpc/gproto/test_micro_rpc.pb.go b/server/grpc/gproto/test_micro_rpc.pb.go index 995c8e7..1b957a4 100644 --- a/server/grpc/gproto/test_micro_rpc.pb.go +++ b/server/grpc/gproto/test_micro_rpc.pb.go @@ -6,6 +6,7 @@ package helloworld import ( context "context" + proto "go.unistack.org/micro-tests/server/grpc/proto" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" diff --git a/server/grpc/proto/test.pb.go b/server/grpc/proto/test.pb.go index 13f58d9..ca9ecd2 100644 --- a/server/grpc/proto/test.pb.go +++ b/server/grpc/proto/test.pb.go @@ -1,17 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: test.proto package helloworld import ( + reflect "reflect" + sync "sync" + _ "go.unistack.org/micro-proto/v3/api" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( @@ -229,12 +230,15 @@ func file_test_proto_rawDescGZIP() []byte { return file_test_proto_rawDescData } -var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_test_proto_goTypes = []interface{}{ - (*Request)(nil), // 0: helloworld.Request - (*Broken)(nil), // 1: helloworld.Broken - (*Response)(nil), // 2: helloworld.Response -} +var ( + file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 3) + file_test_proto_goTypes = []interface{}{ + (*Request)(nil), // 0: helloworld.Request + (*Broken)(nil), // 1: helloworld.Broken + (*Response)(nil), // 2: helloworld.Response + } +) + var file_test_proto_depIdxs = []int32{ 1, // 0: helloworld.Request.broken:type_name -> helloworld.Broken 1, // 1: helloworld.Response.broken:type_name -> helloworld.Broken diff --git a/server/grpc/proto/test_grpc.pb.go b/server/grpc/proto/test_grpc.pb.go index c8dcbe7..ec0cbb8 100644 --- a/server/grpc/proto/test_grpc.pb.go +++ b/server/grpc/proto/test_grpc.pb.go @@ -1,13 +1,14 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.19.4 +// - protoc v3.19.1 // source: test.proto package helloworld import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -51,8 +52,7 @@ type TestServer interface { } // UnimplementedTestServer must be embedded to have forward compatible implementations. -type UnimplementedTestServer struct { -} +type UnimplementedTestServer struct{} func (UnimplementedTestServer) Call(context.Context, *Request) (*Response, error) { return nil, status.Errorf(codes.Unimplemented, "method Call not implemented") diff --git a/server/http/proto/test.pb.go b/server/http/proto/test.pb.go index 4115e0a..7d8f6fa 100644 --- a/server/http/proto/test.pb.go +++ b/server/http/proto/test.pb.go @@ -1,20 +1,21 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: test.proto package pb import ( + reflect "reflect" + sync "sync" + _ "go.unistack.org/micro-proto/v3/api" _ "go.unistack.org/micro-proto/v3/openapiv3" _ "go.unistack.org/micro-proto/v3/tag" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" - reflect "reflect" - sync "sync" ) const ( @@ -493,16 +494,19 @@ func file_test_proto_rawDescGZIP() []byte { return file_test_proto_rawDescData } -var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_test_proto_goTypes = []interface{}{ - (*CallReq)(nil), // 0: test.CallReq - (*Nested)(nil), // 1: test.Nested - (*CallRsp)(nil), // 2: test.CallRsp - (*CallReq1)(nil), // 3: test.CallReq1 - (*CallRsp1)(nil), // 4: test.CallRsp1 - (*Error)(nil), // 5: test.Error - (*wrapperspb.UInt64Value)(nil), // 6: google.protobuf.UInt64Value -} +var ( + file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 6) + file_test_proto_goTypes = []interface{}{ + (*CallReq)(nil), // 0: test.CallReq + (*Nested)(nil), // 1: test.Nested + (*CallRsp)(nil), // 2: test.CallRsp + (*CallReq1)(nil), // 3: test.CallReq1 + (*CallRsp1)(nil), // 4: test.CallRsp1 + (*Error)(nil), // 5: test.Error + (*wrapperspb.UInt64Value)(nil), // 6: google.protobuf.UInt64Value + } +) + var file_test_proto_depIdxs = []int32{ 1, // 0: test.CallReq.nested:type_name -> test.Nested 6, // 1: test.Nested.uint64_args:type_name -> google.protobuf.UInt64Value diff --git a/server/http/proto/test_micro.pb.go b/server/http/proto/test_micro.pb.go index 8652bbb..03c0214 100644 --- a/server/http/proto/test_micro.pb.go +++ b/server/http/proto/test_micro.pb.go @@ -6,6 +6,7 @@ package pb import ( context "context" + api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" ) diff --git a/server/http/proto/test_micro_http.pb.go b/server/http/proto/test_micro_http.pb.go index 0025fae..606d253 100644 --- a/server/http/proto/test_micro_http.pb.go +++ b/server/http/proto/test_micro_http.pb.go @@ -6,13 +6,14 @@ package pb import ( context "context" + http "net/http" + time "time" + v3 "go.unistack.org/micro-client-http/v3" v31 "go.unistack.org/micro-server-http/v3" api "go.unistack.org/micro/v3/api" client "go.unistack.org/micro/v3/client" server "go.unistack.org/micro/v3/server" - http "net/http" - time "time" ) type testDoubleClient struct { @@ -25,11 +26,6 @@ func NewTestDoubleClient(name string, c client.Client) TestDoubleClient { } func (c *testDoubleClient) CallDouble(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodPost), v3.Path("/v1/testdouble/call/name/{name}"), @@ -80,11 +76,6 @@ func NewTestClient(name string, c client.Client) TestClient { } func (c *testClient) CallRepeatedString(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodPost), v3.Path("/v1/test/call_repeated_string"), @@ -100,11 +91,6 @@ func (c *testClient) CallRepeatedString(ctx context.Context, req *CallReq, opts } func (c *testClient) CallRepeatedInt64(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodPost), v3.Path("/v1/test/call_repeated_int64"), @@ -120,19 +106,14 @@ func (c *testClient) CallRepeatedInt64(ctx context.Context, req *CallReq, opts . } func (c *testClient) Call(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodPost), v3.Path("/v1/test/call/{name}"), v3.Body("*"), ) opts = append(opts, - v3.Cookie("Csrftoken", "true"), v3.Header("Clientid", "true"), + v3.Cookie("Csrftoken", "true"), ) opts = append(opts, client.WithRequestTimeout(time.Second*5)) rsp := &CallRsp{} @@ -144,11 +125,6 @@ func (c *testClient) Call(ctx context.Context, req *CallReq, opts ...client.Call } func (c *testClient) CallError(ctx context.Context, req *CallReq1, opts ...client.CallOption) (*CallRsp1, error) { - errmap := make(map[string]interface{}, 1) - errmap["default"] = &Error{} - opts = append(opts, - v3.ErrorMap(errmap), - ) opts = append(opts, v3.Method(http.MethodPost), v3.Path("/v1/test/callerror/{name}"), @@ -185,8 +161,8 @@ func (h *testServer) Call(ctx context.Context, req *CallReq, rsp *CallRsp) error ctx, cancel = context.WithTimeout(ctx, time.Second*5) defer cancel() v31.FillRequest(ctx, req, - v31.Header("Clientid", "true"), v31.Cookie("Csrftoken", "true"), + v31.Header("Clientid", "true"), ) return h.TestServer.Call(ctx, req, rsp) } diff --git a/util/reflect/proto/test.pb.go b/util/reflect/proto/test.pb.go index 1d08e4e..51e32cf 100644 --- a/util/reflect/proto/test.pb.go +++ b/util/reflect/proto/test.pb.go @@ -1,17 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.4 +// protoc v3.19.1 // source: test.proto package pb import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" - reflect "reflect" - sync "sync" ) const ( @@ -194,12 +195,15 @@ func file_test_proto_rawDescGZIP() []byte { return file_test_proto_rawDescData } -var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_test_proto_goTypes = []interface{}{ - (*CallReq)(nil), // 0: reflect.CallReq - (*Nested)(nil), // 1: reflect.Nested - (*wrapperspb.UInt64Value)(nil), // 2: google.protobuf.UInt64Value -} +var ( + file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2) + file_test_proto_goTypes = []interface{}{ + (*CallReq)(nil), // 0: reflect.CallReq + (*Nested)(nil), // 1: reflect.Nested + (*wrapperspb.UInt64Value)(nil), // 2: google.protobuf.UInt64Value + } +) + var file_test_proto_depIdxs = []int32{ 1, // 0: reflect.CallReq.nested:type_name -> reflect.Nested 2, // 1: reflect.Nested.uint64_args:type_name -> google.protobuf.UInt64Value