apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Plugins: Refactor secrets plugin .proto file (#50722)

Browse Source 
* refactor .proto file according to prior PR suggestions

* re-generate protobuf files and fix compilation errors

* rename proto functions to be more descriptive
pull/50815/head
Michael Mandrus 3 years ago committed by GitHub
parent d483a2fa4b
commit d886141d69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 563 additions and 421 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 668
      pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.pb.go
  2. 64
      pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.proto
  3. 28
      pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grcp_plugin.go
  4. 184
      pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grpc.pb.go
  5. 40
      pkg/services/secrets/kvstore/remote_plugin.go

668
pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.pb.go
View File

File diff suppressed because it is too large Load Diff

64
pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.proto
Unescape View File

@ -3,54 +3,62 @@ package secretsmanagerplugin;
option go_package = "./;secretsmanagerplugin"; option go_package = "./;secretsmanagerplugin";
message SecretsGetRequest { message Key {
int64 orgId = 1;
string namespace = 2;
string type = 3;
}
message GetSecretRequest {
Key keyDescriptor = 1; Key keyDescriptor = 1;
} }
message SecretsSetRequest { message GetSecretResponse {
string userFriendlyError = 1;
string decryptedValue = 2;
bool exists = 3;
}
message SetSecretRequest {
Key keyDescriptor = 1; Key keyDescriptor = 1;
string value = 2; string value = 2;
} }
message SecretsDelRequest { message SetSecretResponse {
Key keyDescriptor = 1; string userFriendlyError = 1;
} }
message SecretsKeysRequest { message DeleteSecretRequest {
Key keyDescriptor = 1; Key keyDescriptor = 1;
bool allOrganizations = 2;
} }
message SecretsRenameRequest { message DeleteSecretResponse {
Key keyDescriptor = 1; string userFriendlyError = 1;
string newNamespace = 2;
} }
message Key { message ListSecretsRequest {
int64 orgId = 1; Key keyDescriptor = 1;
string namespace = 2; bool allOrganizations = 2;
string type = 3;
} }
message SecretsErrorResponse { message ListSecretsResponse {
string error = 1; string userFriendlyError = 1;
repeated Key keys = 2;
} }
message SecretsGetResponse { message RenameSecretRequest {
string error = 1; Key keyDescriptor = 1;
string decryptedValue = 2; string newNamespace = 2;
bool exists = 3;
} }
message SecretsKeysResponse { message RenameSecretResponse {
string error = 1; string userFriendlyError = 1;
repeated Key keys = 2;
} }
service RemoteSecretsManager { service SecretsManager {
rpc Get(SecretsGetRequest) returns (SecretsGetResponse); rpc GetSecret(GetSecretRequest) returns (GetSecretResponse);
rpc Set(SecretsSetRequest) returns (SecretsErrorResponse); rpc SetSecret(SetSecretRequest) returns (SetSecretResponse);
rpc Del(SecretsDelRequest) returns (SecretsErrorResponse); rpc DeleteSecret(DeleteSecretRequest) returns (DeleteSecretResponse);
rpc Keys(SecretsKeysRequest) returns (SecretsKeysResponse); rpc ListSecrets(ListSecretsRequest) returns (ListSecretsResponse);
rpc Rename(SecretsRenameRequest) returns (SecretsErrorResponse); rpc RenameSecret(RenameSecretRequest) returns (RenameSecretResponse);
} }

28
pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grcp_plugin.go
Unescape View File

@ -8,7 +8,7 @@ import (
) )
type SecretsManagerPlugin interface { type SecretsManagerPlugin interface {
RemoteSecretsManagerClient SecretsManagerClient
} }
type SecretsManagerGRPCPlugin struct { type SecretsManagerGRPCPlugin struct {
@ -20,37 +20,37 @@ func (p *SecretsManagerGRPCPlugin) GRPCServer(broker *plugin.GRPCBroker, s *grpc
} }
func (p *SecretsManagerGRPCPlugin) GRPCClient(ctx context.Context, broker *plugin.GRPCBroker, c *grpc.ClientConn) (interface{}, error) { func (p *SecretsManagerGRPCPlugin) GRPCClient(ctx context.Context, broker *plugin.GRPCBroker, c *grpc.ClientConn) (interface{}, error) {
return &SecretsManagerGRPCClient{NewRemoteSecretsManagerClient(c)}, nil return &SecretsManagerGRPCClient{NewSecretsManagerClient(c)}, nil
} }
type SecretsManagerGRPCClient struct { type SecretsManagerGRPCClient struct {
RemoteSecretsManagerClient SecretsManagerClient
} }
// Get an item from the store // Get an item from the store
func (sm *SecretsManagerGRPCClient) Get(ctx context.Context, req *SecretsGetRequest, opts ...grpc.CallOption) (*SecretsGetResponse, error) { func (sm *SecretsManagerGRPCClient) GetSecret(ctx context.Context, req *GetSecretRequest, opts ...grpc.CallOption) (*GetSecretResponse, error) {
return sm.RemoteSecretsManagerClient.Get(ctx, req) return sm.SecretsManagerClient.GetSecret(ctx, req)
} }
// Set an item in the store // Set an item in the store
func (sm *SecretsManagerGRPCClient) Set(ctx context.Context, req *SecretsSetRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) { func (sm *SecretsManagerGRPCClient) SetSecret(ctx context.Context, req *SetSecretRequest, opts ...grpc.CallOption) (*SetSecretResponse, error) {
return sm.RemoteSecretsManagerClient.Set(ctx, req) return sm.SecretsManagerClient.SetSecret(ctx, req)
} }
// Del deletes an item from the store. // Del deletes an item from the store.
func (sm *SecretsManagerGRPCClient) Del(ctx context.Context, req *SecretsDelRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) { func (sm *SecretsManagerGRPCClient) DeleteSecret(ctx context.Context, req *DeleteSecretRequest, opts ...grpc.CallOption) (*DeleteSecretResponse, error) {
return sm.RemoteSecretsManagerClient.Del(ctx, req) return sm.SecretsManagerClient.DeleteSecret(ctx, req)
} }
// Keys get all keys for a given namespace. // Keys get all keys for a given namespace.
func (sm *SecretsManagerGRPCClient) Keys(ctx context.Context, req *SecretsKeysRequest, opts ...grpc.CallOption) (*SecretsKeysResponse, error) { func (sm *SecretsManagerGRPCClient) ListSecrets(ctx context.Context, req *ListSecretsRequest, opts ...grpc.CallOption) (*ListSecretsResponse, error) {
return sm.RemoteSecretsManagerClient.Keys(ctx, req) return sm.SecretsManagerClient.ListSecrets(ctx, req)
} }
// Rename an item in the store // Rename an item in the store
func (sm *SecretsManagerGRPCClient) Rename(ctx context.Context, req *SecretsRenameRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) { func (sm *SecretsManagerGRPCClient) RenameSecret(ctx context.Context, req *RenameSecretRequest, opts ...grpc.CallOption) (*RenameSecretResponse, error) {
return sm.RemoteSecretsManagerClient.Rename(ctx, req) return sm.SecretsManagerClient.RenameSecret(ctx, req)
} }
var _ RemoteSecretsManagerClient = &SecretsManagerGRPCClient{} var _ SecretsManagerClient = &SecretsManagerGRPCClient{}
var _ plugin.GRPCPlugin = &SecretsManagerGRPCPlugin{} var _ plugin.GRPCPlugin = &SecretsManagerGRPCPlugin{}

184
pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grpc.pb.go
Unescape View File

@ -18,230 +18,230 @@ import (
// Requires gRPC-Go v1.32.0 or later. // Requires gRPC-Go v1.32.0 or later.
const _ = grpc.SupportPackageIsVersion7 const _ = grpc.SupportPackageIsVersion7
// RemoteSecretsManagerClient is the client API for RemoteSecretsManager service. // SecretsManagerClient is the client API for SecretsManager service.
// //
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
type RemoteSecretsManagerClient interface { type SecretsManagerClient interface {
Get(ctx context.Context, in *SecretsGetRequest, opts ...grpc.CallOption) (*SecretsGetResponse, error) GetSecret(ctx context.Context, in *GetSecretRequest, opts ...grpc.CallOption) (*GetSecretResponse, error)
Set(ctx context.Context, in *SecretsSetRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) SetSecret(ctx context.Context, in *SetSecretRequest, opts ...grpc.CallOption) (*SetSecretResponse, error)
Del(ctx context.Context, in *SecretsDelRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) DeleteSecret(ctx context.Context, in *DeleteSecretRequest, opts ...grpc.CallOption) (*DeleteSecretResponse, error)
Keys(ctx context.Context, in *SecretsKeysRequest, opts ...grpc.CallOption) (*SecretsKeysResponse, error) ListSecrets(ctx context.Context, in *ListSecretsRequest, opts ...grpc.CallOption) (*ListSecretsResponse, error)
Rename(ctx context.Context, in *SecretsRenameRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) RenameSecret(ctx context.Context, in *RenameSecretRequest, opts ...grpc.CallOption) (*RenameSecretResponse, error)
} }
type remoteSecretsManagerClient struct { type secretsManagerClient struct {
cc grpc.ClientConnInterface cc grpc.ClientConnInterface
} }
func NewRemoteSecretsManagerClient(cc grpc.ClientConnInterface) RemoteSecretsManagerClient { func NewSecretsManagerClient(cc grpc.ClientConnInterface) SecretsManagerClient {
return &remoteSecretsManagerClient{cc} return &secretsManagerClient{cc}
} }
func (c *remoteSecretsManagerClient) Get(ctx context.Context, in *SecretsGetRequest, opts ...grpc.CallOption) (*SecretsGetResponse, error) { func (c *secretsManagerClient) GetSecret(ctx context.Context, in *GetSecretRequest, opts ...grpc.CallOption) (*GetSecretResponse, error) {
out := new(SecretsGetResponse) out := new(GetSecretResponse)
err := c.cc.Invoke(ctx, "/secretsmanagerplugin.RemoteSecretsManager/Get", in, out, opts...) err := c.cc.Invoke(ctx, "/secretsmanagerplugin.SecretsManager/GetSecret", in, out, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *remoteSecretsManagerClient) Set(ctx context.Context, in *SecretsSetRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) { func (c *secretsManagerClient) SetSecret(ctx context.Context, in *SetSecretRequest, opts ...grpc.CallOption) (*SetSecretResponse, error) {
out := new(SecretsErrorResponse) out := new(SetSecretResponse)
err := c.cc.Invoke(ctx, "/secretsmanagerplugin.RemoteSecretsManager/Set", in, out, opts...) err := c.cc.Invoke(ctx, "/secretsmanagerplugin.SecretsManager/SetSecret", in, out, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *remoteSecretsManagerClient) Del(ctx context.Context, in *SecretsDelRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) { func (c *secretsManagerClient) DeleteSecret(ctx context.Context, in *DeleteSecretRequest, opts ...grpc.CallOption) (*DeleteSecretResponse, error) {
out := new(SecretsErrorResponse) out := new(DeleteSecretResponse)
err := c.cc.Invoke(ctx, "/secretsmanagerplugin.RemoteSecretsManager/Del", in, out, opts...) err := c.cc.Invoke(ctx, "/secretsmanagerplugin.SecretsManager/DeleteSecret", in, out, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *remoteSecretsManagerClient) Keys(ctx context.Context, in *SecretsKeysRequest, opts ...grpc.CallOption) (*SecretsKeysResponse, error) { func (c *secretsManagerClient) ListSecrets(ctx context.Context, in *ListSecretsRequest, opts ...grpc.CallOption) (*ListSecretsResponse, error) {
out := new(SecretsKeysResponse) out := new(ListSecretsResponse)
err := c.cc.Invoke(ctx, "/secretsmanagerplugin.RemoteSecretsManager/Keys", in, out, opts...) err := c.cc.Invoke(ctx, "/secretsmanagerplugin.SecretsManager/ListSecrets", in, out, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *remoteSecretsManagerClient) Rename(ctx context.Context, in *SecretsRenameRequest, opts ...grpc.CallOption) (*SecretsErrorResponse, error) { func (c *secretsManagerClient) RenameSecret(ctx context.Context, in *RenameSecretRequest, opts ...grpc.CallOption) (*RenameSecretResponse, error) {
out := new(SecretsErrorResponse) out := new(RenameSecretResponse)
err := c.cc.Invoke(ctx, "/secretsmanagerplugin.RemoteSecretsManager/Rename", in, out, opts...) err := c.cc.Invoke(ctx, "/secretsmanagerplugin.SecretsManager/RenameSecret", in, out, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
// RemoteSecretsManagerServer is the server API for RemoteSecretsManager service. // SecretsManagerServer is the server API for SecretsManager service.
// All implementations must embed UnimplementedRemoteSecretsManagerServer // All implementations must embed UnimplementedSecretsManagerServer
// for forward compatibility // for forward compatibility
type RemoteSecretsManagerServer interface { type SecretsManagerServer interface {
Get(context.Context, *SecretsGetRequest) (*SecretsGetResponse, error) GetSecret(context.Context, *GetSecretRequest) (*GetSecretResponse, error)
Set(context.Context, *SecretsSetRequest) (*SecretsErrorResponse, error) SetSecret(context.Context, *SetSecretRequest) (*SetSecretResponse, error)
Del(context.Context, *SecretsDelRequest) (*SecretsErrorResponse, error) DeleteSecret(context.Context, *DeleteSecretRequest) (*DeleteSecretResponse, error)
Keys(context.Context, *SecretsKeysRequest) (*SecretsKeysResponse, error) ListSecrets(context.Context, *ListSecretsRequest) (*ListSecretsResponse, error)
Rename(context.Context, *SecretsRenameRequest) (*SecretsErrorResponse, error) RenameSecret(context.Context, *RenameSecretRequest) (*RenameSecretResponse, error)
mustEmbedUnimplementedRemoteSecretsManagerServer() mustEmbedUnimplementedSecretsManagerServer()
} }
// UnimplementedRemoteSecretsManagerServer must be embedded to have forward compatible implementations. // UnimplementedSecretsManagerServer must be embedded to have forward compatible implementations.
type UnimplementedRemoteSecretsManagerServer struct { type UnimplementedSecretsManagerServer struct {
} }
func (UnimplementedRemoteSecretsManagerServer) Get(context.Context, *SecretsGetRequest) (*SecretsGetResponse, error) { func (UnimplementedSecretsManagerServer) GetSecret(context.Context, *GetSecretRequest) (*GetSecretResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method Get not implemented") return nil, status.Errorf(codes.Unimplemented, "method GetSecret not implemented")
} }
func (UnimplementedRemoteSecretsManagerServer) Set(context.Context, *SecretsSetRequest) (*SecretsErrorResponse, error) { func (UnimplementedSecretsManagerServer) SetSecret(context.Context, *SetSecretRequest) (*SetSecretResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method Set not implemented") return nil, status.Errorf(codes.Unimplemented, "method SetSecret not implemented")
} }
func (UnimplementedRemoteSecretsManagerServer) Del(context.Context, *SecretsDelRequest) (*SecretsErrorResponse, error) { func (UnimplementedSecretsManagerServer) DeleteSecret(context.Context, *DeleteSecretRequest) (*DeleteSecretResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method Del not implemented") return nil, status.Errorf(codes.Unimplemented, "method DeleteSecret not implemented")
} }
func (UnimplementedRemoteSecretsManagerServer) Keys(context.Context, *SecretsKeysRequest) (*SecretsKeysResponse, error) { func (UnimplementedSecretsManagerServer) ListSecrets(context.Context, *ListSecretsRequest) (*ListSecretsResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method Keys not implemented") return nil, status.Errorf(codes.Unimplemented, "method ListSecrets not implemented")
} }
func (UnimplementedRemoteSecretsManagerServer) Rename(context.Context, *SecretsRenameRequest) (*SecretsErrorResponse, error) { func (UnimplementedSecretsManagerServer) RenameSecret(context.Context, *RenameSecretRequest) (*RenameSecretResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method Rename not implemented") return nil, status.Errorf(codes.Unimplemented, "method RenameSecret not implemented")
} }
func (UnimplementedRemoteSecretsManagerServer) mustEmbedUnimplementedRemoteSecretsManagerServer() {} func (UnimplementedSecretsManagerServer) mustEmbedUnimplementedSecretsManagerServer() {}
// UnsafeRemoteSecretsManagerServer may be embedded to opt out of forward compatibility for this service. // UnsafeSecretsManagerServer may be embedded to opt out of forward compatibility for this service.
// Use of this interface is not recommended, as added methods to RemoteSecretsManagerServer will // Use of this interface is not recommended, as added methods to SecretsManagerServer will
// result in compilation errors. // result in compilation errors.
type UnsafeRemoteSecretsManagerServer interface { type UnsafeSecretsManagerServer interface {
mustEmbedUnimplementedRemoteSecretsManagerServer() mustEmbedUnimplementedSecretsManagerServer()
} }
func RegisterRemoteSecretsManagerServer(s grpc.ServiceRegistrar, srv RemoteSecretsManagerServer) { func RegisterSecretsManagerServer(s grpc.ServiceRegistrar, srv SecretsManagerServer) {
s.RegisterService(&RemoteSecretsManager_ServiceDesc, srv) s.RegisterService(&SecretsManager_ServiceDesc, srv)
} }
func _RemoteSecretsManager_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _SecretsManager_GetSecret_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SecretsGetRequest) in := new(GetSecretRequest)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(RemoteSecretsManagerServer).Get(ctx, in) return srv.(SecretsManagerServer).GetSecret(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/secretsmanagerplugin.RemoteSecretsManager/Get", FullMethod: "/secretsmanagerplugin.SecretsManager/GetSecret",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(RemoteSecretsManagerServer).Get(ctx, req.(*SecretsGetRequest)) return srv.(SecretsManagerServer).GetSecret(ctx, req.(*GetSecretRequest))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
func _RemoteSecretsManager_Set_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _SecretsManager_SetSecret_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SecretsSetRequest) in := new(SetSecretRequest)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(RemoteSecretsManagerServer).Set(ctx, in) return srv.(SecretsManagerServer).SetSecret(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/secretsmanagerplugin.RemoteSecretsManager/Set", FullMethod: "/secretsmanagerplugin.SecretsManager/SetSecret",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(RemoteSecretsManagerServer).Set(ctx, req.(*SecretsSetRequest)) return srv.(SecretsManagerServer).SetSecret(ctx, req.(*SetSecretRequest))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
func _RemoteSecretsManager_Del_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _SecretsManager_DeleteSecret_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SecretsDelRequest) in := new(DeleteSecretRequest)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(RemoteSecretsManagerServer).Del(ctx, in) return srv.(SecretsManagerServer).DeleteSecret(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/secretsmanagerplugin.RemoteSecretsManager/Del", FullMethod: "/secretsmanagerplugin.SecretsManager/DeleteSecret",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(RemoteSecretsManagerServer).Del(ctx, req.(*SecretsDelRequest)) return srv.(SecretsManagerServer).DeleteSecret(ctx, req.(*DeleteSecretRequest))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
func _RemoteSecretsManager_Keys_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _SecretsManager_ListSecrets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SecretsKeysRequest) in := new(ListSecretsRequest)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(RemoteSecretsManagerServer).Keys(ctx, in) return srv.(SecretsManagerServer).ListSecrets(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/secretsmanagerplugin.RemoteSecretsManager/Keys", FullMethod: "/secretsmanagerplugin.SecretsManager/ListSecrets",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(RemoteSecretsManagerServer).Keys(ctx, req.(*SecretsKeysRequest)) return srv.(SecretsManagerServer).ListSecrets(ctx, req.(*ListSecretsRequest))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
func _RemoteSecretsManager_Rename_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _SecretsManager_RenameSecret_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SecretsRenameRequest) in := new(RenameSecretRequest)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(RemoteSecretsManagerServer).Rename(ctx, in) return srv.(SecretsManagerServer).RenameSecret(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/secretsmanagerplugin.RemoteSecretsManager/Rename", FullMethod: "/secretsmanagerplugin.SecretsManager/RenameSecret",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(RemoteSecretsManagerServer).Rename(ctx, req.(*SecretsRenameRequest)) return srv.(SecretsManagerServer).RenameSecret(ctx, req.(*RenameSecretRequest))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
// RemoteSecretsManager_ServiceDesc is the grpc.ServiceDesc for RemoteSecretsManager service. // SecretsManager_ServiceDesc is the grpc.ServiceDesc for SecretsManager service.
// It's only intended for direct use with grpc.RegisterService, // It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy) // and not to be introspected or modified (even as a copy)
var RemoteSecretsManager_ServiceDesc = grpc.ServiceDesc{ var SecretsManager_ServiceDesc = grpc.ServiceDesc{
ServiceName: "secretsmanagerplugin.RemoteSecretsManager", ServiceName: "secretsmanagerplugin.SecretsManager",
HandlerType: (*RemoteSecretsManagerServer)(nil), HandlerType: (*SecretsManagerServer)(nil),
Methods: []grpc.MethodDesc{ Methods: []grpc.MethodDesc{
{ {
MethodName: "Get", MethodName: "GetSecret",
Handler: _RemoteSecretsManager_Get_Handler, Handler: _SecretsManager_GetSecret_Handler,
}, },
{ {
MethodName: "Set", MethodName: "SetSecret",
Handler: _RemoteSecretsManager_Set_Handler, Handler: _SecretsManager_SetSecret_Handler,
}, },
{ {
MethodName: "Del", MethodName: "DeleteSecret",
Handler: _RemoteSecretsManager_Del_Handler, Handler: _SecretsManager_DeleteSecret_Handler,
}, },
{ {
MethodName: "Keys", MethodName: "ListSecrets",
Handler: _RemoteSecretsManager_Keys_Handler, Handler: _SecretsManager_ListSecrets_Handler,
}, },
{ {
MethodName: "Rename", MethodName: "RenameSecret",
Handler: _RemoteSecretsManager_Rename_Handler, Handler: _SecretsManager_RenameSecret_Handler,
}, },
}, },
Streams: []grpc.StreamDesc{}, Streams: []grpc.StreamDesc{},

40
pkg/services/secrets/kvstore/remote_plugin.go
Unescape View File

@ -18,18 +18,18 @@ type secretsKVStorePlugin struct {
// Get an item from the store // Get an item from the store
func (kv *secretsKVStorePlugin) Get(ctx context.Context, orgId int64, namespace string, typ string) (string, bool, error) { func (kv *secretsKVStorePlugin) Get(ctx context.Context, orgId int64, namespace string, typ string) (string, bool, error) {
req := &smp.SecretsGetRequest{ req := &smp.GetSecretRequest{
KeyDescriptor: &smp.Key{ KeyDescriptor: &smp.Key{
OrgId: orgId, OrgId: orgId,
Namespace: namespace, Namespace: namespace,
Type: typ, Type: typ,
}, },
} }
res, err := kv.secretsPlugin.Get(ctx, req) res, err := kv.secretsPlugin.GetSecret(ctx, req)
if err != nil { if err != nil {
return "", false, err return "", false, err
} else if res.Error != "" { } else if res.UserFriendlyError != "" {
err = fmt.Errorf(res.Error) err = fmt.Errorf(res.UserFriendlyError)
} }
return res.DecryptedValue, res.Exists, err return res.DecryptedValue, res.Exists, err
@ -37,7 +37,7 @@ func (kv *secretsKVStorePlugin) Get(ctx context.Context, orgId int64, namespace
// Set an item in the store // Set an item in the store
func (kv *secretsKVStorePlugin) Set(ctx context.Context, orgId int64, namespace string, typ string, value string) error { func (kv *secretsKVStorePlugin) Set(ctx context.Context, orgId int64, namespace string, typ string, value string) error {
req := &smp.SecretsSetRequest{ req := &smp.SetSecretRequest{
KeyDescriptor: &smp.Key{ KeyDescriptor: &smp.Key{
OrgId: orgId, OrgId: orgId,
Namespace: namespace, Namespace: namespace,
@ -46,9 +46,9 @@ func (kv *secretsKVStorePlugin) Set(ctx context.Context, orgId int64, namespace
Value: value, Value: value,
} }
res, err := kv.secretsPlugin.Set(ctx, req) res, err := kv.secretsPlugin.SetSecret(ctx, req)
if err == nil && res.Error != "" { if err == nil && res.UserFriendlyError != "" {
err = fmt.Errorf(res.Error) err = fmt.Errorf(res.UserFriendlyError)
} }
return err return err
@ -56,7 +56,7 @@ func (kv *secretsKVStorePlugin) Set(ctx context.Context, orgId int64, namespace
// Del deletes an item from the store. // Del deletes an item from the store.
func (kv *secretsKVStorePlugin) Del(ctx context.Context, orgId int64, namespace string, typ string) error { func (kv *secretsKVStorePlugin) Del(ctx context.Context, orgId int64, namespace string, typ string) error {
req := &smp.SecretsDelRequest{ req := &smp.DeleteSecretRequest{
KeyDescriptor: &smp.Key{ KeyDescriptor: &smp.Key{
OrgId: orgId, OrgId: orgId,
Namespace: namespace, Namespace: namespace,
@ -64,9 +64,9 @@ func (kv *secretsKVStorePlugin) Del(ctx context.Context, orgId int64, namespace
}, },
} }
res, err := kv.secretsPlugin.Del(ctx, req) res, err := kv.secretsPlugin.DeleteSecret(ctx, req)
if err == nil && res.Error != "" { if err == nil && res.UserFriendlyError != "" {
err = fmt.Errorf(res.Error) err = fmt.Errorf(res.UserFriendlyError)
} }
return err return err
@ -75,7 +75,7 @@ func (kv *secretsKVStorePlugin) Del(ctx context.Context, orgId int64, namespace
// Keys get all keys for a given namespace. To query for all // Keys get all keys for a given namespace. To query for all
// organizations the constant 'kvstore.AllOrganizations' can be passed as orgId. // organizations the constant 'kvstore.AllOrganizations' can be passed as orgId.
func (kv *secretsKVStorePlugin) Keys(ctx context.Context, orgId int64, namespace string, typ string) ([]Key, error) { func (kv *secretsKVStorePlugin) Keys(ctx context.Context, orgId int64, namespace string, typ string) ([]Key, error) {
req := &smp.SecretsKeysRequest{ req := &smp.ListSecretsRequest{
KeyDescriptor: &smp.Key{ KeyDescriptor: &smp.Key{
OrgId: orgId, OrgId: orgId,
Namespace: namespace, Namespace: namespace,
@ -84,11 +84,11 @@ func (kv *secretsKVStorePlugin) Keys(ctx context.Context, orgId int64, namespace
AllOrganizations: orgId == AllOrganizations, AllOrganizations: orgId == AllOrganizations,
} }
res, err := kv.secretsPlugin.Keys(ctx, req) res, err := kv.secretsPlugin.ListSecrets(ctx, req)
if err != nil { if err != nil {
return nil, err return nil, err
} else if res.Error != "" { } else if res.UserFriendlyError != "" {
err = fmt.Errorf(res.Error) err = fmt.Errorf(res.UserFriendlyError)
} }
return parseKeys(res.Keys), err return parseKeys(res.Keys), err
@ -96,7 +96,7 @@ func (kv *secretsKVStorePlugin) Keys(ctx context.Context, orgId int64, namespace
// Rename an item in the store // Rename an item in the store
func (kv *secretsKVStorePlugin) Rename(ctx context.Context, orgId int64, namespace string, typ string, newNamespace string) error { func (kv *secretsKVStorePlugin) Rename(ctx context.Context, orgId int64, namespace string, typ string, newNamespace string) error {
req := &smp.SecretsRenameRequest{ req := &smp.RenameSecretRequest{
KeyDescriptor: &smp.Key{ KeyDescriptor: &smp.Key{
OrgId: orgId, OrgId: orgId,
Namespace: namespace, Namespace: namespace,
@ -105,9 +105,9 @@ func (kv *secretsKVStorePlugin) Rename(ctx context.Context, orgId int64, namespa
NewNamespace: newNamespace, NewNamespace: newNamespace,
} }
res, err := kv.secretsPlugin.Rename(ctx, req) res, err := kv.secretsPlugin.RenameSecret(ctx, req)
if err == nil && res.Error != "" { if err == nil && res.UserFriendlyError != "" {
err = fmt.Errorf(res.Error) err = fmt.Errorf(res.UserFriendlyError)
} }
return err return err

Write Preview
Loading…
Cancel
Save