chore: Merge branch 'master' into CLOUDP-282554-flex-ga

.changelog/3034.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/mongodbatlas_advanced_cluster: Adds `PENDING` status for update and delete operations
+```
+
+```release-note:bug
+resource/mongodbatlas_cluster: Adds `PENDING` status for update and delete operations
+```

.changelog/3051.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/mongodbatlas_alert_configuration: Removes UseStateForUnknown plan modifier for interval_min
+```

.github/workflows/acceptance-tests-runner.yml

@@ -375,7 +375,7 @@ jobs:
     needs: [ change-detection, get-provider-version ]
     if: ${{ needs.change-detection.outputs.advanced_cluster_tpf == 'true' || inputs.test_group == 'advanced_cluster_tpf' }}
     env:
-      MONGODB_ATLAS_ADVANCED_CLUSTER_V2_SCHEMA: 'true'
+      MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER: 'true'
     runs-on: ubuntu-latest
     permissions: {}
     steps:
@@ -390,9 +390,9 @@ jobs:
           terraform_version: ${{ inputs.terraform_version }}
           terraform_wrapper: false  
       - name: Prepare new advanced_cluster
-        run: make tools enable-advancedclustertpf  
-      - name: Unit tests # delete after allowAdvancedClusterV2Schema is removed
-        run: go test -v ./internal/testutil/acc/advanced_cluster_schema_v2_test.go
+        run: make tools enable-preview-provider-v2  
+      - name: Unit tests # delete after allowPreviewProviderV2AdvancedCluster is removed
+        run: go test -v ./internal/testutil/acc/advanced_cluster_preview_provider_v2_test.go
       - name: Mocked Acceptance Tests
         env:
           ACCTEST_REGEX_RUN: '^TestAccMockable'
@@ -412,7 +412,7 @@ jobs:
     needs: [ change-detection, get-provider-version ]
     if: ${{ (needs.change-detection.outputs.advanced_cluster_tpf == 'true' || inputs.test_group == 'advanced_cluster_tpf') && inputs.terraform_version == '1.10.x' && inputs.reduced_tests == false }}
     env:
-      MONGODB_ATLAS_ADVANCED_CLUSTER_V2_SCHEMA: 'true'
+      MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER: 'true'
     strategy:
       max-parallel: 2
       fail-fast: false
@@ -433,7 +433,7 @@ jobs:
           terraform_version: ${{ matrix.terraform_version }}
           terraform_wrapper: false  
       - name: Prepare new advanced_cluster
-        run: make tools enable-advancedclustertpf  
+        run: make tools enable-preview-provider-v2  
       - name: Acceptance Tests
         env:
           ACCTEST_REGEX_RUN: '^TestAccAdvancedCluster_move'

CHANGELOG.md

@@ -1,5 +1,16 @@
 ## (Unreleased)
 
+BUG FIXES:
+
+* resource/mongodbatlas_alert_configuration: Removes UseStateForUnknown plan modifier for interval_min ([#3051](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3051))
+
+## 1.26.1 (February 07, 2025)
+
+BUG FIXES:
+
+* resource/mongodbatlas_advanced_cluster: Adds `PENDING` status for update and delete operations ([#3034](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3034))
+* resource/mongodbatlas_cluster: Adds `PENDING` status for update and delete operations ([#3034](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3034))
+
 ## 1.26.0 (January 23, 2025)
 
 FEATURES:

Makefile

@@ -50,7 +50,7 @@ testmact: ## Run MacT tests (mocked acc tests)
 	@$(eval export MONGODB_ATLAS_ORG_ID?=111111111111111111111111)
 	@$(eval export MONGODB_ATLAS_PROJECT_ID?=111111111111111111111111)
 	@$(eval export MONGODB_ATLAS_CLUSTER_NAME?=mocked-cluster)
-	@$(eval export MONGODB_ATLAS_ADVANCED_CLUSTER_V2_SCHEMA?=true)
+	@$(eval export MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER?=true)
 	@if [ "$(ACCTEST_PACKAGES)" = "./..." ]; then \
 		echo "Error: ACCTEST_PACKAGES must be explicitly set for testmact target, './...' is not allowed"; \
 		exit 1; \
@@ -191,9 +191,9 @@ check-changelog-entry-file: ## Check a changelog entry file in a PR
 jira-release-version: ## Update Jira version in a release
 	go run ./tools/jira-release-version/*.go
 
-.PHONY: enable-advancedclustertpf
-enable-advancedclustertpf: ## Enable Advanced Cluster V2 Schema
-	make change-lines filename=./internal/config/advanced_cluster_v2_schema.go find="allowAdvancedClusterV2Schema = false" new="allowAdvancedClusterV2Schema = true"
+.PHONY: enable-preview-provider-v2
+enable-preview-provider-v2: ## Enable Preview Provider V2
+	make change-lines filename=./internal/config/preview_provider_v2.go find="allowPreviewProviderV2AdvancedCluster = false" new="allowPreviewProviderV2AdvancedCluster = true"
 
 .PHONY: delete-lines ${filename} ${delete}
 delete-lines:

contributing/testing-best-practices.md

@@ -74,7 +74,7 @@ Acceptance and migration tests can reuse projects and clusters in order to be mo
 **Experimental** framework for hooking into the HTTP Client used by the Terraform provider and capture/replay traffic.
 - Works by mutating a `terraform-plugin-testing/helper/resource.TestCase`
 - Limited to `TestAccMockable*` tests in [`resource_advanced_cluster_test.go`](../internal/service/advancedcluster/resource_advanced_cluster_test.go):
-  - Remember to run `make enable-advancedclustertpf` and `export MONGODB_ATLAS_ADVANCED_CLUSTER_V2_SCHEMA=true` for the TPF implementation to be used and the tests to work.
+  - Remember to run `make enable-preview-provider-v2` and `export MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER=true` for the TPF implementation to be used and the tests to work.
 - Enabled test cases should always be named with `TestAccMockable` prefix, e.g.: `TestAccMockableAdvancedCluster_tenantUpgrade`
 - To create a new `TestAccMockable` you would need to (see [example commit](https://github.com/mongodb/terraform-provider-mongodbatlas/commit/939244fcab95eca9c4c93993fc1b5118ab8bfddb#diff-f9c590f9ffc351d041a26ff474f91404ff394cbfb83f1e135b415998476ca62aR128))
   - (1) Write the normal acceptance test

docs/data-sources/resource_policies.md

@@ -2,7 +2,7 @@
 
 `mongodbatlas_resource_policies` returns all resource policies in an organization.
 
--> **NOTE**: Resource Policies are currently in Private Preview. To use this feature, you must take the following actions:
+-> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
 1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
 2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
 
@@ -17,7 +17,7 @@ resource "mongodbatlas_resource_policy" "project_ip_access_list" {
       body = <<EOF
         forbid (
                 principal,
-                action == cloud::Action::"project.edit",
+                action == ResourcePolicy::Action::"project.ipAccessList.modify",
                 resource
         )
                 when {
@@ -50,12 +50,12 @@ data "cedar_policyset" "cloud_region" {
     any_principal = true
     effect        = "forbid"
     action = {
-      type = " cloud::Action"
-      id   = "cluster.createEdit"
+      type = " ResourcePolicy::Action"
+      id   = "cluster.modify"
     }
     any_resource = true
     when {
-      text = "context.cluster.regions.contains(cloud::region::\"gcp:us-east1\")"
+      text = "context.cluster.regions.contains(ResourcePolicy::Region::\"gcp:us-east1\")"
     }
   }
 }

docs/data-sources/resource_policy.md

@@ -2,7 +2,7 @@
 
 `mongodbatlas_resource_policy` describes a resource policy in an organization.
 
--> **NOTE**: Resource Policies are currently in Private Preview. To use this feature, you must take the following actions:
+-> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
 1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
 2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
 
@@ -17,7 +17,7 @@ resource "mongodbatlas_resource_policy" "project_ip_access_list" {
       body = <<EOF
         forbid (
                 principal,
-                action == cloud::Action::"project.edit",
+                action == ResourcePolicy::Action::"project.ipAccessList.modify",
                 resource
         )
                 when {
@@ -50,12 +50,12 @@ data "cedar_policyset" "cloud_region" {
     any_principal = true
     effect        = "forbid"
     action = {
-      type = " cloud::Action"
-      id   = "cluster.createEdit"
+      type = " ResourcePolicy::Action"
+      id   = "cluster.modify"
     }
     any_resource = true
     when {
-      text = "context.cluster.regions.contains(cloud::region::\"gcp:us-east1\")"
+      text = "context.cluster.regions.contains(ResourcePolicy::Region::\"gcp:us-east1\")"
     }
   }
 }

docs/index.md

@@ -221,7 +221,7 @@ We ship binaries but do not prioritize fixes for the following operating system
 ## Examples from MongoDB and the Community
 
 <!-- NOTE: the below examples link is updated during the release process, when doing changes in the following sentence verify scripts/update-examples-reference-in-docs.sh is not impacted-->
-We have [example configurations](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v1.26.0/examples)
+We have [example configurations](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v1.26.1/examples)
 in our GitHub repo that will help both beginner and more advanced users.
 
 Have a good example you've created and want to share?

docs/resources/advanced_cluster.md

@@ -656,7 +656,7 @@ lifecycle {
 In addition to all arguments above, the following attributes are exported:
 
 * `cluster_id` - The cluster ID.
-*  `mongo_db_version` - Version of MongoDB the cluster runs, in `major-version`.`minor-version` format.
+* `mongo_db_version` - Version of MongoDB the cluster runs, in `major-version`.`minor-version` format.
 * `id` -	The Terraform's unique identifier used internally for state management.
 * `connection_strings` - Set of connection strings that your applications use to connect to this cluster. More info in [Connection-strings](https://docs.mongodb.com/manual/reference/connection-string/). Use the parameters in this object to connect your applications to this cluster. To learn more about the formats of connection strings, see [Connection String Options](https://docs.atlas.mongodb.com/reference/faq/connection-changes/). NOTE: Atlas returns the contents of this object after the cluster is operational, not while it builds the cluster.
 
@@ -686,6 +686,7 @@ In addition to all arguments above, the following attributes are exported:
     - REPAIRING
 * `replication_specs.#.container_id` - A key-value map of the Network Peering Container ID(s) for the configuration specified in `region_configs`. The Container ID is the id of the container created when the first cluster in the region (AWS/Azure) or project (GCP) was created.  The syntax is `"providerName:regionName" = "containerId"`. Example `AWS:US_EAST_1" = "61e0797dde08fb498ca11a71`.
 * `config_server_type` Describes a sharded cluster's config server type. Valid values are `DEDICATED` and `EMBEDDED`. To learn more, see the [Sharded Cluster Config Servers documentation](https://dochub.mongodb.org/docs/manual/core/sharded-cluster-config-servers/).
+* `pinned_fcv.version` - Feature compatibility version of the cluster.
 
 
 ## Import

docs/resources/cluster.md

@@ -539,7 +539,7 @@ To learn more, see [Resource Tags](https://dochub.mongodb.org/core/add-cluster-t
 In addition to all arguments above, the following attributes are exported:
 
 * `cluster_id` - The cluster ID.
-*  `mongo_db_version` - Version of MongoDB the cluster runs, in `major-version`.`minor-version` format.
+* `mongo_db_version` - Version of MongoDB the cluster runs, in `major-version`.`minor-version` format.
 * `id` -  The Terraform's unique identifier used internally for state management.
 * `mongo_uri` - Base connection string for the cluster. Atlas only displays this field after the cluster is operational, not while it builds the cluster.
 * `mongo_uri_updated` - Lists when the connection string was last updated. The connection string changes, for example, if you change a replica set to a sharded cluster.
@@ -572,6 +572,7 @@ In addition to all arguments above, the following attributes are exported:
     - DELETING
     - DELETED
     - REPAIRING
+* `pinned_fcv.version` - Feature compatibility version of the cluster.
 
 ### Cloud Backup Policy
 

docs/resources/resource_policy.md

@@ -2,7 +2,7 @@
 
 `mongodbatlas_resource_policy` provides a Resource Policy resource. The resource lets you create, edit and delete resource policies to prevent misconfigurations and reduce the need for corrective interventions in your organization.
 
--> **NOTE**: Resource Policies are currently in Private Preview. To use this feature, you must take the following actions:
+-> **NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
 1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
 2. Enable the [Preview Features](https://github.com/mongodb/terraform-provider-mongodbatlas?tab=readme-ov-file#preview-features) when running `terraform` commands.
 
@@ -19,7 +19,7 @@ resource "mongodbatlas_resource_policy" "project_ip_access_list" {
       body = <<EOF
         forbid (
                 principal,
-                action == cloud::Action::"project.edit",
+                action == ResourcePolicy::Action::"project.ipAccessList.modify",
                 resource
         )
                 when {
@@ -52,12 +52,12 @@ data "cedar_policyset" "cloud_region" {
     any_principal = true
     effect        = "forbid"
     action = {
-      type = " cloud::Action"
-      id   = "cluster.createEdit"
+      type = " ResourcePolicy::Action"
+      id   = "cluster.modify"
     }
     any_resource = true
     when {
-      text = "context.cluster.regions.contains(cloud::region::\"gcp:us-east1\")"
+      text = "context.cluster.regions.contains(ResourcePolicy::Region::\"gcp:us-east1\")"
     }
   }
 }

examples/mongodbatlas_resource_policy/README.md

@@ -1,7 +1,7 @@
 # MongoDB Atlas Provider -- Atlas Resource Policy
 This example creates three different resource policies in an organization.
 
-**NOTE**: Resource Policies are currently in Private Preview. To use this feature, you must take the following actions:
+**NOTE**: Resource Policies are currently in Public Preview. To use this feature, you must take the following actions:
 1. Enable the `Atlas Resource Policies` Preview Feature in your organization (contact [MongoDB Support](https://www.mongodb.com/services/support)).
 2. Enable the [Preview Features](../../README.md#preview-features) when running `terraform` commands.
 

examples/mongodbatlas_resource_policy/cloud-provider.cedar

@@ -1,7 +1,7 @@
 forbid (
     principal,
-    action == cloud::Action::"cluster.createEdit",
+    action == ResourcePolicy::Action::"cluster.modify",
     resource
 )
 when
-{ context.cluster.cloudProviders.containsAny([cloud::cloudProvider::"${CLOUD_PROVIDER}"]) };
+{ context.cluster.cloudProviders.containsAny([ResourcePolicy::CloudProvider::"${CLOUD_PROVIDER}"]) };

examples/mongodbatlas_resource_policy/main.tf

@@ -7,7 +7,7 @@ resource "mongodbatlas_resource_policy" "project_ip_access_list" {
       body = <<EOF
         forbid (
                 principal,
-                action == cloud::Action::"project.edit",
+                action == ResourcePolicy::Action::"project.ipAccessList.modify",
                 resource
         )
                 when {
@@ -40,12 +40,12 @@ data "cedar_policyset" "cloud_region" {
     any_principal = true
     effect        = "forbid"
     action = {
-      type = " cloud::Action"
-      id   = "cluster.createEdit"
+      type = " ResourcePolicy::Action"
+      id   = "cluster.modify"
     }
     any_resource = true
     when {
-      text = "context.cluster.regions.contains(cloud::region::\"gcp:us-east1\")"
+      text = "context.cluster.regions.contains(ResourcePolicy::Region::\"gcp:us-east1\")"
     }
   }
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/mongodb/terraform-provider-mongodbatlas
 
-go 1.23.4
+go 1.23.6
 
 require (
 	github.com/andygrunwald/go-jira/v2 v2.0.0-20240116150243-50d59fe116d6
@@ -24,7 +24,7 @@ require (
 	github.com/huandu/xstrings v1.5.0
 	github.com/jarcoal/httpmock v1.3.1
 	github.com/mongodb-forks/digest v1.1.0
-	github.com/mongodb/atlas-sdk-go v1.0.1-0.20250203083650-2c9f537aeaab
+	github.com/mongodb/atlas-sdk-go v1.0.1-0.20250210083648-31e2c436c287
 	github.com/pb33f/libopenapi v0.21.2
 	github.com/sebdah/goldie/v2 v2.5.5
 	github.com/spf13/cast v1.7.1
@@ -34,7 +34,7 @@ require (
 	go.mongodb.org/atlas v0.37.0
 	go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0
 	go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.0
-	go.mongodb.org/atlas-sdk/v20241113004 v20241113004.1.0
+	go.mongodb.org/atlas-sdk/v20241113005 v20241113005.0.0
 	go.mongodb.org/realm v0.1.0
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -654,8 +654,8 @@ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
 github.com/mmcloughlin/avo v0.5.0/go.mod h1:ChHFdoV7ql95Wi7vuq2YT1bwCJqiWdZrQ1im3VujLYM=
 github.com/mongodb-forks/digest v1.1.0 h1:7eUdsR1BtqLv0mdNm4OXs6ddWvR4X2/OsLwdKksrOoc=
 github.com/mongodb-forks/digest v1.1.0/go.mod h1:rb+EX8zotClD5Dj4NdgxnJXG9nwrlx3NWKJ8xttz1Dg=
-github.com/mongodb/atlas-sdk-go v1.0.1-0.20250203083650-2c9f537aeaab h1:jcC1EVV/fEvXrkAWP7DGk+Z5QKd4XkbQc0Epc2VuoAk=
-github.com/mongodb/atlas-sdk-go v1.0.1-0.20250203083650-2c9f537aeaab/go.mod h1:gjkhjqMH7Mzk0Rd9utdjDGpgDbW8x48OzYNw3DRVKN4=
+github.com/mongodb/atlas-sdk-go v1.0.1-0.20250210083648-31e2c436c287 h1:4fcg+dcr1k1hHbzXbirdlDvJIiSVJz8iAzsIF8FPHQg=
+github.com/mongodb/atlas-sdk-go v1.0.1-0.20250210083648-31e2c436c287/go.mod h1:gjkhjqMH7Mzk0Rd9utdjDGpgDbW8x48OzYNw3DRVKN4=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
@@ -825,8 +825,8 @@ go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0 h1:d/gbYJ+obR0EM/3DZf7+ZM
 go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0/go.mod h1:O47ZrMMfcWb31wznNIq2PQkkdoFoK0ea2GlmRqGJC2s=
 go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.0 h1:EGTT54tKbDbkhhK+jH5AqINFQbHdvaOSpI0oeI5Tl1s=
 go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.0/go.mod h1:UTNpAyiKm/7utu+Nl0FafgjgvS+ONNGEoxBT5g/40WM=
-go.mongodb.org/atlas-sdk/v20241113004 v20241113004.1.0 h1:AvrgNUpVMFnqZZJo4m/Bynr0wlDWM4xjhugCSdX/7mM=
-go.mongodb.org/atlas-sdk/v20241113004 v20241113004.1.0/go.mod h1:CABkQ0sbsqRBXR55UwS+0rX91Dx7et0xxq4QBB6qRog=
+go.mongodb.org/atlas-sdk/v20241113005 v20241113005.0.0 h1:aaU2E4rtzYXuEDxv9MoSON2gOEAA9M2gsDf2CqjcGj8=
+go.mongodb.org/atlas-sdk/v20241113005 v20241113005.0.0/go.mod h1:eV9REWR36iVMrpZUAMZ5qPbXEatoVfmzwT+Ue8yqU+U=
 go.mongodb.org/realm v0.1.0 h1:zJiXyLaZrznQ+Pz947ziSrDKUep39DO4SfA0Fzx8M4M=
 go.mongodb.org/realm v0.1.0/go.mod h1:4Vj6iy+Puo1TDERcoh4XZ+pjtwbOzPpzqy3Cwe8ZmDM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=

internal/common/conversion/flatten_expand.go

@@ -3,7 +3,7 @@ package conversion
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
-	"go.mongodb.org/atlas-sdk/v20241113004/admin"
+	"go.mongodb.org/atlas-sdk/v20241113005/admin"
 )
 
 func FlattenLinks(links []admin.Link) []map[string]string {

internal/common/conversion/tags.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"go.mongodb.org/atlas-sdk/v20241113004/admin"
+	"go.mongodb.org/atlas-sdk/v20241113005/admin"
 )
 
 func NewResourceTags(ctx context.Context, tags types.Map) *[]admin.ResourceTag {

internal/common/conversion/tags_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/stretchr/testify/assert"
-	"go.mongodb.org/atlas-sdk/v20241113004/admin"
+	"go.mongodb.org/atlas-sdk/v20241113005/admin"
 )
 
 func TestNewResourceTags(t *testing.T) {

internal/common/update/patch_payload_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/update"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.mongodb.org/atlas-sdk/v20241113004/admin"
+	"go.mongodb.org/atlas-sdk/v20241113005/admin"
 )
 
 func TestPatchReplicationSpecs(t *testing.T) {