Setting deterministic encoding id output, just sorting the keys (#303)

leofigy · web-flow · commit c2e1d5101596 · 2020-09-16T09:10:34.000-05:00
* order to generate the same sequence for encodedID

* remove skipImportTest
diff --git a/mongodbatlas/provider.go b/mongodbatlas/provider.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"reflect"
+	"sort"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -102,8 +103,16 @@ func encodeStateID(values map[string]string) string {
 	encode := func(e string) string { return base64.StdEncoding.EncodeToString([]byte(e)) }
 	encodedValues := make([]string, 0)
 
-	for key, value := range values {
-		encodedValues = append(encodedValues, fmt.Sprintf("%s:%s", encode(key), encode(value)))
+	// sort to make sure the same encoding is returned in case of same input
+	keys := make([]string, 0, len(values))
+	for key := range values {
+		keys = append(keys, key)
+	}
+
+	sort.Strings(keys)
+
+	for _, key := range keys {
+		encodedValues = append(encodedValues, fmt.Sprintf("%s:%s", encode(key), encode(values[key])))
 	}
 
 	return strings.Join(encodedValues, "-")
diff --git a/mongodbatlas/provider_test.go b/mongodbatlas/provider_test.go
@@ -161,10 +161,3 @@ func checkTeamsIds(t *testing.T) {
 		t.Fatal("`MONGODB_ATLAS_TEAMS_IDS` must be set for Projects acceptance testing")
 	}
 }
-
-// SkipTestImport temporary solution to avoid error about failed verification, will solve later
-func SkipTestImport(t *testing.T) {
-	if strings.EqualFold(os.Getenv("SKIP_TEST_IMPORT"), "true") {
-		t.Skip()
-	}
-}
diff --git a/mongodbatlas/resource_mongodbatlas_alert_configuration_test.go b/mongodbatlas/resource_mongodbatlas_alert_configuration_test.go
@@ -212,7 +212,6 @@ func TestAccResourceMongoDBAtlasAlertConfiguration_whitoutRoles(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasAlertConfiguration_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		projectID    = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
 		resourceName = "mongodbatlas_alert_configuration.test"
@@ -238,7 +237,6 @@ func TestAccResourceMongoDBAtlasAlertConfiguration_importBasic(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasAlertConfiguration_importConfigNotifications(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		projectID    = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
 		resourceName = "mongodbatlas_alert_configuration.test"
diff --git a/mongodbatlas/resource_mongodbatlas_auditing_test.go b/mongodbatlas/resource_mongodbatlas_auditing_test.go
@@ -64,7 +64,6 @@ func TestAccResourceMongoDBAtlasAuditing_basic(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasAuditing_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		auditing     = &matlas.Auditing{}
 		resourceName = "mongodbatlas_auditing.test"
diff --git a/mongodbatlas/resource_mongodbatlas_cloud_provider_snapshot_backup_policy_test.go b/mongodbatlas/resource_mongodbatlas_cloud_provider_snapshot_backup_policy_test.go
@@ -103,7 +103,6 @@ func TestAccResourceMongoDBAtlasCloudProviderSnapshotBackupPolicy_withoutRestore
 }
 
 func TestAccResourceMongoDBAtlasCloudProviderSnapshotBackupPolicy_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		resourceName = "mongodbatlas_cloud_provider_snapshot_backup_policy.test"
 		projectID    = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
diff --git a/mongodbatlas/resource_mongodbatlas_cloud_provider_snapshot_restore_job_test.go b/mongodbatlas/resource_mongodbatlas_cloud_provider_snapshot_restore_job_test.go
@@ -52,7 +52,6 @@ func TestAccResourceMongoDBAtlasCloudProviderSnapshotRestoreJob_basic(t *testing
 }
 
 func TestAccResourceMongoDBAtlasCloudProviderSnapshotRestoreJob_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		resourceName      = "mongodbatlas_cloud_provider_snapshot_restore_job.test"
 		projectID         = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
diff --git a/mongodbatlas/resource_mongodbatlas_cloud_provider_snapshot_test.go b/mongodbatlas/resource_mongodbatlas_cloud_provider_snapshot_test.go
@@ -45,7 +45,6 @@ func TestAccResourceMongoDBAtlasCloudProviderSnapshot_basic(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasCloudProviderSnapshot_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		resourceName    = "mongodbatlas_cloud_provider_snapshot.test"
 		projectID       = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
diff --git a/mongodbatlas/resource_mongodbatlas_cluster_test.go b/mongodbatlas/resource_mongodbatlas_cluster_test.go
@@ -765,7 +765,6 @@ func TestAccResourceMongoDBAtlasCluster_withAutoScalingAWS(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasCluster_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		resourceName = "mongodbatlas_cluster.test"
 		projectID    = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
diff --git a/mongodbatlas/resource_mongodbatlas_custom_db_role_test.go b/mongodbatlas/resource_mongodbatlas_custom_db_role_test.go
@@ -450,7 +450,6 @@ func TestAccResourceMongoDBAtlasCustomDBRoles_MultipleResources(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasCustomDBRoles_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		resourceName = "mongodbatlas_custom_db_role.test"
 		projectID    = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
diff --git a/mongodbatlas/resource_mongodbatlas_database_user_test.go b/mongodbatlas/resource_mongodbatlas_database_user_test.go
@@ -292,7 +292,6 @@ func TestAccResourceMongoDBAtlasDatabaseUser_withRoles(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasDatabaseUser_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		username     = fmt.Sprintf("test-username-%s", acctest.RandString(5))
 		resourceName = "mongodbatlas_database_user.basic_ds"
@@ -327,7 +326,6 @@ func TestAccResourceMongoDBAtlasDatabaseUser_importBasic(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasDatabaseUser_importX509TypeCustomer(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		dbUser       matlas.DatabaseUser
 		resourceName = "mongodbatlas_database_user.test"
diff --git a/mongodbatlas/resource_mongodbatlas_global_cluster_config_test.go b/mongodbatlas/resource_mongodbatlas_global_cluster_config_test.go
@@ -74,7 +74,6 @@ func TestAccResourceMongoDBAtlasGlobalCluster_WithAWSCluster(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasGlobalCluster_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		resourceName = "mongodbatlas_global_cluster_config.config"
 		projectID    = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
diff --git a/mongodbatlas/resource_mongodbatlas_maintenance_window_test.go b/mongodbatlas/resource_mongodbatlas_maintenance_window_test.go
@@ -65,7 +65,6 @@ func TestAccResourceMongoDBAtlasMaintenanceWindow_basic(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasMaintenanceWindow_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		maintenance  matlas.MaintenanceWindow
 		resourceName = "mongodbatlas_maintenance_window.test"
diff --git a/mongodbatlas/resource_mongodbatlas_network_container_test.go b/mongodbatlas/resource_mongodbatlas_network_container_test.go
@@ -140,7 +140,6 @@ func TestAccResourceMongoDBAtlasNetworkContainer_basicGCP(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasNetworkContainer_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		randInt      = acctest.RandIntRange(0, 255)
 		resourceName = "mongodbatlas_network_container.test"
diff --git a/mongodbatlas/resource_mongodbatlas_project_ip_whitelist_test.go b/mongodbatlas/resource_mongodbatlas_project_ip_whitelist_test.go
@@ -202,7 +202,6 @@ func TestAccResourceMongoDBAtlasProjectIPWhitelist_SettingMultiple(t *testing.T)
 }
 
 func TestAccResourceMongoDBAtlasProjectIPWhitelist_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
 	ipAddress := fmt.Sprintf("179.154.226.%d", acctest.RandIntRange(0, 255))
 	comment := fmt.Sprintf("TestAcc for ipaddres (%s)", ipAddress)
diff --git a/mongodbatlas/resource_mongodbatlas_project_test.go b/mongodbatlas/resource_mongodbatlas_project_test.go
@@ -152,7 +152,6 @@ func TestAccResourceMongoDBAtlasProject_withUpdatedRole(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasProject_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		projectName  = fmt.Sprintf("test-acc-%s", acctest.RandString(10))
 		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
diff --git a/mongodbatlas/resource_mongodbatlas_team_test.go b/mongodbatlas/resource_mongodbatlas_team_test.go
@@ -80,7 +80,6 @@ func TestAccResourceMongoDBAtlasTeam_basic(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasTeam_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		resourceName = "mongodbatlas_teams.test"
 		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
diff --git a/mongodbatlas/resource_mongodbatlas_x509_authentication_database_user_test.go b/mongodbatlas/resource_mongodbatlas_x509_authentication_database_user_test.go
@@ -88,7 +88,6 @@ func TestAccResourceMongoDBAtlasX509AuthDBUser_WithCustomerX509(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasX509AuthDBUser_importBasic(t *testing.T) {
-	SkipTestImport(t)
 	var (
 		resourceName = "mongodbatlas_x509_authentication_database_user.test"
 		username     = os.Getenv("MONGODB_ATLAS_DB_USERNAME")

Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,3 @@ func checkTeamsIds(t *testing.T) {`
`161`	`161`	t.Fatal("`MONGODB_ATLAS_TEAMS_IDS` must be set for Projects acceptance testing")
`162`	`162`	`}`
`163`	`163`	`}`
`164`		`-`
`165`		`-// SkipTestImport temporary solution to avoid error about failed verification, will solve later`
`166`		`-func SkipTestImport(t *testing.T) {`
`167`		`- if strings.EqualFold(os.Getenv("SKIP_TEST_IMPORT"), "true") {`
`168`		`- t.Skip()`
`169`		`- }`
`170`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,6 @@ func TestAccResourceMongoDBAtlasAlertConfiguration_whitoutRoles(t *testing.T) {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`func TestAccResourceMongoDBAtlasAlertConfiguration_importBasic(t *testing.T) {`
`215`		`- SkipTestImport(t)`
`216`	`215`	`var (`
`217`	`216`	`projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")`
`218`	`217`	`resourceName = "mongodbatlas_alert_configuration.test"`
`@@ -238,7 +237,6 @@ func TestAccResourceMongoDBAtlasAlertConfiguration_importBasic(t *testing.T) {`
`238`	`237`	`}`
`239`	`238`
`240`	`239`	`func TestAccResourceMongoDBAtlasAlertConfiguration_importConfigNotifications(t *testing.T) {`
`241`		`- SkipTestImport(t)`
`242`	`240`	`var (`
`243`	`241`	`projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")`
`244`	`242`	`resourceName = "mongodbatlas_alert_configuration.test"`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ func TestAccResourceMongoDBAtlasAuditing_basic(t *testing.T) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func TestAccResourceMongoDBAtlasAuditing_importBasic(t *testing.T) {`
`67`		`- SkipTestImport(t)`
`68`	`67`	`var (`
`69`	`68`	`auditing = &matlas.Auditing{}`
`70`	`69`	`resourceName = "mongodbatlas_auditing.test"`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ func TestAccResourceMongoDBAtlasCloudProviderSnapshotBackupPolicy_withoutRestore`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`func TestAccResourceMongoDBAtlasCloudProviderSnapshotBackupPolicy_importBasic(t *testing.T) {`
`106`		`- SkipTestImport(t)`
`107`	`106`	`var (`
`108`	`107`	`resourceName = "mongodbatlas_cloud_provider_snapshot_backup_policy.test"`
`109`	`108`	`projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ func TestAccResourceMongoDBAtlasCloudProviderSnapshotRestoreJob_basic(t *testing`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`func TestAccResourceMongoDBAtlasCloudProviderSnapshotRestoreJob_importBasic(t *testing.T) {`
`55`		`- SkipTestImport(t)`
`56`	`55`	`var (`
`57`	`56`	`resourceName = "mongodbatlas_cloud_provider_snapshot_restore_job.test"`
`58`	`57`	`projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ func TestAccResourceMongoDBAtlasCloudProviderSnapshot_basic(t *testing.T) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func TestAccResourceMongoDBAtlasCloudProviderSnapshot_importBasic(t *testing.T) {`
`48`		`- SkipTestImport(t)`
`49`	`48`	`var (`
`50`	`49`	`resourceName = "mongodbatlas_cloud_provider_snapshot.test"`
`51`	`50`	`projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")`
Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,6 @@ func TestAccResourceMongoDBAtlasCluster_withAutoScalingAWS(t *testing.T) {`
`765`	`765`	`}`
`766`	`766`
`767`	`767`	`func TestAccResourceMongoDBAtlasCluster_importBasic(t *testing.T) {`
`768`		`- SkipTestImport(t)`
`769`	`768`	`var (`
`770`	`769`	`resourceName = "mongodbatlas_cluster.test"`
`771`	`770`	`projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")`
Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,6 @@ func TestAccResourceMongoDBAtlasCustomDBRoles_MultipleResources(t *testing.T) {`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`func TestAccResourceMongoDBAtlasCustomDBRoles_importBasic(t *testing.T) {`
`453`		`- SkipTestImport(t)`
`454`	`453`	`var (`
`455`	`454`	`resourceName = "mongodbatlas_custom_db_role.test"`
`456`	`455`	`projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,6 @@ func TestAccResourceMongoDBAtlasDatabaseUser_withRoles(t *testing.T) {`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`func TestAccResourceMongoDBAtlasDatabaseUser_importBasic(t *testing.T) {`
`295`		`- SkipTestImport(t)`
`296`	`295`	`var (`
`297`	`296`	`username = fmt.Sprintf("test-username-%s", acctest.RandString(5))`
`298`	`297`	`resourceName = "mongodbatlas_database_user.basic_ds"`
`@@ -327,7 +326,6 @@ func TestAccResourceMongoDBAtlasDatabaseUser_importBasic(t *testing.T) {`
`327`	`326`	`}`
`328`	`327`
`329`	`328`	`func TestAccResourceMongoDBAtlasDatabaseUser_importX509TypeCustomer(t *testing.T) {`
`330`		`- SkipTestImport(t)`
`331`	`329`	`var (`
`332`	`330`	`dbUser matlas.DatabaseUser`
`333`	`331`	`resourceName = "mongodbatlas_database_user.test"`