zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-08 23:20:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored DeleteSecret.

Browse Source
This commit is contained in:
Aleksandr Melnikov
2020-02-06 14:37:43 -08:00
parent f0265caf85
commit f99260fa93
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kube/secret.go
View File

@@ -64,12 +64,8 @@ func (c *Client) ListSecrets(namespace string) (secrets []*model.Secret, err err
return return
} }
func (c *Client) DeleteSecret(namespace string, name string) (deleted bool, err error) { func (c *Client) DeleteSecret(namespace string, secret *model.Secret) (err error) {
err = c.CoreV1().Secrets(namespace).Delete(name, &metav1.DeleteOptions{}) return c.CoreV1().Secrets(namespace).Delete(secret.Name, &metav1.DeleteOptions{})
if err != nil {
return false, err
}
return true, nil
} }
func (c *Client) DeleteSecretKey(namespace string, name string, key string) (deleted bool, err error) { func (c *Client) DeleteSecretKey(namespace string, name string, key string) (deleted bool, err error) {

9
manager/secret_manager.go
View File

@@ -70,7 +70,14 @@ func (r *ResourceManager) ListSecrets(namespace string) (secrets []*model.Secret
} }
func (r *ResourceManager) DeleteSecret(namespace string, name string) (deleted bool, err error) { func (r *ResourceManager) DeleteSecret(namespace string, name string) (deleted bool, err error) {
return r.kubeClient.DeleteSecret(namespace, name) secret := &model.Secret{
Name: name,
}
err = r.kubeClient.DeleteSecret(namespace, secret)
if err != nil {
return false, util.NewUserError(codes.Unknown, "Secret unable to be deleted.")
}
return true, nil
} }
func (r *ResourceManager) DeleteSecretKey(namespace string, name string, key string) (deleted bool, err error) { func (r *ResourceManager) DeleteSecretKey(namespace string, name string, key string) (deleted bool, err error) {

4
server/secret_server.go
View File

@@ -79,10 +79,10 @@ func (s *SecretServer) ListSecrets(ctx context.Context, req *api.ListSecretsRequ
func (s *SecretServer) DeleteSecret(ctx context.Context, req *api.DeleteSecretRequest) (deleted *api.DeleteSecretResponse, err error) { func (s *SecretServer) DeleteSecret(ctx context.Context, req *api.DeleteSecretRequest) (deleted *api.DeleteSecretResponse, err error) {
var isDeleted bool var isDeleted bool
isDeleted, err = s.resourceManager.DeleteSecret(req.Namespace, req.Name) isDeleted, err = s.resourceManager.DeleteSecret(req.Namespace, req.Name)
if err != nil { if errors.As(err, &userError) {
return &api.DeleteSecretResponse{ return &api.DeleteSecretResponse{
Deleted: false, Deleted: false,
}, util.NewUserError(codes.Unknown, err.Error()) }, userError.GRPCError()
} }
return &api.DeleteSecretResponse{ return &api.DeleteSecretResponse{
Deleted: isDeleted, Deleted: isDeleted,