Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fixes migration tests for backup_online_archive #1724

Merged
merged 17 commits into from
Dec 7, 2023
Merged

fix: Fixes migration tests for backup_online_archive #1724

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7d004a8
data_expiration_rule blocked if days > 0
lantoli Dec 7, 2023
8d2d01d
create mig package
lantoli Dec 7, 2023
c3aa8f5
TEMPORARY - don't use data_expiration_rule block
lantoli Dec 7, 2023
daa7e41
extract ExternalProviders
lantoli Dec 7, 2023
7a5ebee
move pre_check migration functions
lantoli Dec 7, 2023
1656aea
check errors in providers
lantoli Dec 7, 2023
8883cbd
ValueIfVersionAtLeast
lantoli Dec 7, 2023
0b7d0d6
don't check version as it's also called in unit tests
lantoli Dec 7, 2023
79cc6a9
IsProviderVersionAtLeast
lantoli Dec 7, 2023
c34db51
don't check version as it's also called in unit tests
lantoli Dec 7, 2023
d673d91
add some linters, especially to check t.Helper()
lantoli Dec 7, 2023
52c365e
Revert "chore: Bump github.com/hashicorp/terraform-plugin-testing (#1…
lantoli Dec 7, 2023
caa092b
fix serverless migration tests
lantoli Dec 7, 2023
46ddeea
fix network migration tests
lantoli Dec 7, 2023
3747cf3
Revert "fix network migration tests"
lantoli Dec 7, 2023
f61a818
Revert "fix serverless migration tests"
lantoli Dec 7, 2023
4974d5c
go mod tidy
lantoli Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 17 additions & 28 deletions internal/service/advancedcluster/resource_advanced_cluster_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,26 @@ import (
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/plancheck"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/mig"
matlas "go.mongodb.org/atlas/mongodbatlas"
)

func TestAccMigrationAdvancedClusterRS_singleAWSProvider(t *testing.T) {
var (
cluster matlas.AdvancedCluster
resourceName = "mongodbatlas_advanced_cluster.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
rName = acctest.RandomWithPrefix("test-acc")
lastVersionConstraint = os.Getenv("MONGODB_ATLAS_LAST_VERSION")
cluster matlas.AdvancedCluster
resourceName = "mongodbatlas_advanced_cluster.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
rName = acctest.RandomWithPrefix("test-acc")
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasicMigration(t) },
PreCheck: func() { mig.PreCheckBasic(t) },
CheckDestroy: acc.CheckDestroyTeamAdvancedCluster,
Steps: []resource.TestStep{
{
ExternalProviders: map[string]resource.ExternalProvider{
"mongodbatlas": {
VersionConstraint: lastVersionConstraint,
Source: "mongodb/mongodbatlas",
},
},
Config: testAccMongoDBAtlasAdvancedClusterConfigSingleProvider(orgID, projectName, rName),
ExternalProviders: mig.ExternalProviders(t),
Config: testAccMongoDBAtlasAdvancedClusterConfigSingleProvider(orgID, projectName, rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckMongoDBAtlasAdvancedClusterExists(resourceName, &cluster),
testAccCheckMongoDBAtlasAdvancedClusterAttributes(&cluster, rName),
Expand All @@ -59,26 +54,20 @@ func TestAccMigrationAdvancedClusterRS_singleAWSProvider(t *testing.T) {

func TestAccMigrationAdvancedClusterRS_multiCloud(t *testing.T) {
var (
cluster matlas.AdvancedCluster
resourceName = "mongodbatlas_advanced_cluster.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
rName = acctest.RandomWithPrefix("test-acc")
lastVersionConstraint = os.Getenv("MONGODB_ATLAS_LAST_VERSION")
cluster matlas.AdvancedCluster
resourceName = "mongodbatlas_advanced_cluster.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
rName = acctest.RandomWithPrefix("test-acc")
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasicMigration(t) },
PreCheck: func() { mig.PreCheckBasic(t) },
CheckDestroy: acc.CheckDestroyTeamAdvancedCluster,
Steps: []resource.TestStep{
{
ExternalProviders: map[string]resource.ExternalProvider{
"mongodbatlas": {
VersionConstraint: lastVersionConstraint,
Source: "mongodb/mongodbatlas",
},
},
Config: testAccMongoDBAtlasAdvancedClusterConfigMultiCloud(orgID, projectName, rName),
ExternalProviders: mig.ExternalProviders(t),
Config: testAccMongoDBAtlasAdvancedClusterConfigMultiCloud(orgID, projectName, rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckMongoDBAtlasAdvancedClusterExists(resourceName, &cluster),
testAccCheckMongoDBAtlasAdvancedClusterAttributes(&cluster, rName),
Expand Down
101 changes: 36 additions & 65 deletions internal/service/alertconfiguration/resource_alert_configuration_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,25 @@ import (
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/plancheck"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/mig"
)

func TestAccMigrationConfigRSAlertConfiguration_NotificationsWithMetricThreshold(t *testing.T) {
var (
resourceName = "mongodbatlas_alert_configuration.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
alert = &admin.GroupAlertsConfig{}
config = testAccMongoDBAtlasAlertConfigurationConfig(orgID, projectName, true)
lastVersionConstraint = os.Getenv("MONGODB_ATLAS_LAST_VERSION")
resourceName = "mongodbatlas_alert_configuration.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
alert = &admin.GroupAlertsConfig{}
config = testAccMongoDBAtlasAlertConfigurationConfig(orgID, projectName, true)
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasicMigration(t) },
PreCheck: func() { mig.PreCheckBasic(t) },
CheckDestroy: testAccCheckMongoDBAtlasAlertConfigurationDestroy,
Steps: []resource.TestStep{
{
ExternalProviders: map[string]resource.ExternalProvider{
"mongodbatlas": {
VersionConstraint: lastVersionConstraint,
Source: "mongodb/mongodbatlas",
},
},
Config: config,
ExternalProviders: mig.ExternalProviders(t),
Config: config,
Check: resource.ComposeTestCheckFunc(
testAccCheckMongoDBAtlasAlertConfigurationExists(resourceName, alert),
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
Expand All @@ -57,26 +52,20 @@ func TestAccMigrationConfigRSAlertConfiguration_NotificationsWithMetricThreshold

func TestAccMigrationConfigRSAlertConfiguration_WithThreshold(t *testing.T) {
var (
resourceName = "mongodbatlas_alert_configuration.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
alert = &admin.GroupAlertsConfig{}
config = testAccMongoDBAtlasAlertConfigurationConfigWithThresholdUpdated(orgID, projectName, true, 1)
lastVersionConstraint = os.Getenv("MONGODB_ATLAS_LAST_VERSION")
resourceName = "mongodbatlas_alert_configuration.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
alert = &admin.GroupAlertsConfig{}
config = testAccMongoDBAtlasAlertConfigurationConfigWithThresholdUpdated(orgID, projectName, true, 1)
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasicMigration(t) },
PreCheck: func() { mig.PreCheckBasic(t) },
CheckDestroy: testAccCheckMongoDBAtlasAlertConfigurationDestroy,
Steps: []resource.TestStep{
{
ExternalProviders: map[string]resource.ExternalProvider{
"mongodbatlas": {
VersionConstraint: lastVersionConstraint,
Source: "mongodb/mongodbatlas",
},
},
Config: config,
ExternalProviders: mig.ExternalProviders(t),
Config: config,
Check: resource.ComposeTestCheckFunc(
testAccCheckMongoDBAtlasAlertConfigurationExists(resourceName, alert),
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
Expand All @@ -101,26 +90,20 @@ func TestAccMigrationConfigRSAlertConfiguration_WithThreshold(t *testing.T) {

func TestAccMigrationConfigRSAlertConfiguration_EmptyOptionalBlocks(t *testing.T) {
var (
resourceName = "mongodbatlas_alert_configuration.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
alert = &admin.GroupAlertsConfig{}
config = testAccMongoDBAtlasAlertConfigurationConfigEmptyOptionalBlocks(orgID, projectName)
lastVersionConstraint = os.Getenv("MONGODB_ATLAS_LAST_VERSION")
resourceName = "mongodbatlas_alert_configuration.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
alert = &admin.GroupAlertsConfig{}
config = testAccMongoDBAtlasAlertConfigurationConfigEmptyOptionalBlocks(orgID, projectName)
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasicMigration(t) },
PreCheck: func() { mig.PreCheckBasic(t) },
CheckDestroy: testAccCheckMongoDBAtlasAlertConfigurationDestroy,
Steps: []resource.TestStep{
{
ExternalProviders: map[string]resource.ExternalProvider{
"mongodbatlas": {
VersionConstraint: lastVersionConstraint,
Source: "mongodb/mongodbatlas",
},
},
Config: config,
ExternalProviders: mig.ExternalProviders(t),
Config: config,
Check: resource.ComposeTestCheckFunc(
testAccCheckMongoDBAtlasAlertConfigurationExists(resourceName, alert),
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
Expand Down Expand Up @@ -161,21 +144,15 @@ func TestAccMigrationConfigRSAlertConfiguration_MultipleMatchers(t *testing.T) {
"operator": "CONTAINS",
"value": "MONGOS",
})
lastVersionConstraint = os.Getenv("MONGODB_ATLAS_LAST_VERSION")
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasicMigration(t) },
PreCheck: func() { mig.PreCheckBasic(t) },
CheckDestroy: testAccCheckMongoDBAtlasAlertConfigurationDestroy,
Steps: []resource.TestStep{
{
ExternalProviders: map[string]resource.ExternalProvider{
"mongodbatlas": {
VersionConstraint: lastVersionConstraint,
Source: "mongodb/mongodbatlas",
},
},
Config: config,
ExternalProviders: mig.ExternalProviders(t),
Config: config,
Check: resource.ComposeTestCheckFunc(
testAccCheckMongoDBAtlasAlertConfigurationExists(resourceName, alert),
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
Expand All @@ -198,26 +175,20 @@ func TestAccMigrationConfigRSAlertConfiguration_MultipleMatchers(t *testing.T) {

func TestAccMigrationConfigRSAlertConfiguration_EmptyOptionalAttributes(t *testing.T) {
var (
resourceName = "mongodbatlas_alert_configuration.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
alert = &admin.GroupAlertsConfig{}
config = testAccMongoDBAtlasAlertConfigurationConfigWithEmptyOptionalAttributes(orgID, projectName)
lastVersionConstraint = os.Getenv("MONGODB_ATLAS_LAST_VERSION")
resourceName = "mongodbatlas_alert_configuration.test"
orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")
projectName = acctest.RandomWithPrefix("test-acc")
alert = &admin.GroupAlertsConfig{}
config = testAccMongoDBAtlasAlertConfigurationConfigWithEmptyOptionalAttributes(orgID, projectName)
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasicMigration(t) },
PreCheck: func() { mig.PreCheckBasic(t) },
CheckDestroy: testAccCheckMongoDBAtlasAlertConfigurationDestroy,
Steps: []resource.TestStep{
{
ExternalProviders: map[string]resource.ExternalProvider{
"mongodbatlas": {
VersionConstraint: lastVersionConstraint,
Source: "mongodb/mongodbatlas",
},
},
Config: config,
ExternalProviders: mig.ExternalProviders(t),
Config: config,
Check: resource.ComposeTestCheckFunc(
testAccCheckMongoDBAtlasAlertConfigurationExists(resourceName, alert),
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
Expand Down
Loading
Loading