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

Author: Cristina Sánchez Sánchez

.changelog/3525.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/mongodbatlas_flex_cluster: Adds `timeouts` attribute for create, update and delete operations
+```
+
+```release-note:enhancement
+resource/mongodbatlas_flex_cluster: Adds `delete_on_create_timeout` attribute to indicate whether to delete the resource if its creation times out
+```

.changelog/3536.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_cloud_backup_snapshot: Adds `delete_on_create_timeout` attribute to indicate whether to delete the resource if its creation times out
+``` 

.changelog/3541.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_cluster_outage_simulation: Adds `delete_on_create_timeout` attribute to indicate whether to delete the resource if its creation times out
+``` 

.changelog/3542.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_online_archive: Adds `delete_on_create_timeout` attribute to indicate whether to delete the resource if its creation times out
+``` 

.changelog/3543.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_privatelink_endpoint: Adds `delete_on_create_timeout` attribute to indicate whether to delete the resource if its creation times out
+``` 

.changelog/3545.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_privatelink_endpoint_service: Adds `delete_on_create_timeout` attribute to indicate whether to delete the resource if its creation times out
+``` 

docs/guides/2.0.0-upgrade-guide.md

@@ -0,0 +1,34 @@
+---
+layout: "mongodbatlas"
+page_title: "MongoDB Atlas Provider 2.0.0: Upgrade and Information Guide"
+sidebar_current: "docs-mongodbatlas-guides-200-upgrade-guide"
+description: |-
+MongoDB Atlas Provider 2.0.0: Upgrade and Information Guide
+---
+
+# MongoDB Atlas Provider 2.0.0: Upgrade and Information Guide
+
+**New Features** 
+
+The Terraform MongoDB Atlas Provider version 2.0.0 has the following new features:
+
+
+**Breaking Changes**
+
+- `export` and `auto_export_enabled` are now optional only arguments in `mongodbatlas_cloud_backup_schedule `. This facilitates tracking changes in their configurations. 
+
+- `hour_of_day` is now defined as required for `mongodbatlas_maintenance_window`resources. This clarification prevents errors when creating new resources. 
+
+- `actions` now is set as `TypeSet` in `mongodbatlas_custom_db_role`. This prevents plan diffs when reordering the `actions` in `mongodbatlas_custom_db_role` resource.  
+
+
+2.0.0 also includes general improvements, bug fixes, and several key documentation updates. See the [CHANGELOG](https://github.com/mongodb/terraform-provider-mongodbatlas/blob/master/CHANGELOG.md) for more specific information.
+
+
+### Helpful Links
+
+* [Report bugs](https://github.com/mongodb/terraform-provider-mongodbatlas/issues)
+
+* [Request Features](https://feedback.mongodb.com/forums/924145-atlas?category_id=370723)
+
+* [Contact Support](https://docs.atlas.mongodb.com/support/) covered by MongoDB Atlas support plans, Developer and above.

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 -->

docs/resources/cloud_backup_snapshot.md

@@ -57,6 +57,7 @@ resource "mongodbatlas_cloud_backup_snapshot_restore_job" "test" {
 * `description` - (Required) Description of the on-demand snapshot.
 * `retention_in_days` - (Required) The number of days that Atlas should retain the on-demand snapshot. Must be at least 1.
 * `timeouts`- (Optional) The duration of time to wait for Atlas to create a Cloud Backup Snapshot. The timeout value is defined by a signed sequence of decimal numbers with a time unit suffix such as: `1h45m`, `300s`, `10m`, etc. The valid time units are:  `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. Defaults to `1h`. Learn more about timeouts [here](https://www.terraform.io/plugin/sdkv2/resources/retries-and-customizable-timeouts).
+* `delete_on_create_timeout`- (Optional) Flag that indicates whether to delete the resource if creation times out. Default is `true`. When Terraform apply fails, it returns immediately without waiting for cleanup to complete. If you suspect a transient error, wait before retrying to allow resource deletion to finish.
 
 ## Attributes Reference
 

docs/resources/cluster_outage_simulation.md

@@ -43,6 +43,8 @@ resource "mongodbatlas_cluster_outage_simulation" "outage_simulation" {
     * `GCP`
     * `AZURE`
   * `region_name` - (Required) The Atlas name of the region to undergo an outage simulation.
+* `timeouts`- (Optional) The duration of time to wait for Cluster Outage Simulation to be created or deleted. The timeout value is defined by a signed sequence of decimal numbers with a time unit suffix such as: `1h45m`, `300s`, `10m`, etc. The valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. The default timeout for Cluster Outage Simulation create and delete is `25m`. Learn more about timeouts [here](https://www.terraform.io/plugin/sdkv2/resources/retries-and-customizable-timeouts).
+* `delete_on_create_timeout` - (Optional) Flag that indicates whether to delete the resource if creation times out. Default is `true`. When Terraform apply fails, it returns immediately without waiting for cleanup to complete. If you suspect a transient error, wait before retrying to allow resource deletion to finish.
 
 ## Attributes Reference