Skip to content

Fix identity domain destruction by deactivating the identity domain before deletion #1782

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix identity domain destruction by deactivating the identity domain before deletion #1782

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
35 changes: 28 additions & 7 deletions internal/service/identity/identity_domain_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,21 +590,42 @@ func (s *IdentityDomainResourceCrud) Update() error {
}

func (s *IdentityDomainResourceCrud) Delete() error {
request := oci_identity.DeleteDomainRequest{}

tmp := s.D.Id()
request.DomainId = &tmp

request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "identity")
deactivateRequest := oci_identity.DeactivateDomainRequest{}

deactivateRequest.DomainId = &tmp

deactivateRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "identity")

response, err := s.Client.DeleteDomain(context.Background(), request)
deactivateResponse, err := s.Client.DeactivateDomain(context.Background(), deactivateRequest)
if err != nil {
return err
}

workId := response.OpcWorkRequestId
deactivateWorkId := deactivateResponse.OpcWorkRequestId
// Wait until it finishes
_, deactivateWorkRequestErr := domainWaitForWorkRequest(deactivateWorkId, "domain",
oci_identity.IamWorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.Client)

if deactivateWorkRequestErr != nil {
return deactivateWorkRequestErr
}

deleteRequest := oci_identity.DeleteDomainRequest{}

deleteRequest.DomainId = &tmp

deleteRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "identity")

deleteResponse, err := s.Client.DeleteDomain(context.Background(), deleteRequest)
if err != nil {
return err
}

deleteWorkId := deleteResponse.OpcWorkRequestId
// Wait until it finishes
_, delWorkRequestErr := domainWaitForWorkRequest(workId, "domain",
_, delWorkRequestErr := domainWaitForWorkRequest(deleteWorkId, "domain",
oci_identity.IamWorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.Client)
return delWorkRequestErr
}
Expand Down