rename

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-08-20 14:19:57 +03:00
parent 6d5ab6f208
commit eb4daf33f1
83 changed files with 2726 additions and 2116 deletions
--- a/proto/apidocs.swagger.yaml
+++ b/proto/apidocs.swagger.yaml
@@ -2,14 +2,14 @@

 openapi: 3.0.3
 info:
-    title: PkgdashService API
+    title: Pkgdash API
    version: 0.0.1
 paths:
    /v1/comments/{id}/comments:
        get:
            tags:
-                - PkgdashService
-            operationId: CommentsLookup
+                - Pkgdash
+            operationId: CommentLookup
            parameters:
                - name: id
                  in: path
@@ -34,12 +34,12 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/CommentsLookupRsp'
+                                $ref: '#/components/schemas/CommentLookupRsp'
    /v1/modules:
        get:
            tags:
-                - PkgdashService
-            operationId: ModulesList
+                - Pkgdash
+            operationId: ModuleList
            responses:
                default:
                    description: Default
@@ -52,12 +52,12 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/ModulesListRsp'
+                                $ref: '#/components/schemas/ModuleListRsp'
    /v1/packages:
        get:
            tags:
-                - PkgdashService
-            operationId: PackagesList
+                - Pkgdash
+            operationId: PackageList
            responses:
                default:
                    description: Default
@@ -70,16 +70,16 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/PackagesListRsp'
+                                $ref: '#/components/schemas/PackageListRsp'
        post:
            tags:
-                - PkgdashService
-            operationId: PackagesCreate
+                - Pkgdash
+            operationId: PackageCreate
            requestBody:
                content:
                    application/json:
                        schema:
-                            $ref: '#/components/schemas/PackagesCreateReq'
+                            $ref: '#/components/schemas/PackageCreateReq'
                required: true
            responses:
                default:
@@ -93,12 +93,12 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/PackagesCreateRsp'
+                                $ref: '#/components/schemas/PackageCreateRsp'
    /v1/packages/{id}:
        get:
            tags:
-                - PkgdashService
-            operationId: PackagesLookup
+                - Pkgdash
+            operationId: PackageLookup
            parameters:
                - name: id
                  in: path
@@ -118,11 +118,11 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/PackagesLookupRsp'
+                                $ref: '#/components/schemas/PackageLookupRsp'
        put:
            tags:
-                - PkgdashService
-            operationId: PackagesUpdate
+                - Pkgdash
+            operationId: PackageUpdate
            parameters:
                - name: id
                  in: path
@@ -134,7 +134,7 @@ paths:
                content:
                    application/json:
                        schema:
-                            $ref: '#/components/schemas/PackagesUpdateReq'
+                            $ref: '#/components/schemas/PackageUpdateReq'
                required: true
            responses:
                default:
@@ -148,11 +148,11 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/PackagesUpdateRsp'
+                                $ref: '#/components/schemas/PackageUpdateRsp'
        delete:
            tags:
-                - PkgdashService
-            operationId: PackagesDelete
+                - Pkgdash
+            operationId: PackageDelete
            parameters:
                - name: id
                  in: path
@@ -172,12 +172,12 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/PackagesDeleteRsp'
+                                $ref: '#/components/schemas/PackageDeleteRsp'
    /v1/packages/{package_id}/comments/{id}:
        delete:
            tags:
-                - PkgdashService
-            operationId: CommentsDelete
+                - Pkgdash
+            operationId: CommentDelete
            parameters:
                - name: package_id
                  in: path
@@ -203,12 +203,12 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/CommentsDeleteRsp'
+                                $ref: '#/components/schemas/CommentDeleteRsp'
    /v1/packages/{package}/comments:
        get:
            tags:
-                - PkgdashService
-            operationId: CommentsList
+                - Pkgdash
+            operationId: CommentList
            parameters:
                - name: package
                  in: path
@@ -232,11 +232,11 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/CommentsListRsp'
+                                $ref: '#/components/schemas/CommentListRsp'
        post:
            tags:
-                - PkgdashService
-            operationId: CommentsCreate
+                - Pkgdash
+            operationId: CommentCreate
            parameters:
                - name: package
                  in: path
@@ -247,7 +247,7 @@ paths:
                content:
                    application/json:
                        schema:
-                            $ref: '#/components/schemas/CommentsCreateReq'
+                            $ref: '#/components/schemas/CommentCreateReq'
                required: true
            responses:
                default:
@@ -261,12 +261,12 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/CommentsCreateRsp'
+                                $ref: '#/components/schemas/CommentCreateRsp'
    /v1/packages/{package}/modules:
        get:
            tags:
-                - PkgdashService
-            operationId: PackagesModules
+                - Pkgdash
+            operationId: PackageModules
            parameters:
                - name: package
                  in: path
@@ -286,7 +286,7 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/PackagesModulesRsp'
+                                $ref: '#/components/schemas/PackageModulesRsp'
 components:
    schemas:
        Comment:
@@ -306,7 +306,7 @@ components:
                updated:
                    type: string
                    format: RFC3339
-        CommentsCreateReq:
+        CommentCreateReq:
            type: object
            properties:
                package_id:
@@ -314,22 +314,22 @@ components:
                    format: uint64
                comment:
                    type: string
-        CommentsCreateRsp:
+        CommentCreateRsp:
            type: object
            properties:
                comment:
                    $ref: '#/components/schemas/Comment'
-        CommentsDeleteRsp:
+        CommentDeleteRsp:
            type: object
            properties: {}
-        CommentsListRsp:
+        CommentListRsp:
            type: object
            properties:
                comments:
                    type: array
                    items:
                        $ref: '#/components/schemas/Comment'
-        CommentsLookupRsp:
+        CommentLookupRsp:
            type: object
            properties:
                comment:
@@ -358,7 +358,7 @@ components:
                last_check:
                    type: string
                    format: RFC3339
-        ModulesListRsp:
+        ModuleListRsp:
            type: object
            properties:
                modules:
@@ -375,6 +375,8 @@ components:
                    type: string
                url:
                    type: string
+                description:
+                    type: string
                modules:
                    type: integer
                    format: uint64
@@ -393,7 +395,7 @@ components:
                last_check:
                    type: string
                    format: RFC3339
-        PackagesCreateReq:
+        PackageCreateReq:
            type: object
            properties:
                name:
@@ -405,34 +407,34 @@ components:
                    items:
                        type: integer
                        format: uint64
-        PackagesCreateRsp:
+        PackageCreateRsp:
            type: object
            properties:
                package:
                    $ref: '#/components/schemas/Package'
-        PackagesDeleteRsp:
+        PackageDeleteRsp:
            type: object
            properties: {}
-        PackagesListRsp:
+        PackageListRsp:
            type: object
            properties:
                packages:
                    type: array
                    items:
                        $ref: '#/components/schemas/Package'
-        PackagesLookupRsp:
+        PackageLookupRsp:
            type: object
            properties:
                package:
                    $ref: '#/components/schemas/Package'
-        PackagesModulesRsp:
+        PackageModulesRsp:
            type: object
            properties:
                modules:
                    type: array
                    items:
                        $ref: '#/components/schemas/Module'
-        PackagesUpdateReq:
+        PackageUpdateReq:
            type: object
            properties:
                id:
@@ -452,10 +454,10 @@ components:
                    items:
                        type: integer
                        format: uint64
-        PackagesUpdateRsp:
+        PackageUpdateRsp:
            type: object
            properties:
                package:
                    $ref: '#/components/schemas/Package'
 tags:
-    - name: PkgdashService
+    - name: Pkgdash
--- a/proto/pkgdash.pb.go
+++ b/proto/pkgdash.pb.go
--- a/proto/pkgdash.pb.validate.go
+++ b/proto/pkgdash.pb.validate.go
--- a/proto/pkgdash.proto
+++ b/proto/pkgdash.proto
@@ -9,10 +9,10 @@ import "validate/validate.proto";

 option go_package = "go.unistack.org/unistack-org/pkgdash/proto;pkgdashpb";

-service PkgdashService {
-  rpc PackagesLookup(PackagesLookupReq) returns (PackagesLookupRsp) {
+service Pkgdash {
+  rpc PackageLookup(PackageLookupReq) returns (PackageLookupRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "PackagesLookup";
+      operation_id: "PackageLookup";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -23,9 +23,9 @@ service PkgdashService {
      get: "/v1/packages/{id}";
    };
  }
-  rpc PackagesCreate(PackagesCreateReq) returns (PackagesCreateRsp) {
+  rpc PackageCreate(PackageCreateReq) returns (PackageCreateRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "PackagesCreate";
+      operation_id: "PackageCreate";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -37,9 +37,9 @@ service PkgdashService {
      body: "*";
    };
  }
-  rpc PackagesDelete(PackagesDeleteReq) returns (PackagesDeleteRsp) {
+  rpc PackageDelete(PackageDeleteReq) returns (PackageDeleteRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "PackagesDelete";
+      operation_id: "PackageDelete";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -48,9 +48,9 @@ service PkgdashService {
    };
    option (micro.api.http) = {delete: "/v1/packages/{id}"};
  }
-  rpc PackagesList(PackagesListReq) returns (PackagesListRsp) {
+  rpc PackageList(PackageListReq) returns (PackageListRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "PackagesList";
+      operation_id: "PackageList";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -59,9 +59,9 @@ service PkgdashService {
    };
    option (micro.api.http) = {get: "/v1/packages"};
  }
-  rpc PackagesModules(PackagesModulesReq) returns (PackagesModulesRsp) {
+  rpc PackageModules(PackageModulesReq) returns (PackageModulesRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "PackagesModules";
+      operation_id: "PackageModules";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -70,9 +70,9 @@ service PkgdashService {
    };
    option (micro.api.http) = {get: "/v1/packages/{package}/modules"};
  }
-  rpc PackagesUpdate(PackagesUpdateReq) returns (PackagesUpdateRsp) {
+  rpc PackageUpdate(PackageUpdateReq) returns (PackageUpdateRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "PackagesUpdate";
+      operation_id: "PackageUpdate";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -84,9 +84,9 @@ service PkgdashService {
      body: "*";
    };
  }
-  rpc CommentsCreate(CommentsCreateReq) returns (CommentsCreateRsp) {
+  rpc CommentCreate(CommentCreateReq) returns (CommentCreateRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "CommentsCreate";
+      operation_id: "CommentCreate";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -98,9 +98,9 @@ service PkgdashService {
      body: "*";
    };
  }
-  rpc CommentsLookup(CommentsLookupReq) returns (CommentsLookupRsp) {
+  rpc CommentLookup(CommentLookupReq) returns (CommentLookupRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "CommentsLookup";
+      operation_id: "CommentLookup";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -112,9 +112,9 @@ service PkgdashService {
      additional_bindings {get: "/v1/comments/{package}/comments/{id}"};
    };
  }
-  rpc CommentsList(CommentsListReq) returns (CommentsListRsp) {
+  rpc CommentList(CommentListReq) returns (CommentListRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "CommentsList";
+      operation_id: "CommentList";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -123,9 +123,9 @@ service PkgdashService {
    };
    option (micro.api.http) = {get: "/v1/packages/{package}/comments"};
  }
-  rpc CommentsDelete(CommentsDeleteReq) returns (CommentsDeleteRsp) {
+  rpc CommentDelete(CommentDeleteReq) returns (CommentDeleteRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "CommentsDelete";
+      operation_id: "CommentDelete";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -137,9 +137,9 @@ service PkgdashService {
      additional_bindings {delete: "/v1/comments/{id}"};
    };
  }
-  rpc ModulesList(ModulesListReq) returns (ModulesListRsp) {
+  rpc ModuleList(ModuleListReq) returns (ModuleListRsp) {
    option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "ModulesList";
+      operation_id: "ModuleList";
      responses: {
        default: {
          reference: {_ref: ".pkgdash.ErrorRsp"};
@@ -150,19 +150,19 @@ service PkgdashService {
  }
 }

-message PackagesModulesReq {
+message PackageModulesReq {
  uint64 package = 1 [json_name = "package"];
 }

-message PackagesModulesRsp {
+message PackageModulesRsp {
  repeated Module modules = 1 [json_name = "modules"];
 }

-message PackagesLookupReq {
+message PackageLookupReq {
  uint64 id = 1 [json_name = "id"];
 }

-message PackagesLookupRsp {
+message PackageLookupRsp {
  Package package = 1 [json_name = "package"];
 }

@@ -177,12 +177,13 @@ message Package {
  uint64 id = 1 [(validate.rules).uint64.gt = 0];
  string name = 2 [(validate.rules).string.min_len = 1];
  string url = 3 [(validate.rules).string.min_len = 1];
-  uint64 modules = 4;
-  uint64 issues = 5;
-  uint64 comments = 6;
-  google.protobuf.Timestamp created = 7;
-  google.protobuf.Timestamp updated = 8;
-  google.protobuf.Timestamp last_check = 9;
+  string description = 4 [(validate.rules).string.min_len = 1];
+  uint64 modules = 5;
+  uint64 issues = 6;
+  uint64 comments = 7;
+  google.protobuf.Timestamp created = 8;
+  google.protobuf.Timestamp updated = 9;
+  google.protobuf.Timestamp last_check = 10;
 }

 message Module {
@@ -210,26 +211,26 @@ message Comment {
  google.protobuf.Timestamp updated = 5;
 }

-message CommentsDeleteReq {
+message CommentDeleteReq {
  uint64 id = 1 [json_name = "id"];
  uint64 package_id = 2 [json_name = "package_id"];
 }

-message CommentsDeleteRsp {}
+message CommentDeleteRsp {}

-message PackagesDeleteReq {
+message PackageDeleteReq {
  uint64 id = 1 [json_name = "id"];
 }

-message PackagesDeleteRsp {}
+message PackageDeleteRsp {}

-message PackagesListReq {}
+message PackageListReq {}

-message PackagesListRsp {
+message PackageListRsp {
  repeated Package packages = 1;
 }

-message PackagesUpdateReq {
+message PackageUpdateReq {
  uint64 id = 1 [(validate.rules).uint64.gt = 0];
  string name = 2 [(validate.rules).string.min_len = 1];
  string url = 3 [(validate.rules).string.min_len = 1];
@@ -237,11 +238,11 @@ message PackagesUpdateReq {
  repeated uint64 issues = 5;
 }

-message PackagesUpdateRsp {
+message PackageUpdateRsp {
  Package package = 1 [json_name = "package"];
 }

-message CommentsCreateReq {
+message CommentCreateReq {
  uint64 package_id = 1 [
    json_name = "package_id",
    (validate.rules).uint64.gt = 0
@@ -249,39 +250,39 @@ message CommentsCreateReq {
  string comment = 2;
 }

-message CommentsCreateRsp {
+message CommentCreateRsp {
  Comment comment = 1 [json_name = "comment"];
 }

-message PackagesCreateReq {
+message PackageCreateReq {
  string name = 1 [(validate.rules).string.min_len = 1];
  string url = 2 [(validate.rules).string.min_len = 1];
  repeated uint64 modules = 3;
 }

-message PackagesCreateRsp {
+message PackageCreateRsp {
  Package package = 1 [json_name="package"];
 }

-message ModulesListReq {}
+message ModuleListReq {}

-message ModulesListRsp {
+message ModuleListRsp {
  repeated Module modules = 1 [json_name="modules"];
 }

-message CommentsListReq {
+message CommentListReq {
  uint64 package_id = 1 [json_name = "package_id"];
 }

-message CommentsListRsp {
+message CommentListRsp {
  repeated Comment comments = 1 [json_name = "comments"];
 }

-message CommentsLookupReq {
+message CommentLookupReq {
  uint64 id = 1 [json_name = "id"];
  uint64 package_id = 2 [json_name = "package_id"];
 }

-message CommentsLookupRsp {
+message CommentLookupRsp {
  Comment comment = 1 [json_name = "comment"];
 }
--- a/proto/pkgdash_micro.pb.go
+++ b/proto/pkgdash_micro.pb.go
@@ -17,29 +17,29 @@ var (
 )

 type PkgdashServiceClient interface {
-	PackagesLookup(ctx context.Context, req *PackagesLookupReq, opts ...options.Option) (*PackagesLookupRsp, error)
-	PackagesCreate(ctx context.Context, req *PackagesCreateReq, opts ...options.Option) (*PackagesCreateRsp, error)
-	PackagesDelete(ctx context.Context, req *PackagesDeleteReq, opts ...options.Option) (*PackagesDeleteRsp, error)
-	PackagesList(ctx context.Context, req *PackagesListReq, opts ...options.Option) (*PackagesListRsp, error)
-	PackagesModules(ctx context.Context, req *PackagesModulesReq, opts ...options.Option) (*PackagesModulesRsp, error)
-	PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, opts ...options.Option) (*PackagesUpdateRsp, error)
-	CommentsCreate(ctx context.Context, req *CommentsCreateReq, opts ...options.Option) (*CommentsCreateRsp, error)
-	CommentsLookup(ctx context.Context, req *CommentsLookupReq, opts ...options.Option) (*CommentsLookupRsp, error)
-	CommentsList(ctx context.Context, req *CommentsListReq, opts ...options.Option) (*CommentsListRsp, error)
-	CommentsDelete(ctx context.Context, req *CommentsDeleteReq, opts ...options.Option) (*CommentsDeleteRsp, error)
-	ModulesList(ctx context.Context, req *ModulesListReq, opts ...options.Option) (*ModulesListRsp, error)
+	PackageLookup(ctx context.Context, req *PackageLookupReq, opts ...options.Option) (*PackageLookupRsp, error)
+	PackageCreate(ctx context.Context, req *PackageCreateReq, opts ...options.Option) (*PackageCreateRsp, error)
+	PackageDelete(ctx context.Context, req *PackageDeleteReq, opts ...options.Option) (*PackageDeleteRsp, error)
+	PackageList(ctx context.Context, req *PackageListReq, opts ...options.Option) (*PackageListRsp, error)
+	PackageModules(ctx context.Context, req *PackageModulesReq, opts ...options.Option) (*PackageModulesRsp, error)
+	PackageUpdate(ctx context.Context, req *PackageUpdateReq, opts ...options.Option) (*PackageUpdateRsp, error)
+	CommentCreate(ctx context.Context, req *CommentCreateReq, opts ...options.Option) (*CommentCreateRsp, error)
+	CommentLookup(ctx context.Context, req *CommentLookupReq, opts ...options.Option) (*CommentLookupRsp, error)
+	CommentList(ctx context.Context, req *CommentListReq, opts ...options.Option) (*CommentListRsp, error)
+	CommentDelete(ctx context.Context, req *CommentDeleteReq, opts ...options.Option) (*CommentDeleteRsp, error)
+	ModuleList(ctx context.Context, req *ModuleListReq, opts ...options.Option) (*ModuleListRsp, error)
 }

 type PkgdashServiceServer interface {
-	PackagesLookup(ctx context.Context, req *PackagesLookupReq, rsp *PackagesLookupRsp) error
-	PackagesCreate(ctx context.Context, req *PackagesCreateReq, rsp *PackagesCreateRsp) error
-	PackagesDelete(ctx context.Context, req *PackagesDeleteReq, rsp *PackagesDeleteRsp) error
-	PackagesList(ctx context.Context, req *PackagesListReq, rsp *PackagesListRsp) error
-	PackagesModules(ctx context.Context, req *PackagesModulesReq, rsp *PackagesModulesRsp) error
-	PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, rsp *PackagesUpdateRsp) error
-	CommentsCreate(ctx context.Context, req *CommentsCreateReq, rsp *CommentsCreateRsp) error
-	CommentsLookup(ctx context.Context, req *CommentsLookupReq, rsp *CommentsLookupRsp) error
-	CommentsList(ctx context.Context, req *CommentsListReq, rsp *CommentsListRsp) error
-	CommentsDelete(ctx context.Context, req *CommentsDeleteReq, rsp *CommentsDeleteRsp) error
-	ModulesList(ctx context.Context, req *ModulesListReq, rsp *ModulesListRsp) error
+	PackageLookup(ctx context.Context, req *PackageLookupReq, rsp *PackageLookupRsp) error
+	PackageCreate(ctx context.Context, req *PackageCreateReq, rsp *PackageCreateRsp) error
+	PackageDelete(ctx context.Context, req *PackageDeleteReq, rsp *PackageDeleteRsp) error
+	PackageList(ctx context.Context, req *PackageListReq, rsp *PackageListRsp) error
+	PackageModules(ctx context.Context, req *PackageModulesReq, rsp *PackageModulesRsp) error
+	PackageUpdate(ctx context.Context, req *PackageUpdateReq, rsp *PackageUpdateRsp) error
+	CommentCreate(ctx context.Context, req *CommentCreateReq, rsp *CommentCreateRsp) error
+	CommentLookup(ctx context.Context, req *CommentLookupReq, rsp *CommentLookupRsp) error
+	CommentList(ctx context.Context, req *CommentListReq, rsp *CommentListRsp) error
+	CommentDelete(ctx context.Context, req *CommentDeleteReq, rsp *CommentDeleteRsp) error
+	ModuleList(ctx context.Context, req *ModuleListReq, rsp *ModuleListRsp) error
 }
--- a/proto/pkgdash_micro_http.pb.go
+++ b/proto/pkgdash_micro_http.pb.go
@@ -17,91 +17,91 @@ import (
 var (
 	PkgdashServiceServerEndpoints = []v4.EndpointMetadata{
 		{
-			Name:   "PkgdashService.PackagesLookup",
+			Name:   "PkgdashService.PackageLookup",
 			Path:   "/v1/packages/{id}",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackagesCreate",
+			Name:   "PkgdashService.PackageCreate",
 			Path:   "/v1/packages",
 			Method: "POST",
 			Body:   "*",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackagesDelete",
+			Name:   "PkgdashService.PackageDelete",
 			Path:   "/v1/packages/{id}",
 			Method: "DELETE",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackagesList",
+			Name:   "PkgdashService.PackageList",
 			Path:   "/v1/packages",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackagesModules",
+			Name:   "PkgdashService.PackageModules",
 			Path:   "/v1/packages/{package}/modules",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackagesUpdate",
+			Name:   "PkgdashService.PackageUpdate",
 			Path:   "/v1/packages/{id}",
 			Method: "PUT",
 			Body:   "*",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentsCreate",
+			Name:   "PkgdashService.CommentCreate",
 			Path:   "/v1/packages/{package}/comments",
 			Method: "POST",
 			Body:   "*",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentsLookup",
+			Name:   "PkgdashService.CommentLookup",
 			Path:   "/v1/comments/{id}/comments",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentsLookup",
+			Name:   "PkgdashService.CommentLookup",
 			Path:   "/v1/comments/{package}/comments/{id}",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentsList",
+			Name:   "PkgdashService.CommentList",
 			Path:   "/v1/packages/{package}/comments",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentsDelete",
+			Name:   "PkgdashService.CommentDelete",
 			Path:   "/v1/packages/{package_id}/comments/{id}",
 			Method: "DELETE",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentsDelete",
+			Name:   "PkgdashService.CommentDelete",
 			Path:   "/v1/comments/{id}",
 			Method: "DELETE",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.ModulesList",
+			Name:   "PkgdashService.ModuleList",
 			Path:   "/v1/modules",
 			Method: "GET",
 			Body:   "",
@@ -119,7 +119,7 @@ func NewPkgdashServiceClient(name string, c client.Client) PkgdashServiceClient
 	return &pkgdashServiceClient{c: c, name: name}
 }

-func (c *pkgdashServiceClient) PackagesLookup(ctx context.Context, req *PackagesLookupReq, opts ...options.Option) (*PackagesLookupRsp, error) {
+func (c *pkgdashServiceClient) PackageLookup(ctx context.Context, req *PackageLookupReq, opts ...options.Option) (*PackageLookupRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -129,15 +129,15 @@ func (c *pkgdashServiceClient) PackagesLookup(ctx context.Context, req *Packages
 		v41.Method(http.MethodGet),
 		v41.Path("/v1/packages/{id}"),
 	)
-	rsp := &PackagesLookupRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesLookup", req), rsp, opts...)
+	rsp := &PackageLookupRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageLookup", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) PackagesCreate(ctx context.Context, req *PackagesCreateReq, opts ...options.Option) (*PackagesCreateRsp, error) {
+func (c *pkgdashServiceClient) PackageCreate(ctx context.Context, req *PackageCreateReq, opts ...options.Option) (*PackageCreateRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -148,15 +148,15 @@ func (c *pkgdashServiceClient) PackagesCreate(ctx context.Context, req *Packages
 		v41.Path("/v1/packages"),
 		v41.Body("*"),
 	)
-	rsp := &PackagesCreateRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesCreate", req), rsp, opts...)
+	rsp := &PackageCreateRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageCreate", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) PackagesDelete(ctx context.Context, req *PackagesDeleteReq, opts ...options.Option) (*PackagesDeleteRsp, error) {
+func (c *pkgdashServiceClient) PackageDelete(ctx context.Context, req *PackageDeleteReq, opts ...options.Option) (*PackageDeleteRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -166,15 +166,15 @@ func (c *pkgdashServiceClient) PackagesDelete(ctx context.Context, req *Packages
 		v41.Method(http.MethodDelete),
 		v41.Path("/v1/packages/{id}"),
 	)
-	rsp := &PackagesDeleteRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesDelete", req), rsp, opts...)
+	rsp := &PackageDeleteRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageDelete", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) PackagesList(ctx context.Context, req *PackagesListReq, opts ...options.Option) (*PackagesListRsp, error) {
+func (c *pkgdashServiceClient) PackageList(ctx context.Context, req *PackageListReq, opts ...options.Option) (*PackageListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -184,15 +184,15 @@ func (c *pkgdashServiceClient) PackagesList(ctx context.Context, req *PackagesLi
 		v41.Method(http.MethodGet),
 		v41.Path("/v1/packages"),
 	)
-	rsp := &PackagesListRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesList", req), rsp, opts...)
+	rsp := &PackageListRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) PackagesModules(ctx context.Context, req *PackagesModulesReq, opts ...options.Option) (*PackagesModulesRsp, error) {
+func (c *pkgdashServiceClient) PackageModules(ctx context.Context, req *PackageModulesReq, opts ...options.Option) (*PackageModulesRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -202,15 +202,15 @@ func (c *pkgdashServiceClient) PackagesModules(ctx context.Context, req *Package
 		v41.Method(http.MethodGet),
 		v41.Path("/v1/packages/{package}/modules"),
 	)
-	rsp := &PackagesModulesRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesModules", req), rsp, opts...)
+	rsp := &PackageModulesRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageModules", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, opts ...options.Option) (*PackagesUpdateRsp, error) {
+func (c *pkgdashServiceClient) PackageUpdate(ctx context.Context, req *PackageUpdateReq, opts ...options.Option) (*PackageUpdateRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -221,15 +221,15 @@ func (c *pkgdashServiceClient) PackagesUpdate(ctx context.Context, req *Packages
 		v41.Path("/v1/packages/{id}"),
 		v41.Body("*"),
 	)
-	rsp := &PackagesUpdateRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackagesUpdate", req), rsp, opts...)
+	rsp := &PackageUpdateRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageUpdate", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) CommentsCreate(ctx context.Context, req *CommentsCreateReq, opts ...options.Option) (*CommentsCreateRsp, error) {
+func (c *pkgdashServiceClient) CommentCreate(ctx context.Context, req *CommentCreateReq, opts ...options.Option) (*CommentCreateRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -240,15 +240,15 @@ func (c *pkgdashServiceClient) CommentsCreate(ctx context.Context, req *Comments
 		v41.Path("/v1/packages/{package}/comments"),
 		v41.Body("*"),
 	)
-	rsp := &CommentsCreateRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentsCreate", req), rsp, opts...)
+	rsp := &CommentCreateRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentCreate", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) CommentsLookup(ctx context.Context, req *CommentsLookupReq, opts ...options.Option) (*CommentsLookupRsp, error) {
+func (c *pkgdashServiceClient) CommentLookup(ctx context.Context, req *CommentLookupReq, opts ...options.Option) (*CommentLookupRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -258,15 +258,15 @@ func (c *pkgdashServiceClient) CommentsLookup(ctx context.Context, req *Comments
 		v41.Method(http.MethodGet),
 		v41.Path("/v1/comments/{id}/comments"),
 	)
-	rsp := &CommentsLookupRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentsLookup", req), rsp, opts...)
+	rsp := &CommentLookupRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentLookup", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) CommentsList(ctx context.Context, req *CommentsListReq, opts ...options.Option) (*CommentsListRsp, error) {
+func (c *pkgdashServiceClient) CommentList(ctx context.Context, req *CommentListReq, opts ...options.Option) (*CommentListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -276,15 +276,15 @@ func (c *pkgdashServiceClient) CommentsList(ctx context.Context, req *CommentsLi
 		v41.Method(http.MethodGet),
 		v41.Path("/v1/packages/{package}/comments"),
 	)
-	rsp := &CommentsListRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentsList", req), rsp, opts...)
+	rsp := &CommentListRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) CommentsDelete(ctx context.Context, req *CommentsDeleteReq, opts ...options.Option) (*CommentsDeleteRsp, error) {
+func (c *pkgdashServiceClient) CommentDelete(ctx context.Context, req *CommentDeleteReq, opts ...options.Option) (*CommentDeleteRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -294,15 +294,15 @@ func (c *pkgdashServiceClient) CommentsDelete(ctx context.Context, req *Comments
 		v41.Method(http.MethodDelete),
 		v41.Path("/v1/packages/{package_id}/comments/{id}"),
 	)
-	rsp := &CommentsDeleteRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentsDelete", req), rsp, opts...)
+	rsp := &CommentDeleteRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentDelete", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }

-func (c *pkgdashServiceClient) ModulesList(ctx context.Context, req *ModulesListReq, opts ...options.Option) (*ModulesListRsp, error) {
+func (c *pkgdashServiceClient) ModuleList(ctx context.Context, req *ModuleListReq, opts ...options.Option) (*ModuleListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
@@ -312,8 +312,8 @@ func (c *pkgdashServiceClient) ModulesList(ctx context.Context, req *ModulesList
 		v41.Method(http.MethodGet),
 		v41.Path("/v1/modules"),
 	)
-	rsp := &ModulesListRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.ModulesList", req), rsp, opts...)
+	rsp := &ModuleListRsp{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.ModuleList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -324,63 +324,63 @@ type pkgdashServiceServer struct {
 	PkgdashServiceServer
 }

-func (h *pkgdashServiceServer) PackagesLookup(ctx context.Context, req *PackagesLookupReq, rsp *PackagesLookupRsp) error {
-	return h.PkgdashServiceServer.PackagesLookup(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackageLookup(ctx context.Context, req *PackageLookupReq, rsp *PackageLookupRsp) error {
+	return h.PkgdashServiceServer.PackageLookup(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) PackagesCreate(ctx context.Context, req *PackagesCreateReq, rsp *PackagesCreateRsp) error {
-	return h.PkgdashServiceServer.PackagesCreate(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackageCreate(ctx context.Context, req *PackageCreateReq, rsp *PackageCreateRsp) error {
+	return h.PkgdashServiceServer.PackageCreate(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) PackagesDelete(ctx context.Context, req *PackagesDeleteReq, rsp *PackagesDeleteRsp) error {
-	return h.PkgdashServiceServer.PackagesDelete(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackageDelete(ctx context.Context, req *PackageDeleteReq, rsp *PackageDeleteRsp) error {
+	return h.PkgdashServiceServer.PackageDelete(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) PackagesList(ctx context.Context, req *PackagesListReq, rsp *PackagesListRsp) error {
-	return h.PkgdashServiceServer.PackagesList(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackageList(ctx context.Context, req *PackageListReq, rsp *PackageListRsp) error {
+	return h.PkgdashServiceServer.PackageList(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) PackagesModules(ctx context.Context, req *PackagesModulesReq, rsp *PackagesModulesRsp) error {
-	return h.PkgdashServiceServer.PackagesModules(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackageModules(ctx context.Context, req *PackageModulesReq, rsp *PackageModulesRsp) error {
+	return h.PkgdashServiceServer.PackageModules(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, rsp *PackagesUpdateRsp) error {
-	return h.PkgdashServiceServer.PackagesUpdate(ctx, req, rsp)
+func (h *pkgdashServiceServer) PackageUpdate(ctx context.Context, req *PackageUpdateReq, rsp *PackageUpdateRsp) error {
+	return h.PkgdashServiceServer.PackageUpdate(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) CommentsCreate(ctx context.Context, req *CommentsCreateReq, rsp *CommentsCreateRsp) error {
-	return h.PkgdashServiceServer.CommentsCreate(ctx, req, rsp)
+func (h *pkgdashServiceServer) CommentCreate(ctx context.Context, req *CommentCreateReq, rsp *CommentCreateRsp) error {
+	return h.PkgdashServiceServer.CommentCreate(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) CommentsLookup(ctx context.Context, req *CommentsLookupReq, rsp *CommentsLookupRsp) error {
-	return h.PkgdashServiceServer.CommentsLookup(ctx, req, rsp)
+func (h *pkgdashServiceServer) CommentLookup(ctx context.Context, req *CommentLookupReq, rsp *CommentLookupRsp) error {
+	return h.PkgdashServiceServer.CommentLookup(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) CommentsList(ctx context.Context, req *CommentsListReq, rsp *CommentsListRsp) error {
-	return h.PkgdashServiceServer.CommentsList(ctx, req, rsp)
+func (h *pkgdashServiceServer) CommentList(ctx context.Context, req *CommentListReq, rsp *CommentListRsp) error {
+	return h.PkgdashServiceServer.CommentList(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) CommentsDelete(ctx context.Context, req *CommentsDeleteReq, rsp *CommentsDeleteRsp) error {
-	return h.PkgdashServiceServer.CommentsDelete(ctx, req, rsp)
+func (h *pkgdashServiceServer) CommentDelete(ctx context.Context, req *CommentDeleteReq, rsp *CommentDeleteRsp) error {
+	return h.PkgdashServiceServer.CommentDelete(ctx, req, rsp)
 }

-func (h *pkgdashServiceServer) ModulesList(ctx context.Context, req *ModulesListReq, rsp *ModulesListRsp) error {
-	return h.PkgdashServiceServer.ModulesList(ctx, req, rsp)
+func (h *pkgdashServiceServer) ModuleList(ctx context.Context, req *ModuleListReq, rsp *ModuleListRsp) error {
+	return h.PkgdashServiceServer.ModuleList(ctx, req, rsp)
 }

 func RegisterPkgdashServiceServer(s server.Server, sh PkgdashServiceServer, opts ...options.Option) error {
 	type pkgdashService interface {
-		PackagesLookup(ctx context.Context, req *PackagesLookupReq, rsp *PackagesLookupRsp) error
-		PackagesCreate(ctx context.Context, req *PackagesCreateReq, rsp *PackagesCreateRsp) error
-		PackagesDelete(ctx context.Context, req *PackagesDeleteReq, rsp *PackagesDeleteRsp) error
-		PackagesList(ctx context.Context, req *PackagesListReq, rsp *PackagesListRsp) error
-		PackagesModules(ctx context.Context, req *PackagesModulesReq, rsp *PackagesModulesRsp) error
-		PackagesUpdate(ctx context.Context, req *PackagesUpdateReq, rsp *PackagesUpdateRsp) error
-		CommentsCreate(ctx context.Context, req *CommentsCreateReq, rsp *CommentsCreateRsp) error
-		CommentsLookup(ctx context.Context, req *CommentsLookupReq, rsp *CommentsLookupRsp) error
-		CommentsList(ctx context.Context, req *CommentsListReq, rsp *CommentsListRsp) error
-		CommentsDelete(ctx context.Context, req *CommentsDeleteReq, rsp *CommentsDeleteRsp) error
-		ModulesList(ctx context.Context, req *ModulesListReq, rsp *ModulesListRsp) error
+		PackageLookup(ctx context.Context, req *PackageLookupReq, rsp *PackageLookupRsp) error
+		PackageCreate(ctx context.Context, req *PackageCreateReq, rsp *PackageCreateRsp) error
+		PackageDelete(ctx context.Context, req *PackageDeleteReq, rsp *PackageDeleteRsp) error
+		PackageList(ctx context.Context, req *PackageListReq, rsp *PackageListRsp) error
+		PackageModules(ctx context.Context, req *PackageModulesReq, rsp *PackageModulesRsp) error
+		PackageUpdate(ctx context.Context, req *PackageUpdateReq, rsp *PackageUpdateRsp) error
+		CommentCreate(ctx context.Context, req *CommentCreateReq, rsp *CommentCreateRsp) error
+		CommentLookup(ctx context.Context, req *CommentLookupReq, rsp *CommentLookupRsp) error
+		CommentList(ctx context.Context, req *CommentListReq, rsp *CommentListRsp) error
+		CommentDelete(ctx context.Context, req *CommentDeleteReq, rsp *CommentDeleteRsp) error
+		ModuleList(ctx context.Context, req *ModuleListReq, rsp *ModuleListRsp) error
 	}
 	type PkgdashService struct {
 		pkgdashService