test: fix migration test to use package clusterRequest (with correct …

…region)
mongodb · Jul 12, 2024 · 7051cbf · 7051cbf
1 parent a23a2a9
commit 7051cbf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/internal/service/onlinearchive/resource_online_archive_migration_test.go b/internal/service/onlinearchive/resource_online_archive_migration_test.go
@@ -12,19 +12,12 @@ import (
 func TestMigBackupRSOnlineArchiveWithNoChangeBetweenVersions(t *testing.T) {
 	var (
 		onlineArchiveResourceName = "mongodbatlas_online_archive.users_archive"
-		clusterInfo               = acc.GetClusterInfo(t, &acc.ClusterRequest{
-			ReplicationSpecs: []acc.ReplicationSpecRequest{
-				{AutoScalingDiskGbEnabled: true},
-			},
-			Tags: map[string]string{
-				"ArchiveTest": "true", "Owner": "test",
-			},
-		})
-		clusterName          = clusterInfo.ClusterName
-		projectID            = clusterInfo.ProjectID
-		clusterTerraformStr  = clusterInfo.ClusterTerraformStr
-		clusterResourceName  = clusterInfo.ClusterResourceName
-		deleteExpirationDays = 0
+		clusterInfo               = acc.GetClusterInfo(t, &clusterRequest)
+		clusterName               = clusterInfo.ClusterName
+		projectID                 = clusterInfo.ProjectID
+		clusterTerraformStr       = clusterInfo.ClusterTerraformStr
+		clusterResourceName       = clusterInfo.ClusterResourceName
+		deleteExpirationDays      = 0
 	)
 	if mig.IsProviderVersionAtLeast("1.12.2") {
 		deleteExpirationDays = 7

diff --git a/internal/service/onlinearchive/resource_online_archive_test.go b/internal/service/onlinearchive/resource_online_archive_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"regexp"
-	"strings"
 	"testing"
 	"time"
 
@@ -38,12 +37,6 @@ func TestAccBackupRSOnlineArchive(t *testing.T) {
 		clusterResourceName          = clusterInfo.ClusterResourceName
 	)
 
-	config1 := clusterTerraformStr
-	config2 := configWithDailySchedule(clusterTerraformStr, clusterResourceName, 1, 7)
-	config3 := configWithDailySchedule(clusterTerraformStr, clusterResourceName, 2, 8)
-	if config1 != config2 {
-		t.Fatal(strings.Join([]string{config1, "\n#CONFIG2\n", config2, "\n#CONFIG3\n", config3}, "\n"))
-	}
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { acc.PreCheckBasic(t) },
 		ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
@@ -56,7 +49,7 @@ func TestAccBackupRSOnlineArchive(t *testing.T) {
 				),
 			},
 			{
-				Config: config2,
+				Config: configWithDailySchedule(clusterTerraformStr, clusterResourceName, 1, 7),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(onlineArchiveResourceName, "state"),
 					resource.TestCheckResourceAttrSet(onlineArchiveResourceName, "archive_id"),
@@ -72,7 +65,7 @@ func TestAccBackupRSOnlineArchive(t *testing.T) {
 				),
 			},
 			{
-				Config: config3,
+				Config: configWithDailySchedule(clusterTerraformStr, clusterResourceName, 2, 8),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(onlineArchiveResourceName, "state"),
 					resource.TestCheckResourceAttrSet(onlineArchiveResourceName, "archive_id"),