Skip to content

Commit

Permalink
RBAC: Fix role assignment destruction (#667)
Browse files Browse the repository at this point in the history
* fix role assignment destruction
  • Loading branch information
IevaVasiljeva committed Sep 23, 2022
1 parent f487ec3 commit c484239
Showing 1 changed file with 19 additions and 6 deletions.
25 changes: 19 additions & 6 deletions grafana/resource_role_assignment.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func ResourceRoleAssignment() *schema.Resource {
CreateContext: UpdateRoleAssignments,
UpdateContext: UpdateRoleAssignments,
ReadContext: ReadRoleAssignments,
DeleteContext: UpdateRoleAssignments,
DeleteContext: DeleteRoleAssignments,
Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},
Expand Down Expand Up @@ -102,16 +102,29 @@ func UpdateRoleAssignments(ctx context.Context, d *schema.ResourceData, meta int
Teams: teams,
ServiceAccounts: serviceAccounts,
}
assignments, err := client.UpdateRoleAssignments(ra)
if err != nil {
if _, err := client.UpdateRoleAssignments(ra); err != nil {
return diag.FromErr(err)
}

if err := setRoleAssignments(assignments, d); err != nil {
return diag.FromErr(err)
d.SetId(uid)
return ReadRoleAssignments(ctx, d, meta)
}

func DeleteRoleAssignments(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
client := meta.(*client).gapi

uid := d.Get("role_uid").(string)
ra := &gapi.RoleAssignments{
RoleUID: uid,
Users: []int{},
Teams: []int{},
ServiceAccounts: []int{},
}

return ReadRoleAssignments(ctx, d, meta)
if _, err := client.UpdateRoleAssignments(ra); err != nil {
return diag.FromErr(err)
}
return nil
}

func setRoleAssignments(assignments *gapi.RoleAssignments, d *schema.ResourceData) error {
Expand Down

0 comments on commit c484239

Please sign in to comment.