Disable Identity from sweeper

Author: jotruon

oci/identity_compartment_test.go

@@ -7,10 +7,8 @@ import (
 	"fmt"
 	"regexp"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/oracle/oci-go-sdk/common"
 	oci_identity "github.com/oracle/oci-go-sdk/identity"
@@ -246,81 +244,3 @@ func testAccCheckIdentityCompartmentDestroy(s *terraform.State) error {
 
 	return nil
 }
-
-func init() {
-	if DependencyGraph == nil {
-		initDependencyGraph()
-	}
-	resource.AddTestSweepers("IdentityCompartment", &resource.Sweeper{
-		Name:         "IdentityCompartment",
-		Dependencies: DependencyGraph["compartment"],
-		F:            sweepIdentityCompartmentResource,
-	})
-}
-
-func sweepIdentityCompartmentResource(compartment string) error {
-	identityClient := GetTestClients(&schema.ResourceData{}).identityClient
-	compartmentIds, err := getCompartmentIds(compartment)
-	if err != nil {
-		return err
-	}
-	for _, compartmentId := range compartmentIds {
-		if ok := SweeperDefaultResourceId[compartmentId]; !ok {
-			deleteCompartmentRequest := oci_identity.DeleteCompartmentRequest{}
-
-			deleteCompartmentRequest.CompartmentId = &compartmentId
-
-			deleteCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(true, "identity")
-			_, error := identityClient.DeleteCompartment(context.Background(), deleteCompartmentRequest)
-			if error != nil {
-				fmt.Printf("Error deleting Compartment %s %s, It is possible that the resource is already deleted. Please verify manually \n", compartmentId, error)
-				continue
-			}
-			waitTillCondition(testAccProvider, &compartmentId, compartmentSweepWaitCondition, time.Duration(3*time.Minute),
-				compartmentSweepResponseFetchOperation, "identity", true)
-		}
-	}
-	return nil
-}
-
-func getCompartmentIds(compartment string) ([]string, error) {
-	ids := getResourceIdsToSweep(compartment, "CompartmentId")
-	if ids != nil {
-		return ids, nil
-	}
-	var resourceIds []string
-	compartmentId := compartment
-	identityClient := GetTestClients(&schema.ResourceData{}).identityClient
-
-	listCompartmentsRequest := oci_identity.ListCompartmentsRequest{}
-	listCompartmentsRequest.CompartmentId = &compartmentId
-	listCompartmentsResponse, err := identityClient.ListCompartments(context.Background(), listCompartmentsRequest)
-
-	if err != nil {
-		return resourceIds, fmt.Errorf("Error getting Compartment list for compartment id : %s , %s \n", compartmentId, err)
-	}
-	for _, compartment := range listCompartmentsResponse.Items {
-		id := *compartment.Id
-		resourceIds = append(resourceIds, id)
-		addResourceIdToSweeperResourceIdMap(compartmentId, "CompartmentId", id)
-	}
-	return resourceIds, nil
-}
-
-func compartmentSweepWaitCondition(response common.OCIOperationResponse) bool {
-	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
-	if compartmentResponse, ok := response.Response.(oci_identity.GetCompartmentResponse); ok {
-		return compartmentResponse.LifecycleState != oci_identity.CompartmentLifecycleStateDeleted
-	}
-	return false
-}
-
-func compartmentSweepResponseFetchOperation(client *OracleClients, resourceId *string, retryPolicy *common.RetryPolicy) error {
-	_, err := client.identityClient.GetCompartment(context.Background(), oci_identity.GetCompartmentRequest{
-		CompartmentId: resourceId,
-		RequestMetadata: common.RequestMetadata{
-			RetryPolicy: retryPolicy,
-		},
-	})
-	return err
-}

oci/identity_dynamic_group_test.go

@@ -7,10 +7,8 @@ import (
 	"fmt"
 	"regexp"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/oracle/oci-go-sdk/common"
 	oci_identity "github.com/oracle/oci-go-sdk/identity"
@@ -217,81 +215,3 @@ func testAccCheckIdentityDynamicGroupDestroy(s *terraform.State) error {
 
 	return nil
 }
-
-func init() {
-	if DependencyGraph == nil {
-		initDependencyGraph()
-	}
-	resource.AddTestSweepers("IdentityDynamicGroup", &resource.Sweeper{
-		Name:         "IdentityDynamicGroup",
-		Dependencies: DependencyGraph["dynamicGroup"],
-		F:            sweepIdentityDynamicGroupResource,
-	})
-}
-
-func sweepIdentityDynamicGroupResource(compartment string) error {
-	identityClient := GetTestClients(&schema.ResourceData{}).identityClient
-	dynamicGroupIds, err := getDynamicGroupIds(compartment)
-	if err != nil {
-		return err
-	}
-	for _, dynamicGroupId := range dynamicGroupIds {
-		if ok := SweeperDefaultResourceId[dynamicGroupId]; !ok {
-			deleteDynamicGroupRequest := oci_identity.DeleteDynamicGroupRequest{}
-
-			deleteDynamicGroupRequest.DynamicGroupId = &dynamicGroupId
-
-			deleteDynamicGroupRequest.RequestMetadata.RetryPolicy = getRetryPolicy(true, "identity")
-			_, error := identityClient.DeleteDynamicGroup(context.Background(), deleteDynamicGroupRequest)
-			if error != nil {
-				fmt.Printf("Error deleting DynamicGroup %s %s, It is possible that the resource is already deleted. Please verify manually \n", dynamicGroupId, error)
-				continue
-			}
-			waitTillCondition(testAccProvider, &dynamicGroupId, dynamicGroupSweepWaitCondition, time.Duration(3*time.Minute),
-				dynamicGroupSweepResponseFetchOperation, "identity", true)
-		}
-	}
-	return nil
-}
-
-func getDynamicGroupIds(compartment string) ([]string, error) {
-	ids := getResourceIdsToSweep(compartment, "DynamicGroupId")
-	if ids != nil {
-		return ids, nil
-	}
-	var resourceIds []string
-	compartmentId := compartment
-	identityClient := GetTestClients(&schema.ResourceData{}).identityClient
-
-	listDynamicGroupsRequest := oci_identity.ListDynamicGroupsRequest{}
-	listDynamicGroupsRequest.CompartmentId = &compartmentId
-	listDynamicGroupsResponse, err := identityClient.ListDynamicGroups(context.Background(), listDynamicGroupsRequest)
-
-	if err != nil {
-		return resourceIds, fmt.Errorf("Error getting DynamicGroup list for compartment id : %s , %s \n", compartmentId, err)
-	}
-	for _, dynamicGroup := range listDynamicGroupsResponse.Items {
-		id := *dynamicGroup.Id
-		resourceIds = append(resourceIds, id)
-		addResourceIdToSweeperResourceIdMap(compartmentId, "DynamicGroupId", id)
-	}
-	return resourceIds, nil
-}
-
-func dynamicGroupSweepWaitCondition(response common.OCIOperationResponse) bool {
-	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
-	if dynamicGroupResponse, ok := response.Response.(oci_identity.GetDynamicGroupResponse); ok {
-		return dynamicGroupResponse.LifecycleState != oci_identity.DynamicGroupLifecycleStateDeleted
-	}
-	return false
-}
-
-func dynamicGroupSweepResponseFetchOperation(client *OracleClients, resourceId *string, retryPolicy *common.RetryPolicy) error {
-	_, err := client.identityClient.GetDynamicGroup(context.Background(), oci_identity.GetDynamicGroupRequest{
-		DynamicGroupId: resourceId,
-		RequestMetadata: common.RequestMetadata{
-			RetryPolicy: retryPolicy,
-		},
-	})
-	return err
-}

oci/identity_group_test.go

@@ -6,10 +6,8 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/oracle/oci-go-sdk/common"
 	oci_identity "github.com/oracle/oci-go-sdk/identity"
@@ -228,81 +226,3 @@ func testAccCheckIdentityGroupDestroy(s *terraform.State) error {
 
 	return nil
 }
-
-func init() {
-	if DependencyGraph == nil {
-		initDependencyGraph()
-	}
-	resource.AddTestSweepers("IdentityGroup", &resource.Sweeper{
-		Name:         "IdentityGroup",
-		Dependencies: DependencyGraph["group"],
-		F:            sweepIdentityGroupResource,
-	})
-}
-
-func sweepIdentityGroupResource(compartment string) error {
-	identityClient := GetTestClients(&schema.ResourceData{}).identityClient
-	groupIds, err := getGroupIds(compartment)
-	if err != nil {
-		return err
-	}
-	for _, groupId := range groupIds {
-		if ok := SweeperDefaultResourceId[groupId]; !ok {
-			deleteGroupRequest := oci_identity.DeleteGroupRequest{}
-
-			deleteGroupRequest.GroupId = &groupId
-
-			deleteGroupRequest.RequestMetadata.RetryPolicy = getRetryPolicy(true, "identity")
-			_, error := identityClient.DeleteGroup(context.Background(), deleteGroupRequest)
-			if error != nil {
-				fmt.Printf("Error deleting Group %s %s, It is possible that the resource is already deleted. Please verify manually \n", groupId, error)
-				continue
-			}
-			waitTillCondition(testAccProvider, &groupId, groupSweepWaitCondition, time.Duration(3*time.Minute),
-				groupSweepResponseFetchOperation, "identity", true)
-		}
-	}
-	return nil
-}
-
-func getGroupIds(compartment string) ([]string, error) {
-	ids := getResourceIdsToSweep(compartment, "GroupId")
-	if ids != nil {
-		return ids, nil
-	}
-	var resourceIds []string
-	compartmentId := compartment
-	identityClient := GetTestClients(&schema.ResourceData{}).identityClient
-
-	listGroupsRequest := oci_identity.ListGroupsRequest{}
-	listGroupsRequest.CompartmentId = &compartmentId
-	listGroupsResponse, err := identityClient.ListGroups(context.Background(), listGroupsRequest)
-
-	if err != nil {
-		return resourceIds, fmt.Errorf("Error getting Group list for compartment id : %s , %s \n", compartmentId, err)
-	}
-	for _, group := range listGroupsResponse.Items {
-		id := *group.Id
-		resourceIds = append(resourceIds, id)
-		addResourceIdToSweeperResourceIdMap(compartmentId, "GroupId", id)
-	}
-	return resourceIds, nil
-}
-
-func groupSweepWaitCondition(response common.OCIOperationResponse) bool {
-	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
-	if groupResponse, ok := response.Response.(oci_identity.GetGroupResponse); ok {
-		return groupResponse.LifecycleState != oci_identity.GroupLifecycleStateDeleted
-	}
-	return false
-}
-
-func groupSweepResponseFetchOperation(client *OracleClients, resourceId *string, retryPolicy *common.RetryPolicy) error {
-	_, err := client.identityClient.GetGroup(context.Background(), oci_identity.GetGroupRequest{
-		GroupId: resourceId,
-		RequestMetadata: common.RequestMetadata{
-			RetryPolicy: retryPolicy,
-		},
-	})
-	return err
-}

oci/identity_policy_test.go

@@ -6,10 +6,8 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/oracle/oci-go-sdk/common"
 	oci_identity "github.com/oracle/oci-go-sdk/identity"
@@ -215,81 +213,3 @@ func testAccCheckIdentityPolicyDestroy(s *terraform.State) error {
 
 	return nil
 }
-
-func init() {
-	if DependencyGraph == nil {
-		initDependencyGraph()
-	}
-	resource.AddTestSweepers("IdentityPolicy", &resource.Sweeper{
-		Name:         "IdentityPolicy",
-		Dependencies: DependencyGraph["policy"],
-		F:            sweepIdentityPolicyResource,
-	})
-}
-
-func sweepIdentityPolicyResource(compartment string) error {
-	identityClient := GetTestClients(&schema.ResourceData{}).identityClient
-	policyIds, err := getPolicyIds(compartment)
-	if err != nil {
-		return err
-	}
-	for _, policyId := range policyIds {
-		if ok := SweeperDefaultResourceId[policyId]; !ok {
-			deletePolicyRequest := oci_identity.DeletePolicyRequest{}
-
-			deletePolicyRequest.PolicyId = &policyId
-
-			deletePolicyRequest.RequestMetadata.RetryPolicy = getRetryPolicy(true, "identity")
-			_, error := identityClient.DeletePolicy(context.Background(), deletePolicyRequest)
-			if error != nil {
-				fmt.Printf("Error deleting Policy %s %s, It is possible that the resource is already deleted. Please verify manually \n", policyId, error)
-				continue
-			}
-			waitTillCondition(testAccProvider, &policyId, policySweepWaitCondition, time.Duration(3*time.Minute),
-				policySweepResponseFetchOperation, "identity", true)
-		}
-	}
-	return nil
-}
-
-func getPolicyIds(compartment string) ([]string, error) {
-	ids := getResourceIdsToSweep(compartment, "PolicyId")
-	if ids != nil {
-		return ids, nil
-	}
-	var resourceIds []string
-	compartmentId := compartment
-	identityClient := GetTestClients(&schema.ResourceData{}).identityClient
-
-	listPoliciesRequest := oci_identity.ListPoliciesRequest{}
-	listPoliciesRequest.CompartmentId = &compartmentId
-	listPoliciesResponse, err := identityClient.ListPolicies(context.Background(), listPoliciesRequest)
-
-	if err != nil {
-		return resourceIds, fmt.Errorf("Error getting Policy list for compartment id : %s , %s \n", compartmentId, err)
-	}
-	for _, policy := range listPoliciesResponse.Items {
-		id := *policy.Id
-		resourceIds = append(resourceIds, id)
-		addResourceIdToSweeperResourceIdMap(compartmentId, "PolicyId", id)
-	}
-	return resourceIds, nil
-}
-
-func policySweepWaitCondition(response common.OCIOperationResponse) bool {
-	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
-	if policyResponse, ok := response.Response.(oci_identity.GetPolicyResponse); ok {
-		return policyResponse.LifecycleState != oci_identity.PolicyLifecycleStateDeleted
-	}
-	return false
-}
-
-func policySweepResponseFetchOperation(client *OracleClients, resourceId *string, retryPolicy *common.RetryPolicy) error {
-	_, err := client.identityClient.GetPolicy(context.Background(), oci_identity.GetPolicyRequest{
-		PolicyId: resourceId,
-		RequestMetadata: common.RequestMetadata{
-			RetryPolicy: retryPolicy,
-		},
-	})
-	return err
-}