cleanup

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-12-11 02:00:29 +03:00
parent e7e1ff15f4
commit 1aa324c17f
63 changed files with 2488 additions and 1165 deletions
--- a/protoc-gen-go-micro/proto/test.pb.go
+++ b/protoc-gen-go-micro/proto/test.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.21.12
+// 	protoc        v5.28.3
 // source: test.proto

 package pb
@@ -603,24 +603,24 @@ var file_test_proto_rawDesc = []byte{
 	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,
+	0x6c, 0x74, 0x69, 0x70, 0x61, 0x72, 0x74, 0x52, 0x73, 0x70, 0x22, 0x61, 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, 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, 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,
+	0x74, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x73, 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, 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,
+	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,
--- a/protoc-gen-go-micro/proto/test_micro.pb.go
+++ b/protoc-gen-go-micro/proto/test_micro.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.10.2
-// - protoc              v3.21.12
+// - protoc-gen-go-micro v3.10.4
+// - protoc              v5.28.3
 // source: test.proto

 package pb
@@ -9,59 +9,12 @@ package pb
 import (
 	context "context"
 	codec "go.unistack.org/micro-proto/v3/codec"
-	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )

 var (
 	TestServiceName = "TestService"
 )
-var (
-	TestServiceServerEndpoints = []v3.EndpointMetadata{
-		{
-			Name:   "TestService.TestMultipart",
-			Path:   "/users/multipart",
-			Method: "POST",
-			Body:   "*",
-			Stream: false,
-		},
-		{
-			Name:   "TestService.TestEndpoint",
-			Path:   "/users/test",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "TestService.UserByID",
-			Path:   "/users/{id}",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "TestService.UserImageByID",
-			Path:   "/users/{id}/image",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "TestService.UploadFile",
-			Path:   "/users/image/upload",
-			Method: "POST",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "TestService.KzAmlRs",
-			Path:   "/aml",
-			Method: "POST",
-			Body:   "",
-			Stream: false,
-		},
-	}
-)

 type TestServiceClient interface {
 	TestMultipart(ctx context.Context, req *MultipartReq, opts ...client.CallOption) (*MultipartRsp, error)
--- a/protoc-gen-go-micro/proto/test_micro_http.pb.go
+++ b/protoc-gen-go-micro/proto/test_micro_http.pb.go
@@ -1,19 +1,66 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.2
+// protoc-gen-go-micro version: v3.10.4
 // source: test.proto

 package pb

 import (
 	context "context"
-	v3 "go.unistack.org/micro-client-http/v3"
+	v31 "go.unistack.org/micro-client-http/v3"
 	codec "go.unistack.org/micro-proto/v3/codec"
-	v31 "go.unistack.org/micro-server-http/v3"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
 )

+var (
+	TestServiceServerEndpoints = []v3.EndpointMetadata{
+		{
+			Name:   "TestService.TestMultipart",
+			Path:   "/users/multipart",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+		{
+			Name:   "TestService.TestEndpoint",
+			Path:   "/users/test",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "TestService.UserByID",
+			Path:   "/users/{id}",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "TestService.UserImageByID",
+			Path:   "/users/{id}/image",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "TestService.UploadFile",
+			Path:   "/users/image/upload",
+			Method: "POST",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "TestService.KzAmlRs",
+			Path:   "/aml",
+			Method: "POST",
+			Body:   "",
+			Stream: false,
+		},
+	}
+)
+
 type testServiceClient struct {
 	c    client.Client
 	name string
@@ -25,9 +72,9 @@ func NewTestServiceClient(name string, c client.Client) TestServiceClient {

 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("*"),
+		v31.Method(http.MethodPost),
+		v31.Path("/users/multipart"),
+		v31.Body("*"),
 	)
 	rsp := &MultipartRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.TestMultipart", req), rsp, opts...)
@@ -39,12 +86,12 @@ func (c *testServiceClient) TestMultipart(ctx context.Context, req *MultipartReq

 func (c *testServiceClient) TestEndpoint(ctx context.Context, req *Request, opts ...client.CallOption) (*Response, error) {
 	opts = append(opts,
-		v3.Method(http.MethodGet),
-		v3.Path("/users/test"),
+		v31.Method(http.MethodGet),
+		v31.Path("/users/test"),
 	)
 	opts = append(opts,
-		v3.Header("client_uid", "true"),
-		v3.Cookie("csrftoken", "true"),
+		v31.Header("client_uid", "true"),
+		v31.Cookie("csrftoken", "true"),
 	)
 	rsp := &Response{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.TestEndpoint", req), rsp, opts...)
@@ -56,8 +103,8 @@ func (c *testServiceClient) TestEndpoint(ctx context.Context, req *Request, opts

 func (c *testServiceClient) UserByID(ctx context.Context, req *Request, opts ...client.CallOption) (*Response, error) {
 	opts = append(opts,
-		v3.Method(http.MethodGet),
-		v3.Path("/users/{id}"),
+		v31.Method(http.MethodGet),
+		v31.Path("/users/{id}"),
 	)
 	rsp := &Response{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.UserByID", req), rsp, opts...)
@@ -69,8 +116,8 @@ func (c *testServiceClient) UserByID(ctx context.Context, req *Request, opts ...

 func (c *testServiceClient) UserImageByID(ctx context.Context, req *Request, opts ...client.CallOption) (*codec.Frame, error) {
 	opts = append(opts,
-		v3.Method(http.MethodGet),
-		v3.Path("/users/{id}/image"),
+		v31.Method(http.MethodGet),
+		v31.Path("/users/{id}/image"),
 	)
 	rsp := &codec.Frame{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.UserImageByID", req), rsp, opts...)
@@ -82,8 +129,8 @@ func (c *testServiceClient) UserImageByID(ctx context.Context, req *Request, opt

 func (c *testServiceClient) UploadFile(ctx context.Context, req *RequestImage, opts ...client.CallOption) (*ResponseImage, error) {
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/users/image/upload"),
+		v31.Method(http.MethodPost),
+		v31.Path("/users/image/upload"),
 	)
 	rsp := &ResponseImage{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.UploadFile", req), rsp, opts...)
@@ -95,8 +142,8 @@ func (c *testServiceClient) UploadFile(ctx context.Context, req *RequestImage, o

 func (c *testServiceClient) KzAmlRs(ctx context.Context, req *RequestAml, opts ...client.CallOption) (*ResponseAml, error) {
 	opts = append(opts,
-		v3.Method(http.MethodPost),
-		v3.Path("/aml"),
+		v31.Method(http.MethodPost),
+		v31.Path("/aml"),
 	)
 	rsp := &ResponseAml{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.KzAmlRs", req), rsp, opts...)
@@ -115,9 +162,9 @@ func (h *testServiceServer) TestMultipart(ctx context.Context, req *MultipartReq
 }

 func (h *testServiceServer) TestEndpoint(ctx context.Context, req *Request, rsp *Response) error {
-	v31.FillRequest(ctx, req,
-		v31.Header("client_uid", "true"),
-		v31.Cookie("csrftoken", "true"),
+	v3.FillRequest(ctx, req,
+		v3.Header("client_uid", "true"),
+		v3.Cookie("csrftoken", "true"),
 	)
 	return h.TestServiceServer.TestEndpoint(ctx, req, rsp)
 }
@@ -152,6 +199,6 @@ func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...se
 	}
 	h := &testServiceServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v31.HandlerEndpoints(TestServiceServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(TestServiceServerEndpoints))
 	return s.Handle(s.NewHandler(&TestService{h}, append(nopts, opts...)...))
 }