Merge branch 'master' into CLOUDP-320243-dev-2.0.0

Author: maastha

docs/index.md

@@ -172,6 +172,77 @@ In addition to [generic `provider` arguments](https://www.terraform.io/docs/conf
 
 For more information on configuring and managing programmatic API Keys see the [MongoDB Atlas Documentation](https://docs.atlas.mongodb.com/tutorial/manage-programmatic-access/index.html).
 
+## MongoDB Atlas Provider Versioning Policy
+
+In order to promote stability, predictability, and transparency, the MongoDB Atlas Terraform Provider will implement **semantic versioning** with a **scheduled release cadence**. Our goal is to deliver regular improvements to the provider without overburdening users with frequent breaking changes.
+
+---
+
+### Definition of Breaking Changes
+
+Our definition of breaking changes aligns with the impact updates have on the customer:
+
+Breaking changes are defined as any change that requires user intervention to address.
+This may include:
+
+- Modifying existing schema (e.g., removing or renaming fields, renaming resources)
+- Changes to business logic (e.g., implicit default values or server-side behavior)
+- Provider-level changes (e.g., changing retry behavior)
+
+Final confirmation of a breaking change — possibly leading to an exemption — is subject to:
+
+- MongoDB’s understanding of the adoption level of the feature
+- Timing of the next planned major release
+- The change's relation to a bug fix
+
+---
+
+### Versioning Strategy
+
+We follow [semantic versioning](https://semver.org/) for all updates:
+
+- **Major (X.0.0):** Introduces breaking changes (as defined by MongoDB)
+- **Minor (X.Y.0):** Adds non-breaking changes and announces deprecations
+- **Patch (X.Y.Z):** Includes bug fixes and documentation updates
+
+We do not utilize pre-release versioning at this time.
+
+---
+
+### Release Cadence
+
+To minimize unexpected changes, we follow a scheduled cadence:
+
+- **Minor and patch** versions follow a **biweekly** release pattern
+- **Major** versions are released **once per year**, with a maximum of **two per calendar year**
+- The provider team may adjust the schedule based on need
+
+**Off-cycle releases** may occur for critical security flaws or regressions.
+
+---
+
+### Deprecation Policy
+
+We use a structured deprecation window to notify customers in advance:
+
+- Breaking changes are **deprecated in a minor version** with:
+  - Warnings in migration guides, changelogs, and resource usage
+- Deprecated functionality is **removed in the next 1–2 major versions**, unless otherwise stated
+
+---
+
+### Customer Communication
+
+We are committed to clear and proactive communication:
+
+- **Each release** includes a [changelog](https://github.com/mongodb/terraform-provider-mongodbatlas/releases) clearly labeling:
+  - `breaking`, `deprecated`, `bug-fix`, `feature`, and `enhancement` changes
+- **Major versions** include migration guides
+- **Minor and patch versions** generally do not include migration guides, but may if warranted
+- **GitHub tags** with `vX.Y.Z` format are provided for all releases
+
+---
+
 ## [HashiCorp Terraform Version](https://www.terraform.io/downloads.html) Compatibility Matrix
 
 <!-- DO NOT remove below placeholder comments as this table is auto-generated -->

go.mod

@@ -25,7 +25,7 @@ require (
 	github.com/jarcoal/httpmock v1.4.0
 	github.com/mongodb-forks/digest v1.1.0
 	github.com/mongodb/atlas-sdk-go v1.0.1-0.20250709084037-30b22cb7796e
-	github.com/pb33f/libopenapi v0.23.0
+	github.com/pb33f/libopenapi v0.24.0
 	github.com/sebdah/goldie/v2 v2.7.1
 	github.com/spf13/cast v1.9.2
 	github.com/stretchr/testify v1.10.0

go.sum

@@ -704,8 +704,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/openlyinc/pointy v1.1.2 h1:LywVV2BWC5Sp5v7FoP4bUD+2Yn5k0VNeRbU5vq9jUMY=
 github.com/openlyinc/pointy v1.1.2/go.mod h1:w2Sytx+0FVuMKn37xpXIAyBNhFNBIJGR/v2m7ik1WtM=
-github.com/pb33f/libopenapi v0.23.0 h1:gZP1zrtvMwk7spGDTZf4OufKgpOH8M9gHAZ77rf39Oo=
-github.com/pb33f/libopenapi v0.23.0/go.mod h1:utT5sD2/mnN7YK68FfZT5yEPbI1wwRBpSS4Hi0oOrBU=
+github.com/pb33f/libopenapi v0.24.0 h1:QIwVCzT+VxmWWwxNx1LO9jLXPZp9VsiCwDO+c2h/rq4=
+github.com/pb33f/libopenapi v0.24.0/go.mod h1:utT5sD2/mnN7YK68FfZT5yEPbI1wwRBpSS4Hi0oOrBU=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=

internal/service/advancedcluster/resource_advanced_cluster_test.go

@@ -125,20 +125,21 @@ func testAccAdvancedClusterFlexUpgrade(t *testing.T, instanceSize string, includ
 	projectID, clusterName := acc.ProjectIDExecutionWithCluster(t, 1)
 	defaultZoneName := "Zone 1" // Uses backend default as in existing tests
 
+	// avoid checking plural data source to reduce risk of being impacted from failure in other test using same project, allows running in parallel
 	steps := []resource.TestStep{
 		{
 			Config: configTenant(t, true, projectID, clusterName, defaultZoneName, instanceSize),
-			Check:  checkTenant(true, projectID, clusterName),
+			Check:  checkTenant(true, projectID, clusterName, false),
 		},
 		{
 			Config: configFlexCluster(t, projectID, clusterName, "AWS", "US_EAST_1", defaultZoneName, "", false, nil),
-			Check:  checkFlexClusterConfig(projectID, clusterName, "AWS", "US_EAST_1", false),
+			Check:  checkFlexClusterConfig(projectID, clusterName, "AWS", "US_EAST_1", false, false),
 		},
 	}
 	if includeDedicated {
 		steps = append(steps, resource.TestStep{
 			Config: acc.ConvertAdvancedClusterToPreviewProviderV2(t, true, acc.ConfigBasicDedicated(projectID, clusterName, defaultZoneName)),
-			Check:  checksBasicDedicated(projectID, clusterName),
+			Check:  checksBasicDedicated(projectID, clusterName, false),
 		})
 	}
 
@@ -151,11 +152,11 @@ func testAccAdvancedClusterFlexUpgrade(t *testing.T, instanceSize string, includ
 }
 
 func TestAccAdvancedCluster_basicTenant_flexUpgrade_dedicatedUpgrade(t *testing.T) {
-	resource.Test(t, testAccAdvancedClusterFlexUpgrade(t, freeInstanceSize, true))
+	resource.ParallelTest(t, testAccAdvancedClusterFlexUpgrade(t, freeInstanceSize, true))
 }
 
 func TestAccAdvancedCluster_sharedTier_flexUpgrade(t *testing.T) {
-	resource.Test(t, testAccAdvancedClusterFlexUpgrade(t, sharedInstanceSize, false))
+	resource.ParallelTest(t, testAccAdvancedClusterFlexUpgrade(t, sharedInstanceSize, false))
 }
 func TestAccMockableAdvancedCluster_tenantUpgrade(t *testing.T) {
 	var (
@@ -169,11 +170,11 @@ func TestAccMockableAdvancedCluster_tenantUpgrade(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: acc.ConvertAdvancedClusterToPreviewProviderV2(t, true, configTenant(t, true, projectID, clusterName, defaultZoneName, freeInstanceSize)),
-				Check:  checkTenant(true, projectID, clusterName),
+				Check:  checkTenant(true, projectID, clusterName, true),
 			},
 			{
 				Config: acc.ConvertAdvancedClusterToPreviewProviderV2(t, true, acc.ConfigBasicDedicated(projectID, clusterName, defaultZoneName)),
-				Check:  checksBasicDedicated(projectID, clusterName),
+				Check:  checksBasicDedicated(projectID, clusterName, true),
 			},
 			acc.TestStepImportCluster(resourceName),
 		},
@@ -1732,9 +1733,12 @@ func configTenant(t *testing.T, usePreviewProvider bool, projectID, name, zoneNa
 	`, projectID, name, zoneNameLine, instanceSize)) + dataSourcesTFNewSchema
 }
 
-func checkTenant(usePreviewProvider bool, projectID, name string) resource.TestCheckFunc {
-	pluralChecks := acc.AddAttrSetChecksPreviewProviderV2(usePreviewProvider, dataSourcePluralName, nil,
-		[]string{"results.#", "results.0.replication_specs.#", "results.0.name", "results.0.termination_protection_enabled", "results.0.global_cluster_self_managed_sharding"}...)
+func checkTenant(usePreviewProvider bool, projectID, name string, checkPlural bool) resource.TestCheckFunc {
+	var pluralChecks []resource.TestCheckFunc
+	if checkPlural {
+		pluralChecks = acc.AddAttrSetChecksPreviewProviderV2(usePreviewProvider, dataSourcePluralName, nil,
+			[]string{"results.#", "results.0.replication_specs.#", "results.0.name", "results.0.termination_protection_enabled", "results.0.global_cluster_self_managed_sharding"}...)
+	}
 	return checkAggr(usePreviewProvider,
 		[]string{"replication_specs.#", "replication_specs.0.id", "replication_specs.0.region_configs.#"},
 		map[string]string{
@@ -1745,8 +1749,8 @@ func checkTenant(usePreviewProvider bool, projectID, name string) resource.TestC
 		pluralChecks...)
 }
 
-func checksBasicDedicated(projectID, name string) resource.TestCheckFunc {
-	originalChecks := checkTenant(true, projectID, name)
+func checksBasicDedicated(projectID, name string, checkPlural bool) resource.TestCheckFunc {
+	originalChecks := checkTenant(true, projectID, name, checkPlural)
 	checkMap := map[string]string{
 		"replication_specs.0.region_configs.0.electable_specs.0.node_count":    "3",
 		"replication_specs.0.region_configs.0.electable_specs.0.instance_size": "M10",
@@ -3254,11 +3258,11 @@ func TestAccClusterFlexCluster_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: configFlexCluster(t, projectID, clusterName, "AWS", "US_EAST_1", "", emptyTimeoutConfig, false, nil),
-				Check:  checkFlexClusterConfig(projectID, clusterName, "AWS", "US_EAST_1", false),
+				Check:  checkFlexClusterConfig(projectID, clusterName, "AWS", "US_EAST_1", false, true),
 			},
 			{
 				Config: configFlexCluster(t, projectID, clusterName, "AWS", "US_EAST_1", "", emptyTimeoutConfig, true, nil),
-				Check:  checkFlexClusterConfig(projectID, clusterName, "AWS", "US_EAST_1", true),
+				Check:  checkFlexClusterConfig(projectID, clusterName, "AWS", "US_EAST_1", true, true),
 			},
 			acc.TestStepImportCluster(resourceName),
 			{
@@ -3319,7 +3323,7 @@ func TestAccAdvancedCluster_updateDeleteTimeoutFlex(t *testing.T) {
 	})
 }
 
-func checkFlexClusterConfig(projectID, clusterName, providerName, region string, tagsCheck bool) resource.TestCheckFunc {
+func checkFlexClusterConfig(projectID, clusterName, providerName, region string, tagsCheck, checkPlural bool) resource.TestCheckFunc {
 	checks := []resource.TestCheckFunc{acc.CheckExistsFlexCluster()}
 	attrMapAdvCluster := map[string]string{
 		"name":                                 clusterName,
@@ -3362,17 +3366,22 @@ func checkFlexClusterConfig(projectID, clusterName, providerName, region string,
 		tagsCheck := checkKeyValueBlocks(true, true, "tags", tagsMap)
 		checks = append(checks, tagsCheck)
 	}
-	pluralMap := map[string]string{
-		"project_id": projectID,
-		"results.#":  "1",
-	}
 	checks = acc.AddAttrChecks(acc.FlexDataSourceName, checks, attrMapFlex)
 	checks = acc.AddAttrSetChecks(acc.FlexDataSourceName, checks, attrSetFlex...)
-	checks = acc.AddAttrChecks(acc.FlexDataSourcePluralName, checks, pluralMap)
-	checks = acc.AddAttrChecksPrefix(acc.FlexDataSourcePluralName, checks, attrMapFlex, "results.0")
-	checks = acc.AddAttrSetChecksPrefix(acc.FlexDataSourcePluralName, checks, attrSetFlex, "results.0")
-	checks = acc.AddAttrChecks(dataSourcePluralName, checks, pluralMap)
 	ds := conversion.StringPtr(dataSourceName)
-	dsp := conversion.StringPtr(dataSourcePluralName)
+	var dsp *string
+
+	if checkPlural {
+		dsp = conversion.StringPtr(dataSourcePluralName)
+
+		pluralMap := map[string]string{
+			"project_id": projectID,
+			"results.#":  "1",
+		}
+		checks = acc.AddAttrChecks(acc.FlexDataSourcePluralName, checks, pluralMap)
+		checks = acc.AddAttrChecksPrefix(acc.FlexDataSourcePluralName, checks, attrMapFlex, "results.0")
+		checks = acc.AddAttrSetChecksPrefix(acc.FlexDataSourcePluralName, checks, attrSetFlex, "results.0")
+		checks = acc.AddAttrChecks(dataSourcePluralName, checks, pluralMap)
+	}
 	return acc.CheckRSAndDSPreviewProviderV2(true, resourceName, ds, dsp, attrSetAdvCluster, attrMapAdvCluster, checks...)
 }