Skip to content

Commit ed3bcaa

Browse files
committed
Fix sweeper for Exadata Infrastructure
1 parent adc2daf commit ed3bcaa

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

oci/database_exadata_infrastructure_test.go

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -384,19 +384,25 @@ func getExadataInfrastructureIds(compartment string) ([]string, error) {
384384
var resourceIds []string
385385
compartmentId := compartment
386386
databaseClient := GetTestClients(&schema.ResourceData{}).databaseClient
387+
resourceStatesForDestroy := []oci_database.ExadataInfrastructureSummaryLifecycleStateEnum{
388+
oci_database.ExadataInfrastructureSummaryLifecycleStateRequiresActivation,
389+
oci_database.ExadataInfrastructureSummaryLifecycleStateActive,
390+
}
391+
for _, state := range resourceStatesForDestroy {
387392

388-
listExadataInfrastructuresRequest := oci_database.ListExadataInfrastructuresRequest{}
389-
listExadataInfrastructuresRequest.CompartmentId = &compartmentId
390-
listExadataInfrastructuresRequest.LifecycleState = oci_database.ExadataInfrastructureSummaryLifecycleStateRequiresActivation
391-
listExadataInfrastructuresResponse, err := databaseClient.ListExadataInfrastructures(context.Background(), listExadataInfrastructuresRequest)
393+
listExadataInfrastructuresRequest := oci_database.ListExadataInfrastructuresRequest{}
394+
listExadataInfrastructuresRequest.CompartmentId = &compartmentId
395+
listExadataInfrastructuresRequest.LifecycleState = state
396+
listExadataInfrastructuresResponse, err := databaseClient.ListExadataInfrastructures(context.Background(), listExadataInfrastructuresRequest)
392397

393-
if err != nil {
394-
return resourceIds, fmt.Errorf("Error getting ExadataInfrastructure list for compartment id : %s , %s \n", compartmentId, err)
395-
}
396-
for _, exadataInfrastructure := range listExadataInfrastructuresResponse.Items {
397-
id := *exadataInfrastructure.Id
398-
resourceIds = append(resourceIds, id)
399-
addResourceIdToSweeperResourceIdMap(compartmentId, "ExadataInfrastructureId", id)
398+
if err != nil {
399+
return resourceIds, fmt.Errorf("Error getting ExadataInfrastructure list for compartment id : %s , %s \n", compartmentId, err)
400+
}
401+
for _, exadataInfrastructure := range listExadataInfrastructuresResponse.Items {
402+
id := *exadataInfrastructure.Id
403+
resourceIds = append(resourceIds, id)
404+
addResourceIdToSweeperResourceIdMap(compartmentId, "ExadataInfrastructureId", id)
405+
}
400406
}
401407
return resourceIds, nil
402408
}

0 commit comments

Comments
 (0)