Skip to content

Deactivate app before deletion in identity_domains #2469

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

Deactivate app before deletion in identity_domains #2469

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
41 changes: 39 additions & 2 deletions internal/service/identity_domains/identity_domains_app_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"net/url"
"regexp"
"strings"

"github.com/oracle/terraform-provider-oci/internal/utils"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -4490,10 +4489,48 @@ func (s *IdentityDomainsAppResourceCrud) Delete() error {
tmp := resourceTypeSchemaVersion.(string)
request.ResourceTypeSchemaVersion = &tmp
}
// ALWAYS DEACTIVATE BEFORE DELETE
log.Printf("[INFO] Ensuring app %s is deactivated before deletion", *request.AppId)

// Get current app state
getRequest := oci_identity_domains.GetAppRequest{
AppId: request.AppId,
}
getRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "identity_domains")

getResponse, err := s.Client.GetApp(context.Background(), getRequest)
if err != nil {
log.Printf("[WARN] Could not retrieve app for deactivation check: %v", err)
// Continue with delete attempt anyway
} else if getResponse.App.Active != nil && *getResponse.App.Active {
// App is active, deactivate it using PUT
log.Printf("[INFO] App is active, deactivating now...")

appToUpdate := getResponse.App
activeFalse := false
appToUpdate.Active = &activeFalse

putRequest := oci_identity_domains.PutAppRequest{
AppId: request.AppId,
App: appToUpdate,
}
putRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "identity_domains")

_, putErr := s.Client.PutApp(context.Background(), putRequest)
if putErr != nil {
log.Printf("[ERROR] Failed to deactivate app before deletion: %v", putErr)
return fmt.Errorf("failed to deactivate app before deletion: %w", putErr)
}

log.Printf("[INFO] App deactivated successfully")
} else {
log.Printf("[INFO] App is already inactive, proceeding with deletion")
}
// NOW DELETE THE APP
log.Printf("[INFO] Deleting app %s", *request.AppId)
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "identity_domains")

_, err := s.Client.DeleteApp(context.Background(), request)
_, err = s.Client.DeleteApp(context.Background(), request)
return err
}

Expand Down