checkDestroy

mongodb · Mar 26, 2024 · 4de6c61 · 4de6c61
1 parent 448f5be
commit 4de6c61
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/internal/service/auditing/resource_auditing_migration_test.go b/internal/service/auditing/resource_auditing_migration_test.go
@@ -9,12 +9,11 @@ import (
 
 func TestMigGenericAuditing_basic(t *testing.T) {
 	var (
-		resourceName = "mongodbatlas_auditing.test"
-		projectID    = mig.ProjectIDGlobal(t)
-		auditAuth    = true
-		auditFilter  = "{ 'atype': 'authenticate', 'param': {   'user': 'auditAdmin',   'db': 'admin',   'mechanism': 'SCRAM-SHA-1' }}"
-		enabled      = true
-		config       = configBasic(projectID, auditFilter, auditAuth, enabled)
+		projectID   = mig.ProjectIDGlobal(t)
+		auditAuth   = true
+		auditFilter = "{ 'atype': 'authenticate', 'param': {   'user': 'auditAdmin',   'db': 'admin',   'mechanism': 'SCRAM-SHA-1' }}"
+		enabled     = true
+		config      = configBasic(projectID, auditFilter, auditAuth, enabled)
 	)
 
 	resource.ParallelTest(t, resource.TestCase{

diff --git a/internal/service/auditing/resource_auditing_test.go b/internal/service/auditing/resource_auditing_test.go
@@ -91,15 +91,12 @@ func checkExists(resourceName string) resource.TestCheckFunc {
 }
 
 func checkDestroy(s *terraform.State) error {
-	if acc.UsingLocalResources() {
-		return nil
-	}
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "mongodbatlas_auditing" {
 			continue
 		}
 		auditingRes, _, _ := acc.ConnV2().AuditingApi.GetAuditingConfiguration(context.Background(), rs.Primary.ID).Execute()
-		if auditingRes != nil {
+		if auditingRes.GetEnabled() {
 			return fmt.Errorf("auditing (%s) exists", rs.Primary.ID)
 		}
 	}

diff --git a/internal/service/cloudbackupschedule/resource_cloud_backup_schedule_test.go b/internal/service/cloudbackupschedule/resource_cloud_backup_schedule_test.go
@@ -401,7 +401,7 @@ func checkExists(resourceName string) resource.TestCheckFunc {
 }
 
 func checkDestroy(s *terraform.State) error {
-	if acc.UsingLocalResources() {
+	if acc.ExistingClusterUsed() {
 		return nil
 	}
 	for _, rs := range s.RootModule().Resources {

diff --git a/internal/service/cloudbackupsnapshot/resource_cloud_backup_snapshot_test.go b/internal/service/cloudbackupsnapshot/resource_cloud_backup_snapshot_test.go
@@ -121,7 +121,7 @@ func checkExists(resourceName string) resource.TestCheckFunc {
 }
 
 func checkDestroy(s *terraform.State) error {
-	if acc.UsingLocalResources() {
+	if acc.ExistingClusterUsed() {
 		return nil
 	}
 	for _, rs := range s.RootModule().Resources {

diff --git a/internal/testutil/acc/cluster.go b/internal/testutil/acc/cluster.go
@@ -80,9 +80,8 @@ func GetClusterInfo(tb testing.TB, req *ClusterRequest) ClusterInfo {
 	}
 }
 
-// UsingLocalResources is normally used in CheckDestroy when an existing project or cluster is used in local.
-func UsingLocalResources() bool {
+func ExistingClusterUsed() bool {
 	clusterName := os.Getenv("MONGODB_ATLAS_CLUSTER_NAME")
 	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
-	return clusterName != "" || projectID != ""
+	return clusterName != "" && projectID != ""
 }
diff --git a/internal/testutil/acc/search_index.go b/internal/testutil/acc/search_index.go
@@ -9,7 +9,7 @@ import (
 )
 
 func CheckDestroySearchIndex(state *terraform.State) error {
-	if UsingLocalResources() {
+	if ExistingClusterUsed() {
 		return nil
 	}
 	for _, rs := range state.RootModule().Resources {