Skip to content

Commit 60dd150

Browse files
author
jiangong
committed
handle unavailable state removal of autonomous datasource
1 parent fe117aa commit 60dd150

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

oci/database_autonomous_database_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,16 +579,19 @@ func getAutonomousDatabaseIds(compartment string) ([]string, error) {
579579

580580
listAutonomousDatabasesRequest := oci_database.ListAutonomousDatabasesRequest{}
581581
listAutonomousDatabasesRequest.CompartmentId = &compartmentId
582-
listAutonomousDatabasesRequest.LifecycleState = oci_database.AutonomousDatabaseSummaryLifecycleStateAvailable
583582
listAutonomousDatabasesResponse, err := databaseClient.ListAutonomousDatabases(context.Background(), listAutonomousDatabasesRequest)
584583

585584
if err != nil {
586585
return resourceIds, fmt.Errorf("Error getting AutonomousDatabase list for compartment id : %s , %s \n", compartmentId, err)
587586
}
588587
for _, autonomousDatabase := range listAutonomousDatabasesResponse.Items {
589-
id := *autonomousDatabase.Id
590-
resourceIds = append(resourceIds, id)
591-
addResourceIdToSweeperResourceIdMap(compartmentId, "AutonomousDatabaseId", id)
588+
// if autonomousDatabase is in unavailable state, it also needs to be deleted, otherwise other resources which has dependency on it can not be deleted.
589+
if autonomousDatabase.LifecycleState == oci_database.AutonomousDatabaseSummaryLifecycleStateAvailable ||
590+
autonomousDatabase.LifecycleState == oci_database.AutonomousDatabaseSummaryLifecycleStateUnavailable {
591+
id := *autonomousDatabase.Id
592+
resourceIds = append(resourceIds, id)
593+
addResourceIdToSweeperResourceIdMap(compartmentId, "AutonomousDatabaseId", id)
594+
}
592595
}
593596
return resourceIds, nil
594597
}

0 commit comments

Comments
 (0)