Skip to content

fix(push_group): save state after deactivating during delete #2904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exitcode0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(push_group): save state after deactivating during delete #2904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions okta/services/idaas/resource_okta_push_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,23 @@ func (r *pushGroupResource) Delete(ctx context.Context, req resource.DeleteReque
Status: "INACTIVE",
}).Execute()
if err != nil {
resp.Diagnostics.AddError("failed to delete push group mapping: ", err.Error())
resp.Diagnostics.AddError("failed to deactivate push group mapping before delete: ", err.Error())
return
}

// The mapping has stopped pushing group membership downstream, so record the
// new status before attempting the delete. State written during Delete is
// preserved when error diagnostics are returned and discarded when Delete
// succeeds, so this keeps state accurate if the delete below fails.
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("status"), "INACTIVE")...)
if resp.Diagnostics.HasError() {
return
}
}

_, err := r.config.OktaIDaaSClient.OktaSDKClientV6().GroupPushMappingAPI.DeleteGroupPushMapping(ctx, state.AppId.ValueString(), state.ID.ValueString()).DeleteTargetGroup(state.DeleteTargetGroupOnDestroy.ValueBool()).Execute()
if err != nil {
resp.Diagnostics.AddError("failed to delete push group mapping: ", err.Error())
resp.Diagnostics.AddError("failed to delete push group mapping: ", fmt.Sprintf("the mapping is INACTIVE and is no longer pushing group membership to the downstream application, but it could not be deleted: %s", err.Error()))
return
}
}
Expand Down