sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make linter happier

Browse Source
This commit is contained in:
Benedikt Kulmann
2020-08-27 15:52:55 +02:00
parent 0f9e141699
commit e7c69cd6a7
8 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/proto/v0/settings.pb.go
+31 -31
View File
@@ -1570,7 +1570,7 @@ func (x *ListPermissionsByResourceResponse) GetPermissions() []*Permission {
return nil return nil
} }
type GetPermissionByIdRequest struct { type GetPermissionByIDRequest struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@@ -1579,8 +1579,8 @@ type GetPermissionByIdRequest struct {
RoleIds []string `protobuf:"bytes,2,rep,name=role_ids,json=roleIds,proto3" json:"role_ids,omitempty"` RoleIds []string `protobuf:"bytes,2,rep,name=role_ids,json=roleIds,proto3" json:"role_ids,omitempty"`
} }
func (x *GetPermissionByIdRequest) Reset() { func (x *GetPermissionByIDRequest) Reset() {
*x = GetPermissionByIdRequest{} *x = GetPermissionByIDRequest{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_settings_proto_msgTypes[26] mi := &file_settings_proto_msgTypes[26]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1588,13 +1588,13 @@ func (x *GetPermissionByIdRequest) Reset() {
} }
} }
func (x *GetPermissionByIdRequest) String() string { func (x *GetPermissionByIDRequest) String() string {
return protoimpl.X.MessageStringOf(x) return protoimpl.X.MessageStringOf(x)
} }
func (*GetPermissionByIdRequest) ProtoMessage() {} func (*GetPermissionByIDRequest) ProtoMessage() {}
func (x *GetPermissionByIdRequest) ProtoReflect() protoreflect.Message { func (x *GetPermissionByIDRequest) ProtoReflect() protoreflect.Message {
mi := &file_settings_proto_msgTypes[26] mi := &file_settings_proto_msgTypes[26]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1606,26 +1606,26 @@ func (x *GetPermissionByIdRequest) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use GetPermissionByIdRequest.ProtoReflect.Descriptor instead. // Deprecated: Use GetPermissionByIDRequest.ProtoReflect.Descriptor instead.
func (*GetPermissionByIdRequest) Descriptor() ([]byte, []int) { func (*GetPermissionByIDRequest) Descriptor() ([]byte, []int) {
return file_settings_proto_rawDescGZIP(), []int{26} return file_settings_proto_rawDescGZIP(), []int{26}
} }
func (x *GetPermissionByIdRequest) GetPermissionId() string { func (x *GetPermissionByIDRequest) GetPermissionId() string {
if x != nil { if x != nil {
return x.PermissionId return x.PermissionId
} }
return "" return ""
} }
func (x *GetPermissionByIdRequest) GetRoleIds() []string { func (x *GetPermissionByIDRequest) GetRoleIds() []string {
if x != nil { if x != nil {
return x.RoleIds return x.RoleIds
} }
return nil return nil
} }
type GetPermissionByIdResponse struct { type GetPermissionByIDResponse struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@@ -1633,8 +1633,8 @@ type GetPermissionByIdResponse struct {
Permission *Permission `protobuf:"bytes,1,opt,name=permission,proto3" json:"permission,omitempty"` Permission *Permission `protobuf:"bytes,1,opt,name=permission,proto3" json:"permission,omitempty"`
} }
func (x *GetPermissionByIdResponse) Reset() { func (x *GetPermissionByIDResponse) Reset() {
*x = GetPermissionByIdResponse{} *x = GetPermissionByIDResponse{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_settings_proto_msgTypes[27] mi := &file_settings_proto_msgTypes[27]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1642,13 +1642,13 @@ func (x *GetPermissionByIdResponse) Reset() {
} }
} }
func (x *GetPermissionByIdResponse) String() string { func (x *GetPermissionByIDResponse) String() string {
return protoimpl.X.MessageStringOf(x) return protoimpl.X.MessageStringOf(x)
} }
func (*GetPermissionByIdResponse) ProtoMessage() {} func (*GetPermissionByIDResponse) ProtoMessage() {}
func (x *GetPermissionByIdResponse) ProtoReflect() protoreflect.Message { func (x *GetPermissionByIDResponse) ProtoReflect() protoreflect.Message {
mi := &file_settings_proto_msgTypes[27] mi := &file_settings_proto_msgTypes[27]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1660,12 +1660,12 @@ func (x *GetPermissionByIdResponse) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use GetPermissionByIdResponse.ProtoReflect.Descriptor instead. // Deprecated: Use GetPermissionByIDResponse.ProtoReflect.Descriptor instead.
func (*GetPermissionByIdResponse) Descriptor() ([]byte, []int) { func (*GetPermissionByIDResponse) Descriptor() ([]byte, []int) {
return file_settings_proto_rawDescGZIP(), []int{27} return file_settings_proto_rawDescGZIP(), []int{27}
} }
func (x *GetPermissionByIdResponse) GetPermission() *Permission { func (x *GetPermissionByIDResponse) GetPermission() *Permission {
if x != nil { if x != nil {
return x.Permission return x.Permission
} }
@@ -2836,13 +2836,13 @@ var file_settings_proto_rawDesc = []byte{
0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
0x22, 0x5a, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x22, 0x5a, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
0x6e, 0x42, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x6e, 0x42, 0x79, 0x49, 0x44, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d,
0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49,
0x64, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20,
0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x73, 0x22, 0x4e, 0x0a, 0x19, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x73, 0x22, 0x4e, 0x0a, 0x19,
0x47, 0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x49, 0x47, 0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x49,
0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x44, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x0a, 0x70, 0x65, 0x72,
0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
0x52, 0x0a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xd1, 0x01, 0x0a, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xd1, 0x01, 0x0a,
@@ -3119,10 +3119,10 @@ var file_settings_proto_rawDesc = []byte{
0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x2d, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x2d,
0x62, 0x79, 0x2d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x89, 0x62, 0x79, 0x2d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x89,
0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
0x42, 0x79, 0x49, 0x64, 0x12, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x79, 0x49, 0x44, 0x12, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74,
0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x49, 0x64, 0x52, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x49, 0x44, 0x52, 0x65,
0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65,
0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x49, 0x64, 0x52, 0x74, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x49, 0x44, 0x52,
0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x22, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x22,
0x26, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x30, 0x2f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x26, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x30, 0x2f, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
0x73, 0x2f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x67, 0x65, 0x73, 0x2f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x67, 0x65,
@@ -3194,8 +3194,8 @@ var file_settings_proto_goTypes = []interface{}{
(*UserRoleAssignment)(nil), // 27: proto.UserRoleAssignment (*UserRoleAssignment)(nil), // 27: proto.UserRoleAssignment
(*ListPermissionsByResourceRequest)(nil), // 28: proto.ListPermissionsByResourceRequest (*ListPermissionsByResourceRequest)(nil), // 28: proto.ListPermissionsByResourceRequest
(*ListPermissionsByResourceResponse)(nil), // 29: proto.ListPermissionsByResourceResponse (*ListPermissionsByResourceResponse)(nil), // 29: proto.ListPermissionsByResourceResponse
(*GetPermissionByIdRequest)(nil), // 30: proto.GetPermissionByIdRequest (*GetPermissionByIDRequest)(nil), // 30: proto.GetPermissionByIDRequest
(*GetPermissionByIdResponse)(nil), // 31: proto.GetPermissionByIdResponse (*GetPermissionByIDResponse)(nil), // 31: proto.GetPermissionByIDResponse
(*Resource)(nil), // 32: proto.Resource (*Resource)(nil), // 32: proto.Resource
(*Bundle)(nil), // 33: proto.Bundle (*Bundle)(nil), // 33: proto.Bundle
(*Setting)(nil), // 34: proto.Setting (*Setting)(nil), // 34: proto.Setting
@@ -3228,7 +3228,7 @@ var file_settings_proto_depIdxs = []int32{
27, // 13: proto.AssignRoleToUserResponse.assignment:type_name -> proto.UserRoleAssignment 27, // 13: proto.AssignRoleToUserResponse.assignment:type_name -> proto.UserRoleAssignment
32, // 14: proto.ListPermissionsByResourceRequest.resource:type_name -> proto.Resource 32, // 14: proto.ListPermissionsByResourceRequest.resource:type_name -> proto.Resource
41, // 15: proto.ListPermissionsByResourceResponse.permissions:type_name -> proto.Permission 41, // 15: proto.ListPermissionsByResourceResponse.permissions:type_name -> proto.Permission
41, // 16: proto.GetPermissionByIdResponse.permission:type_name -> proto.Permission 41, // 16: proto.GetPermissionByIDResponse.permission:type_name -> proto.Permission
0, // 17: proto.Resource.type:type_name -> proto.Resource.Type 0, // 17: proto.Resource.type:type_name -> proto.Resource.Type
1, // 18: proto.Bundle.type:type_name -> proto.Bundle.Type 1, // 18: proto.Bundle.type:type_name -> proto.Bundle.Type
34, // 19: proto.Bundle.settings:type_name -> proto.Setting 34, // 19: proto.Bundle.settings:type_name -> proto.Setting
@@ -3262,7 +3262,7 @@ var file_settings_proto_depIdxs = []int32{
24, // 47: proto.RoleService.AssignRoleToUser:input_type -> proto.AssignRoleToUserRequest 24, // 47: proto.RoleService.AssignRoleToUser:input_type -> proto.AssignRoleToUserRequest
26, // 48: proto.RoleService.RemoveRoleFromUser:input_type -> proto.RemoveRoleFromUserRequest 26, // 48: proto.RoleService.RemoveRoleFromUser:input_type -> proto.RemoveRoleFromUserRequest
28, // 49: proto.PermissionService.ListPermissionsByResource:input_type -> proto.ListPermissionsByResourceRequest 28, // 49: proto.PermissionService.ListPermissionsByResource:input_type -> proto.ListPermissionsByResourceRequest
30, // 50: proto.PermissionService.GetPermissionById:input_type -> proto.GetPermissionByIdRequest 30, // 50: proto.PermissionService.GetPermissionByID:input_type -> proto.GetPermissionByIDRequest
5, // 51: proto.BundleService.SaveBundle:output_type -> proto.SaveBundleResponse 5, // 51: proto.BundleService.SaveBundle:output_type -> proto.SaveBundleResponse
7, // 52: proto.BundleService.GetBundle:output_type -> proto.GetBundleResponse 7, // 52: proto.BundleService.GetBundle:output_type -> proto.GetBundleResponse
9, // 53: proto.BundleService.ListBundles:output_type -> proto.ListBundlesResponse 9, // 53: proto.BundleService.ListBundles:output_type -> proto.ListBundlesResponse
@@ -3277,7 +3277,7 @@ var file_settings_proto_depIdxs = []int32{
25, // 62: proto.RoleService.AssignRoleToUser:output_type -> proto.AssignRoleToUserResponse 25, // 62: proto.RoleService.AssignRoleToUser:output_type -> proto.AssignRoleToUserResponse
45, // 63: proto.RoleService.RemoveRoleFromUser:output_type -> google.protobuf.Empty 45, // 63: proto.RoleService.RemoveRoleFromUser:output_type -> google.protobuf.Empty
29, // 64: proto.PermissionService.ListPermissionsByResource:output_type -> proto.ListPermissionsByResourceResponse 29, // 64: proto.PermissionService.ListPermissionsByResource:output_type -> proto.ListPermissionsByResourceResponse
31, // 65: proto.PermissionService.GetPermissionById:output_type -> proto.GetPermissionByIdResponse 31, // 65: proto.PermissionService.GetPermissionByID:output_type -> proto.GetPermissionByIDResponse
51, // [51:66] is the sub-list for method output_type 51, // [51:66] is the sub-list for method output_type
36, // [36:51] is the sub-list for method input_type 36, // [36:51] is the sub-list for method input_type
36, // [36:36] is the sub-list for extension type_name 36, // [36:36] is the sub-list for extension type_name
@@ -3604,7 +3604,7 @@ func file_settings_proto_init() {
} }
} }
file_settings_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { file_settings_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GetPermissionByIdRequest); i { switch v := v.(*GetPermissionByIDRequest); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@@ -3616,7 +3616,7 @@ func file_settings_proto_init() {
} }
} }
file_settings_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { file_settings_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GetPermissionByIdResponse); i { switch v := v.(*GetPermissionByIDResponse); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
pkg/proto/v0/settings.pb.micro.go
+10 -10
View File
@@ -580,7 +580,7 @@ func NewPermissionServiceEndpoints() []*api.Endpoint {
Handler: "rpc", Handler: "rpc",
}, },
&api.Endpoint{ &api.Endpoint{
Name: "PermissionService.GetPermissionById", Name: "PermissionService.GetPermissionByID",
Path: []string{"/api/v0/settings/permissions-get-by-id"}, Path: []string{"/api/v0/settings/permissions-get-by-id"},
Method: []string{"POST"}, Method: []string{"POST"},
Body: "*", Body: "*",
@@ -593,7 +593,7 @@ func NewPermissionServiceEndpoints() []*api.Endpoint {
type PermissionService interface { type PermissionService interface {
ListPermissionsByResource(ctx context.Context, in *ListPermissionsByResourceRequest, opts ...client.CallOption) (*ListPermissionsByResourceResponse, error) ListPermissionsByResource(ctx context.Context, in *ListPermissionsByResourceRequest, opts ...client.CallOption) (*ListPermissionsByResourceResponse, error)
GetPermissionById(ctx context.Context, in *GetPermissionByIdRequest, opts ...client.CallOption) (*GetPermissionByIdResponse, error) GetPermissionByID(ctx context.Context, in *GetPermissionByIDRequest, opts ...client.CallOption) (*GetPermissionByIDResponse, error)
} }
type permissionService struct { type permissionService struct {
@@ -618,9 +618,9 @@ func (c *permissionService) ListPermissionsByResource(ctx context.Context, in *L
return out, nil return out, nil
} }
func (c *permissionService) GetPermissionById(ctx context.Context, in *GetPermissionByIdRequest, opts ...client.CallOption) (*GetPermissionByIdResponse, error) { func (c *permissionService) GetPermissionByID(ctx context.Context, in *GetPermissionByIDRequest, opts ...client.CallOption) (*GetPermissionByIDResponse, error) {
req := c.c.NewRequest(c.name, "PermissionService.GetPermissionById", in) req := c.c.NewRequest(c.name, "PermissionService.GetPermissionByID", in)
out := new(GetPermissionByIdResponse) out := new(GetPermissionByIDResponse)
err := c.c.Call(ctx, req, out, opts...) err := c.c.Call(ctx, req, out, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -632,13 +632,13 @@ func (c *permissionService) GetPermissionById(ctx context.Context, in *GetPermis
type PermissionServiceHandler interface { type PermissionServiceHandler interface {
ListPermissionsByResource(context.Context, *ListPermissionsByResourceRequest, *ListPermissionsByResourceResponse) error ListPermissionsByResource(context.Context, *ListPermissionsByResourceRequest, *ListPermissionsByResourceResponse) error
GetPermissionById(context.Context, *GetPermissionByIdRequest, *GetPermissionByIdResponse) error GetPermissionByID(context.Context, *GetPermissionByIDRequest, *GetPermissionByIDResponse) error
} }
func RegisterPermissionServiceHandler(s server.Server, hdlr PermissionServiceHandler, opts ...server.HandlerOption) error { func RegisterPermissionServiceHandler(s server.Server, hdlr PermissionServiceHandler, opts ...server.HandlerOption) error {
type permissionService interface { type permissionService interface {
ListPermissionsByResource(ctx context.Context, in *ListPermissionsByResourceRequest, out *ListPermissionsByResourceResponse) error ListPermissionsByResource(ctx context.Context, in *ListPermissionsByResourceRequest, out *ListPermissionsByResourceResponse) error
GetPermissionById(ctx context.Context, in *GetPermissionByIdRequest, out *GetPermissionByIdResponse) error GetPermissionByID(ctx context.Context, in *GetPermissionByIDRequest, out *GetPermissionByIDResponse) error
} }
type PermissionService struct { type PermissionService struct {
permissionService permissionService
@@ -652,7 +652,7 @@ func RegisterPermissionServiceHandler(s server.Server, hdlr PermissionServiceHan
Handler: "rpc", Handler: "rpc",
})) }))
opts = append(opts, api.WithEndpoint(&api.Endpoint{ opts = append(opts, api.WithEndpoint(&api.Endpoint{
Name: "PermissionService.GetPermissionById", Name: "PermissionService.GetPermissionByID",
Path: []string{"/api/v0/settings/permissions-get-by-id"}, Path: []string{"/api/v0/settings/permissions-get-by-id"},
Method: []string{"POST"}, Method: []string{"POST"},
Body: "*", Body: "*",
@@ -669,6 +669,6 @@ func (h *permissionServiceHandler) ListPermissionsByResource(ctx context.Context
return h.PermissionServiceHandler.ListPermissionsByResource(ctx, in, out) return h.PermissionServiceHandler.ListPermissionsByResource(ctx, in, out)
} }
func (h *permissionServiceHandler) GetPermissionById(ctx context.Context, in *GetPermissionByIdRequest, out *GetPermissionByIdResponse) error { func (h *permissionServiceHandler) GetPermissionByID(ctx context.Context, in *GetPermissionByIDRequest, out *GetPermissionByIDResponse) error {
return h.PermissionServiceHandler.GetPermissionById(ctx, in, out) return h.PermissionServiceHandler.GetPermissionByID(ctx, in, out)
} }
pkg/proto/v0/settings.pb.web.go
+29 -29
View File
@@ -422,18 +422,18 @@ func (h *webPermissionServiceHandler) ListPermissionsByResource(w http.ResponseW
render.JSON(w, r, resp) render.JSON(w, r, resp)
} }
func (h *webPermissionServiceHandler) GetPermissionById(w http.ResponseWriter, r *http.Request) { func (h *webPermissionServiceHandler) GetPermissionByID(w http.ResponseWriter, r *http.Request) {
req := &GetPermissionByIdRequest{} req := &GetPermissionByIDRequest{}
resp := &GetPermissionByIdResponse{} resp := &GetPermissionByIDResponse{}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil { if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
http.Error(w, err.Error(), http.StatusPreconditionFailed) http.Error(w, err.Error(), http.StatusPreconditionFailed)
return return
} }
if err := h.h.GetPermissionById( if err := h.h.GetPermissionByID(
r.Context(), r.Context(),
req, req,
resp, resp,
@@ -453,7 +453,7 @@ func RegisterPermissionServiceWeb(r chi.Router, i PermissionServiceHandler, midd
} }
r.MethodFunc("POST", "/api/v0/settings/permissions-list-by-resource", handler.ListPermissionsByResource) r.MethodFunc("POST", "/api/v0/settings/permissions-list-by-resource", handler.ListPermissionsByResource)
r.MethodFunc("POST", "/api/v0/settings/permissions-get-by-id", handler.GetPermissionById) r.MethodFunc("POST", "/api/v0/settings/permissions-get-by-id", handler.GetPermissionByID)
} }
// SaveBundleRequestJSONMarshaler describes the default jsonpb.Marshaler used by all // SaveBundleRequestJSONMarshaler describes the default jsonpb.Marshaler used by all
@@ -1392,77 +1392,77 @@ func (m *ListPermissionsByResourceResponse) UnmarshalJSON(b []byte) error {
var _ json.Unmarshaler = (*ListPermissionsByResourceResponse)(nil) var _ json.Unmarshaler = (*ListPermissionsByResourceResponse)(nil)
// GetPermissionByIdRequestJSONMarshaler describes the default jsonpb.Marshaler used by all // GetPermissionByIDRequestJSONMarshaler describes the default jsonpb.Marshaler used by all
// instances of GetPermissionByIdRequest. This struct is safe to replace or modify but // instances of GetPermissionByIDRequest. This struct is safe to replace or modify but
// should not be done so concurrently. // should not be done so concurrently.
var GetPermissionByIdRequestJSONMarshaler = new(jsonpb.Marshaler) var GetPermissionByIDRequestJSONMarshaler = new(jsonpb.Marshaler)
// MarshalJSON satisfies the encoding/json Marshaler interface. This method // MarshalJSON satisfies the encoding/json Marshaler interface. This method
// uses the more correct jsonpb package to correctly marshal the message. // uses the more correct jsonpb package to correctly marshal the message.
func (m *GetPermissionByIdRequest) MarshalJSON() ([]byte, error) { func (m *GetPermissionByIDRequest) MarshalJSON() ([]byte, error) {
if m == nil { if m == nil {
return json.Marshal(nil) return json.Marshal(nil)
} }
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
if err := GetPermissionByIdRequestJSONMarshaler.Marshal(buf, m); err != nil { if err := GetPermissionByIDRequestJSONMarshaler.Marshal(buf, m); err != nil {
return nil, err return nil, err
} }
return buf.Bytes(), nil return buf.Bytes(), nil
} }
var _ json.Marshaler = (*GetPermissionByIdRequest)(nil) var _ json.Marshaler = (*GetPermissionByIDRequest)(nil)
// GetPermissionByIdRequestJSONUnmarshaler describes the default jsonpb.Unmarshaler used by all // GetPermissionByIDRequestJSONUnmarshaler describes the default jsonpb.Unmarshaler used by all
// instances of GetPermissionByIdRequest. This struct is safe to replace or modify but // instances of GetPermissionByIDRequest. This struct is safe to replace or modify but
// should not be done so concurrently. // should not be done so concurrently.
var GetPermissionByIdRequestJSONUnmarshaler = new(jsonpb.Unmarshaler) var GetPermissionByIDRequestJSONUnmarshaler = new(jsonpb.Unmarshaler)
// UnmarshalJSON satisfies the encoding/json Unmarshaler interface. This method // UnmarshalJSON satisfies the encoding/json Unmarshaler interface. This method
// uses the more correct jsonpb package to correctly unmarshal the message. // uses the more correct jsonpb package to correctly unmarshal the message.
func (m *GetPermissionByIdRequest) UnmarshalJSON(b []byte) error { func (m *GetPermissionByIDRequest) UnmarshalJSON(b []byte) error {
return GetPermissionByIdRequestJSONUnmarshaler.Unmarshal(bytes.NewReader(b), m) return GetPermissionByIDRequestJSONUnmarshaler.Unmarshal(bytes.NewReader(b), m)
} }
var _ json.Unmarshaler = (*GetPermissionByIdRequest)(nil) var _ json.Unmarshaler = (*GetPermissionByIDRequest)(nil)
// GetPermissionByIdResponseJSONMarshaler describes the default jsonpb.Marshaler used by all // GetPermissionByIDResponseJSONMarshaler describes the default jsonpb.Marshaler used by all
// instances of GetPermissionByIdResponse. This struct is safe to replace or modify but // instances of GetPermissionByIDResponse. This struct is safe to replace or modify but
// should not be done so concurrently. // should not be done so concurrently.
var GetPermissionByIdResponseJSONMarshaler = new(jsonpb.Marshaler) var GetPermissionByIDResponseJSONMarshaler = new(jsonpb.Marshaler)
// MarshalJSON satisfies the encoding/json Marshaler interface. This method // MarshalJSON satisfies the encoding/json Marshaler interface. This method
// uses the more correct jsonpb package to correctly marshal the message. // uses the more correct jsonpb package to correctly marshal the message.
func (m *GetPermissionByIdResponse) MarshalJSON() ([]byte, error) { func (m *GetPermissionByIDResponse) MarshalJSON() ([]byte, error) {
if m == nil { if m == nil {
return json.Marshal(nil) return json.Marshal(nil)
} }
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
if err := GetPermissionByIdResponseJSONMarshaler.Marshal(buf, m); err != nil { if err := GetPermissionByIDResponseJSONMarshaler.Marshal(buf, m); err != nil {
return nil, err return nil, err
} }
return buf.Bytes(), nil return buf.Bytes(), nil
} }
var _ json.Marshaler = (*GetPermissionByIdResponse)(nil) var _ json.Marshaler = (*GetPermissionByIDResponse)(nil)
// GetPermissionByIdResponseJSONUnmarshaler describes the default jsonpb.Unmarshaler used by all // GetPermissionByIDResponseJSONUnmarshaler describes the default jsonpb.Unmarshaler used by all
// instances of GetPermissionByIdResponse. This struct is safe to replace or modify but // instances of GetPermissionByIDResponse. This struct is safe to replace or modify but
// should not be done so concurrently. // should not be done so concurrently.
var GetPermissionByIdResponseJSONUnmarshaler = new(jsonpb.Unmarshaler) var GetPermissionByIDResponseJSONUnmarshaler = new(jsonpb.Unmarshaler)
// UnmarshalJSON satisfies the encoding/json Unmarshaler interface. This method // UnmarshalJSON satisfies the encoding/json Unmarshaler interface. This method
// uses the more correct jsonpb package to correctly unmarshal the message. // uses the more correct jsonpb package to correctly unmarshal the message.
func (m *GetPermissionByIdResponse) UnmarshalJSON(b []byte) error { func (m *GetPermissionByIDResponse) UnmarshalJSON(b []byte) error {
return GetPermissionByIdResponseJSONUnmarshaler.Unmarshal(bytes.NewReader(b), m) return GetPermissionByIDResponseJSONUnmarshaler.Unmarshal(bytes.NewReader(b), m)
} }
var _ json.Unmarshaler = (*GetPermissionByIdResponse)(nil) var _ json.Unmarshaler = (*GetPermissionByIDResponse)(nil)
// ResourceJSONMarshaler describes the default jsonpb.Marshaler used by all // ResourceJSONMarshaler describes the default jsonpb.Marshaler used by all
// instances of Resource. This struct is safe to replace or modify but // instances of Resource. This struct is safe to replace or modify but
pkg/proto/v0/settings.proto
+3 -3
View File
@@ -125,7 +125,7 @@ service PermissionService {
body: "*" body: "*"
}; };
} }
rpc GetPermissionById(GetPermissionByIdRequest) returns (GetPermissionByIdResponse) { rpc GetPermissionByID(GetPermissionByIDRequest) returns (GetPermissionByIDResponse) {
option (google.api.http) = { option (google.api.http) = {
post: "/api/v0/settings/permissions-get-by-id", post: "/api/v0/settings/permissions-get-by-id",
body: "*" body: "*"
@@ -266,12 +266,12 @@ message ListPermissionsByResourceResponse {
repeated Permission permissions = 1; repeated Permission permissions = 1;
} }
message GetPermissionByIdRequest { message GetPermissionByIDRequest {
string permission_id = 1; string permission_id = 1;
repeated string role_ids = 2; repeated string role_ids = 2;
} }
message GetPermissionByIdResponse { message GetPermissionByIDResponse {
Permission permission = 1; Permission permission = 1;
} }
pkg/proto/v0/settings.swagger.json
+5 -5
View File
@@ -282,12 +282,12 @@
}, },
"/api/v0/settings/permissions-get-by-id": { "/api/v0/settings/permissions-get-by-id": {
"post": { "post": {
"operationId": "PermissionService_GetPermissionById", "operationId": "PermissionService_GetPermissionByID",
"responses": { "responses": {
"200": { "200": {
"description": "A successful response.", "description": "A successful response.",
"schema": { "schema": {
"$ref": "#/definitions/protoGetPermissionByIdResponse" "$ref": "#/definitions/protoGetPermissionByIDResponse"
} }
}, },
"default": { "default": {
@@ -303,7 +303,7 @@
"in": "body", "in": "body",
"required": true, "required": true,
"schema": { "schema": {
"$ref": "#/definitions/protoGetPermissionByIdRequest" "$ref": "#/definitions/protoGetPermissionByIDRequest"
} }
} }
], ],
@@ -621,7 +621,7 @@
} }
} }
}, },
"protoGetPermissionByIdRequest": { "protoGetPermissionByIDRequest": {
"type": "object", "type": "object",
"properties": { "properties": {
"permission_id": { "permission_id": {
@@ -635,7 +635,7 @@
} }
} }
}, },
"protoGetPermissionByIdResponse": { "protoGetPermissionByIDResponse": {
"type": "object", "type": "object",
"properties": { "properties": {
"permission": { "permission": {
pkg/service/v0/service.go
+2 -2
View File
@@ -321,8 +321,8 @@ func (g Service) ListPermissionsByResource(c context.Context, req *proto.ListPer
return nil return nil
} }
func (g Service) GetPermissionById(c context.Context, req *proto.GetPermissionByIdRequest, res *proto.GetPermissionByIdResponse) error { func (g Service) GetPermissionByID(c context.Context, req *proto.GetPermissionByIDRequest, res *proto.GetPermissionByIDResponse) error {
if validationError := validateGetPermissionById(req); validationError != nil { if validationError := validateGetPermissionByID(req); validationError != nil {
return merrors.BadRequest(g.id, "%s", validationError) return merrors.BadRequest(g.id, "%s", validationError)
} }
permission, err := g.manager.ReadPermissionByID(req.PermissionId, req.RoleIds) permission, err := g.manager.ReadPermissionByID(req.PermissionId, req.RoleIds)
pkg/service/v0/validator.go
+1 -1
View File
@@ -132,7 +132,7 @@ func validateListPermissionsByResource(req *proto.ListPermissionsByResourceReque
) )
} }
func validateGetPermissionById(req *proto.GetPermissionByIdRequest) error { func validateGetPermissionByID(req *proto.GetPermissionByIDRequest) error {
return validation.ValidateStruct( return validation.ValidateStruct(
req, req,
validation.Field(&req.PermissionId, requireAlphanumeric...), validation.Field(&req.PermissionId, requireAlphanumeric...),
pkg/store/filesystem/permissions.go
+1 -1
View File
@@ -19,7 +19,7 @@ func (s Store) ListPermissionsByResource(resource *proto.Resource, roleIDs []str
return records, nil return records, nil
} }
// ReadPermissionById finds the permission in the roles, specified by the provided roleIDs // ReadPermissionByID finds the permission in the roles, specified by the provided roleIDs
func (s Store) ReadPermissionByID(permissionID string, roleIDs []string) (*proto.Permission, error) { func (s Store) ReadPermissionByID(permissionID string, roleIDs []string) (*proto.Permission, error) {
for _, roleID := range roleIDs { for _, roleID := range roleIDs {
role, err := s.ReadBundle(roleID) role, err := s.ReadBundle(roleID)