intermediate merge

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

proto/pkgdash_micro_http.pb.go

@@ -1,20 +1,21 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.4
+// protoc-gen-go-micro version: v4.0.2
 // source: pkgdash.proto
 
 package pkgdashpb
 
 import (
 	context "context"
-	v31 "go.unistack.org/micro-client-http/v3"
-	v3 "go.unistack.org/micro-server-http/v3"
-	client "go.unistack.org/micro/v3/client"
-	server "go.unistack.org/micro/v3/server"
+	v41 "go.unistack.org/micro-client-http/v4"
+	v4 "go.unistack.org/micro-server-http/v4"
+	client "go.unistack.org/micro/v4/client"
+	options "go.unistack.org/micro/v4/options"
+	server "go.unistack.org/micro/v4/server"
 	http "net/http"
 )
 
 var (
-	PkgdashServiceServerEndpoints = []v3.EndpointMetadata{
+	PkgdashServiceServerEndpoints = []v4.EndpointMetadata{
 		{
 			Name:   "PkgdashService.ListPackage",
 			Path:   "/v1/packages",
@@ -23,7 +24,7 @@ var (
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.UpdateInfo",
+			Name:   "PkgdashService.UpdatePackage",
 			Path:   "/v1/package/{id}",
 			Method: "POST",
 			Body:   "*",
@@ -36,6 +37,20 @@ var (
 			Body:   "*",
 			Stream: false,
 		},
+		{
+			Name:   "PkgdashService.AddPackage",
+			Path:   "/v1/package",
+			Method: "POST",
+			Body:   "*",
+			Stream: false,
+		},
+		{
+			Name:   "PkgdashService.GetModule",
+			Path:   "/v1/module",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
 	}
 )
 
@@ -48,15 +63,15 @@ func NewPkgdashServiceClient(name string, c client.Client) PkgdashServiceClient
 	return &pkgdashServiceClient{c: c, name: name}
 }
 
-func (c *pkgdashServiceClient) ListPackage(ctx context.Context, req *ListPackageReq, opts ...client.CallOption) (*ListPackageRsp, error) {
+func (c *pkgdashServiceClient) ListPackage(ctx context.Context, req *ListPackageReq, opts ...options.Option) (*ListPackageRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v31.ErrorMap(errmap),
+		v41.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v31.Method(http.MethodGet),
-		v31.Path("/v1/packages"),
+		v41.Method(http.MethodGet),
+		v41.Path("/v1/packages"),
 	)
 	rsp := &ListPackageRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.ListPackage", req), rsp, opts...)
@@ -66,37 +81,37 @@ func (c *pkgdashServiceClient) ListPackage(ctx context.Context, req *ListPackage
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) UpdateInfo(ctx context.Context, req *UpdateInfoPackageReq, opts ...client.CallOption) (*UpdateInfoPackageRsp, error) {
+func (c *pkgdashServiceClient) UpdatePackage(ctx context.Context, req *UpdatePackageReq, opts ...options.Option) (*UpdatePackageRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v31.ErrorMap(errmap),
+		v41.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v31.Method(http.MethodPost),
-		v31.Path("/v1/package/{id}"),
-		v31.Body("*"),
+		v41.Method(http.MethodPost),
+		v41.Path("/v1/package/{id}"),
+		v41.Body("*"),
 	)
-	rsp := &UpdateInfoPackageRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.UpdateInfo", req), rsp, opts...)
+	rsp := &UpdatePackageRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.UpdatePackage", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) AddComment(ctx context.Context, req *CommentReq, opts ...client.CallOption) (*CommentRsp, error) {
+func (c *pkgdashServiceClient) AddComment(ctx context.Context, req *AddCommentReq, opts ...options.Option) (*AddCommentRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v31.ErrorMap(errmap),
+		v41.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v31.Method(http.MethodPost),
-		v31.Path("/v1/package/{pkg}/comment"),
-		v31.Body("*"),
+		v41.Method(http.MethodPost),
+		v41.Path("/v1/package/{pkg}/comment"),
+		v41.Body("*"),
 	)
-	rsp := &CommentRsp{}
+	rsp := &AddCommentRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.AddComment", req), rsp, opts...)
 	if err != nil {
 		return nil, err
@@ -104,6 +119,43 @@ func (c *pkgdashServiceClient) AddComment(ctx context.Context, req *CommentReq,
 	return rsp, nil
 }
 
+func (c *pkgdashServiceClient) AddPackage(ctx context.Context, req *AddPackageReq, opts ...options.Option) (*AddPackageRsp, error) {
+	errmap := make(map[string]interface{}, 1)
+	errmap["default"] = &ErrorRsp{}
+	opts = append(opts,
+		v41.ErrorMap(errmap),
+	)
+	opts = append(opts,
+		v41.Method(http.MethodPost),
+		v41.Path("/v1/package"),
+		v41.Body("*"),
+	)
+	rsp := &AddPackageRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.AddPackage", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *pkgdashServiceClient) GetModule(ctx context.Context, req *GetModuleReq, opts ...options.Option) (*GetModuleRsp, error) {
+	errmap := make(map[string]interface{}, 1)
+	errmap["default"] = &ErrorRsp{}
+	opts = append(opts,
+		v41.ErrorMap(errmap),
+	)
+	opts = append(opts,
+		v41.Method(http.MethodGet),
+		v41.Path("/v1/module"),
+	)
+	rsp := &GetModuleRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.GetModule", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
 type pkgdashServiceServer struct {
 	PkgdashServiceServer
 }
@@ -112,25 +164,35 @@ func (h *pkgdashServiceServer) ListPackage(ctx context.Context, req *ListPackage
 	return h.PkgdashServiceServer.ListPackage(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) UpdateInfo(ctx context.Context, req *UpdateInfoPackageReq, rsp *UpdateInfoPackageRsp) error {
-	return h.PkgdashServiceServer.UpdateInfo(ctx, req, rsp)
+func (h *pkgdashServiceServer) UpdatePackage(ctx context.Context, req *UpdatePackageReq, rsp *UpdatePackageRsp) error {
+	return h.PkgdashServiceServer.UpdatePackage(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) AddComment(ctx context.Context, req *CommentReq, rsp *CommentRsp) error {
+func (h *pkgdashServiceServer) AddComment(ctx context.Context, req *AddCommentReq, rsp *AddCommentRsp) error {
 	return h.PkgdashServiceServer.AddComment(ctx, req, rsp)
 }
 
+func (h *pkgdashServiceServer) AddPackage(ctx context.Context, req *AddPackageReq, rsp *AddPackageRsp) error {
+	return h.PkgdashServiceServer.AddPackage(ctx, req, rsp)
+}
+
+func (h *pkgdashServiceServer) GetModule(ctx context.Context, req *GetModuleReq, rsp *GetModuleRsp) error {
+	return h.PkgdashServiceServer.GetModule(ctx, req, rsp)
+}
+
 func RegisterPkgdashServiceServer(s server.Server, sh PkgdashServiceServer, opts ...server.HandlerOption) error {
 	type pkgdashService interface {
 		ListPackage(ctx context.Context, req *ListPackageReq, rsp *ListPackageRsp) error
-		UpdateInfo(ctx context.Context, req *UpdateInfoPackageReq, rsp *UpdateInfoPackageRsp) error
-		AddComment(ctx context.Context, req *CommentReq, rsp *CommentRsp) error
+		UpdatePackage(ctx context.Context, req *UpdatePackageReq, rsp *UpdatePackageRsp) error
+		AddComment(ctx context.Context, req *AddCommentReq, rsp *AddCommentRsp) error
+		AddPackage(ctx context.Context, req *AddPackageReq, rsp *AddPackageRsp) error
+		GetModule(ctx context.Context, req *GetModuleReq, rsp *GetModuleRsp) error
 	}
 	type PkgdashService struct {
 		pkgdashService
 	}
 	h := &pkgdashServiceServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v3.HandlerEndpoints(PkgdashServiceServerEndpoints))
+	nopts = append(nopts, v4.HandlerEndpoints(PkgdashServiceServerEndpoints))
 	return s.Handle(s.NewHandler(&PkgdashService{h}, append(nopts, opts...)...))
 }