From ff45daccfe96aa099a62b4e1448b54ed34a94846 Mon Sep 17 00:00:00 2001 From: Francis Chuang Date: Thu, 21 Mar 2024 15:26:33 +1100 Subject: [PATCH] Check role exists before deleting --- path_roles.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/path_roles.go b/path_roles.go index 8b61391..3076e51 100644 --- a/path_roles.go +++ b/path_roles.go @@ -296,7 +296,12 @@ func (b *grafanaBackend) pathRolesWrite(ctx context.Context, req *logical.Reques } func (b *grafanaBackend) pathRolesDelete(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) { - err := req.Storage.Delete(ctx, "roles/"+d.Get("name").(string)) + roleName := d.Get("role").(string) + if roleName == "" { + return logical.ErrorResponse("missing role"), nil + } + + err := req.Storage.Delete(ctx, "roles/"+roleName) if err != nil { return nil, fmt.Errorf("error deleting grafana role: %w", err) }