chore: Bring latest changes from master into dev branch (includes adopting latest stable SDK version)

.changelog/2436.txt

@@ -0,0 +1,11 @@
+```release-note:note
+resource/mongodbatlas_cloud_backup_snapshot_export_job: Deprecates the `err_msg` attribute
+```
+
+```release-note:note
+data-source/mongodbatlas_cloud_backup_snapshot_export_job: Deprecates the `err_msg` attribute
+```
+
+```release-note:note
+data-source/mongodbatlas_cloud_backup_snapshot_export_jobs: Deprecates the `err_msg` attribute
+```

.changelog/2462.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/mongodbatlas_organization: Fixes a bug in organization resource creation where the provider crashed
+```

.changelog/2463.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/mongodbatlas_alert_configuration: Fixes an issue where the `terraform apply` command crashes if you attempt to edit an existing `mongodbatlas_alert_configuration` by adding a value to `threshold_config`
+```

.changelog/2480.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/mongodbatlas_backup_compliance_policy: Fixes an issue where the update operation modified attributes that were not supposed to be modified"
+```

.changelog/2486.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+data-source/mongodbatlas_cloud_backup_snapshot_export_bucket: Adds Azure support
+```
+
+```release-note:enhancement
+resource/mongodbatlas_cloud_backup_snapshot_export_bucket: Adds Azure support
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_cloud_backup_snapshot_export_buckets: Adds Azure support
+```

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

@@ -103,6 +103,10 @@ on:
         required: true
       aws_s3_bucket_backup:
         required: true
+      azure_service_url_backup:
+        required: true
+      azure_blob_storage_container_backup:
+        required: true
       mongodb_atlas_ldap_hostname:
         required: true
       mongodb_atlas_ldap_username:
@@ -364,6 +368,11 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_access_key }}
           AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }}
           AWS_S3_BUCKET: ${{ secrets.aws_s3_bucket_backup }}
+          AZURE_BLOB_STORAGE_CONTAINER_NAME: ${{ secrets.azure_blob_storage_container_backup }}
+          AZURE_SERVICE_URL: ${{ secrets.azure_service_url_backup }}
+          AZURE_ATLAS_APP_ID: ${{ inputs.azure_atlas_app_id }}
+          AZURE_SERVICE_PRINCIPAL_ID: ${{ inputs.azure_service_principal_id }}
+          AZURE_TENANT_ID: ${{ inputs.azure_tenant_id }}
           ACCTEST_PACKAGES: |
             ./internal/service/cloudbackupschedule
             ./internal/service/cloudbackupsnapshot

.github/workflows/acceptance-tests.yml

@@ -63,6 +63,8 @@ jobs:
       aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       aws_s3_bucket_federation: ${{ secrets.AWS_S3_BUCKET_FEDERATION }}
       aws_s3_bucket_backup: ${{ secrets.AWS_S3_BUCKET_BACKUP }}
+      azure_service_url_backup: ${{ secrets.AZURE_SERVICE_URL_BACKUP }}
+      azure_blob_storage_container_backup: ${{ secrets.AZURE_BLOB_STORAGE_CONTAINER_BACKUP }}
       mongodb_atlas_ldap_hostname: ${{ secrets.MONGODB_ATLAS_LDAP_HOSTNAME }}
       mongodb_atlas_ldap_username: ${{ secrets.MONGODB_ATLAS_LDAP_USERNAME }}
       mongodb_atlas_ldap_password: ${{ secrets.MONGODB_ATLAS_LDAP_PASSWORD }}

.github/workflows/code-health.yml

@@ -47,7 +47,7 @@ jobs:
           go-version-file: 'go.mod'
           cache: false # see https://github.com/golangci/golangci-lint-action/issues/807
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64
+        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86
         with:
           version: v1.59.1 # Also update GOLANGCI_VERSION variable in GNUmakefile when updating this version
       - name: actionlint

CHANGELOG.md

@@ -2,6 +2,33 @@
 
 ENHANCEMENTS:
 
+* data-source/mongodbatlas_cloud_backup_snapshot_export_bucket: Adds Azure support ([#2486](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2486))
+* data-source/mongodbatlas_cloud_backup_snapshot_export_buckets: Adds Azure support ([#2486](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2486))
+* resource/mongodbatlas_cloud_backup_snapshot_export_bucket: Adds Azure support ([#2486](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2486))
+
+## 1.17.6 (August 07, 2024)
+
+BUG FIXES:
+
+* resource/mongodbatlas_backup_compliance_policy: Fixes an issue where the update operation modified attributes that were not supposed to be modified" ([#2480](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2480))
+
+## 1.17.5 (July 30, 2024)
+
+NOTES:
+
+* data-source/mongodbatlas_cloud_backup_snapshot_export_job: Deprecates the `err_msg` attribute ([#2436](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2436))
+* data-source/mongodbatlas_cloud_backup_snapshot_export_jobs: Deprecates the `err_msg` attribute ([#2436](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2436))
+* resource/mongodbatlas_cloud_backup_snapshot_export_job: Deprecates the `err_msg` attribute ([#2436](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2436))
+
+BUG FIXES:
+
+* resource/mongodbatlas_alert_configuration: Fixes an issue where the `terraform apply` command crashes if you attempt to edit an existing `mongodbatlas_alert_configuration` by adding a value to `threshold_config` ([#2463](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2463))
+* resource/mongodbatlas_organization: Fixes a bug in organization resource creation where the provider crashed ([#2462](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2462))
+
+## 1.17.4 (July 19, 2024)
+
+ENHANCEMENTS:
+
 * data-source/mongodbatlas_search_index: Adds attribute `stored_source` ([#2388](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2388))
 * data-source/mongodbatlas_search_indexes: Adds attribute `stored_source` ([#2388](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2388))
 * resource/mongodbatlas_search_index: Adds attribute `stored_source` ([#2388](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2388))

docs/data-sources/cloud_backup_snapshot_export_bucket.md

@@ -30,9 +30,13 @@ data "mongodbatlas_cloud_backup_snapshot_export_bucket" "test" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `iam_role_id` - Unique identifier of the role that Atlas can use to access the bucket. You must also specify the `bucket_name`.
-* `bucket_name` - Name of the bucket that the provided role ID is authorized to access. You must also specify the `iam_role_id`.
-* `cloud_provider` - Name of the provider of the cloud service where Atlas can access the S3 bucket. Atlas only supports `AWS`.
+* `iam_role_id` - Unique identifier of the role that Atlas can use to access the bucket.
+* `bucket_name` - Name of the bucket that the provided role ID is authorized to access.
+* `cloud_provider` - Name of the provider of the cloud service where Atlas can access the S3 bucket.
+* `role_id` - Unique identifier of the Azure Service Principal that Atlas can use to access the Azure Blob Storage Container.
+* `service_url` - URL that identifies the blob Endpoint of the Azure Blob Storage Account.
+* `tenant_id` - UUID that identifies the Azure Active Directory Tenant ID.
+
 
 
 

docs/data-sources/cloud_backup_snapshot_export_buckets.md

@@ -39,9 +39,12 @@ In addition to all arguments above, the following attributes are exported:
 ### CloudProviderSnapshotExportBucket
 * `project_id` - The unique identifier of the project for the Atlas cluster.
 * `export_bucket_id` -	Unique identifier of the snapshot bucket id.
-* `iam_role_id` - Unique identifier of the role that Atlas can use to access the bucket. You must also specify the `bucket_name`.
-* `bucket_name` - Name of the bucket that the provided role ID is authorized to access. You must also specify the `iam_role_id`.
-* `cloud_provider` - Name of the provider of the cloud service where Atlas can access the S3 bucket. Atlas only supports `AWS`.
+* `iam_role_id` - Unique identifier of the role that Atlas can use to access the bucket.
+* `bucket_name` - Name of the bucket that the provided role ID is authorized to access.
+* `cloud_provider` - Name of the provider of the cloud service where Atlas can access the S3 bucket.
+* `role_id` - Unique identifier of the Azure Service Principal that Atlas can use to access the Azure Blob Storage Container.
+* `service_url` - URL that identifies the blob Endpoint of the Azure Blob Storage Account.
+* `tenant_id` - UUID that identifies the Azure Active Directory Tenant ID.
 
 
 For more information see: [MongoDB Atlas API Reference.](https://docs.atlas.mongodb.com/reference/api/cloud-backup/export/create-one-export-bucket/)

docs/data-sources/cloud_backup_snapshot_export_job.md

@@ -49,7 +49,7 @@ In addition to all arguments above, the following attributes are exported:
 * `custom_data` - Custom data to include in the metadata file named `.complete` that Atlas uploads to the bucket when the export job finishes. Custom data can be specified as key and value pairs.
 * `components` - _Returned for sharded clusters only._ Export job details for each replica set in the sharded cluster.
 * `created_at` - Timestamp in ISO 8601 date and time format in UTC when the export job was created.
-* `err_msg` - Error message, only if the export job failed.
+* `err_msg` - Error message, only if the export job failed. **Note:** This attribute is deprecated as it is not being used.
 * `export_status` - _Returned for replica set only._ Status of the export job.
 * `finished_at` - Timestamp in ISO 8601 date and time format in UTC when the export job completes.
 * `export_job_id` - Unique identifier of the export job.

docs/data-sources/cloud_backup_snapshot_export_jobs.md

@@ -58,7 +58,7 @@ In addition to all arguments above, the following attributes are exported:
 * `custom_data` - Custom data to include in the metadata file named `.complete` that Atlas uploads to the bucket when the export job finishes. Custom data can be specified as key and value pairs.
 * `components` - _Returned for sharded clusters only._ Export job details for each replica set in the sharded cluster.
 * `created_at` - Timestamp in ISO 8601 date and time format in UTC when the export job was created.
-* `err_msg` - Error message, only if the export job failed.
+* `err_msg` - Error message, only if the export job failed. **Note:** This attribute is deprecated as it is not being used.
 * `export_status` - _Returned for replica set only._ Status of the export job.
 * `finished_at` - Timestamp in ISO 8601 date and time format in UTC when the export job completes.
 * `export_job_id` - Unique identifier of the export job.

docs/index.md

@@ -219,7 +219,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.17.3/examples)
+We have [example configurations](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v1.17.6/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/cloud_backup_snapshot_export_bucket.md

@@ -7,6 +7,9 @@
 
 ## Example Usage
 
+
+### AWS Example
+
 ```terraform
 resource "mongodbatlas_cloud_backup_snapshot_export_bucket" "test" {
   project_id   = "{PROJECT_ID}"
@@ -16,12 +19,28 @@ resource "mongodbatlas_cloud_backup_snapshot_export_bucket" "test" {
 }
 ```
 
+### Azure Example
+
+```terraform
+resource "mongodbatlas_cloud_backup_snapshot_export_bucket" "test" {
+  project_id   = "{PROJECT_ID}"
+  role_id = "{ROLE_ID}"
+  service_url = "{SERVICE_URL}"
+  tenant_id = "{TENANT_ID}"
+  bucket_name = "example-bucket"
+  cloud_provider = "AZURE"
+}
+```
+
 ## Argument Reference
 
 * `project_id` - (Required) The unique identifier of the project for the Atlas cluster.
-* `iam_role_id` - (Required) Unique identifier of the role that Atlas can use to access the bucket. You must also specify the `bucket_name`.
-* `bucket_name` - (Required) Name of the bucket that the provided role ID is authorized to access. You must also specify the `iam_role_id`.
-* `cloud_provider` - (Required) Name of the provider of the cloud service where Atlas can access the S3 bucket. Atlas only supports `AWS`.
+* `bucket_name` - (Required) Name of the bucket that the provided role ID is authorized to access.
+* `cloud_provider` - (Required) Name of the provider of the cloud service where Atlas can access the S3 bucket.
+* `iam_role_id` - Unique identifier of the role that Atlas can use to access the bucket. Required if `cloud_provider` is set to `AWS`.
+* `role_id` - Unique identifier of the Azure Service Principal that Atlas can use to access the Azure Blob Storage Container. Required if `cloud_provider` is set to `AZURE`.
+* `service_url` - URL that identifies the blob Endpoint of the Azure Blob Storage Account. Required if `cloud_provider` is set to `AZURE`.
+* `tenant_id` - UUID that identifies the Azure Active Directory Tenant ID. Required if `cloud_provider` is set to `AZURE`.
 
 ## Attributes Reference
 

docs/resources/cloud_backup_snapshot_export_job.md

@@ -101,7 +101,7 @@ In addition to all arguments above, the following attributes are exported:
 
 * `components` - _Returned for sharded clusters only._ Export job details for each replica set in the sharded cluster.
 * `created_at` - Timestamp in ISO 8601 date and time format in UTC when the export job was created.
-* `err_msg` - Error message, only if the export job failed.
+* `err_msg` - Error message, only if the export job failed. **Note:** This attribute is deprecated as it is not being used.
 * `export_status` - _Returned for replica set only._ Status of the export job.
 * `finished_at` - Timestamp in ISO 8601 date and time format in UTC when the export job completes.
 * `export_job_id` - Unique identifier of the export job.

examples/mongodbatlas_cloud_backup_snapshot_export_bucket/aws/README.md

@@ -0,0 +1,16 @@
+# MongoDB Atlas Provider - Atlas Cloud Backup Snapshot Export Bucket in AWS
+
+This example shows how to set up Cloud Backup Snapshot Export Bucket in Atlas through Terraform.
+
+You must set the following variables:
+
+- `public_key`: Atlas public key
+- `private_key`: Atlas  private key
+- `project_id`: Unique 24-hexadecimal digit string that identifies the project where the stream instance will be created.
+- `access_key`: AWS Access Key
+- `secret_key`: AWS Secret Key.
+- `aws_region`: AWS region.
+
+To learn more, see the [Export Cloud Backup Snapshot Documentation](https://www.mongodb.com/docs/atlas/backup/cloud-backup/export/).
+
+

examples/mongodbatlas_cloud_backup_snapshot_export_bucket/azure/README.md

@@ -0,0 +1,21 @@
+# MongoDB Atlas Provider - Atlas Cloud Backup Snapshot Export Bucket in Azure
+
+This example shows how to set up Cloud Backup Snapshot Export Bucket in Atlas through Terraform.
+
+You must set the following variables:
+
+- `public_key`: Atlas public key.
+- `private_key`: Atlas  private key.
+- `project_id`: Unique 24-hexadecimal digit string that identifies the project where the stream instance will be created.
+- `azure_tenant_id`: The Tenant ID which should be used.
+- `subscription_id`: Azure Subscription ID.
+- `client_id`: Azure Client ID.
+- `client_secret`: Azure Client Secret.
+- `tenant_id`: Azure Tenant ID.
+- `azure_atlas_app_id`: The client ID of the application for which to create a service principal.
+- `azure_resource_group_location`: The Azure Region where the Resource Group should exist.
+- `storage_account_name`: Specifies the name of the storage account.
+
+To learn more, see the [Export Cloud Backup Snapshot Documentation](https://www.mongodb.com/docs/atlas/backup/cloud-backup/export/).
+
+

examples/mongodbatlas_cloud_backup_snapshot_export_bucket/azure/azure.tf

@@ -0,0 +1,30 @@
+resource "azuread_service_principal" "mongo" {
+  client_id                    = var.azure_atlas_app_id
+  app_role_assignment_required = false
+}
+
+# Define the resource group
+resource "azurerm_resource_group" "test_resource_group" {
+  name     = "mongo-test-resource-group"
+  location = var.azure_resource_group_location
+}
+
+resource "azurerm_storage_account" "test_storage_account" {
+  name                     = var.storage_account_name
+  resource_group_name      = azurerm_resource_group.test_resource_group.name
+  location                 = azurerm_resource_group.test_resource_group.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_storage_container" "test_storage_container" {
+  name                  = "mongo-test-storage-container"
+  storage_account_name  = azurerm_storage_account.test_storage_account.name
+  container_access_type = "private"
+}
+
+resource "azurerm_role_assignment" "test_role_assignment" {
+  principal_id         = azuread_service_principal.mongo.id
+  role_definition_name = "Storage Blob Data Contributor"
+  scope                = azurerm_storage_account.test_storage_account.id
+}

examples/mongodbatlas_cloud_backup_snapshot_export_bucket/azure/main.tf

@@ -0,0 +1,30 @@
+resource "mongodbatlas_cloud_provider_access_setup" "setup_only" {
+  project_id    = var.project_id
+  provider_name = "AZURE"
+  azure_config {
+    atlas_azure_app_id   = var.azure_atlas_app_id
+    service_principal_id = azuread_service_principal.mongo.id
+    tenant_id            = var.tenant_id
+  }
+}
+
+resource "mongodbatlas_cloud_provider_access_authorization" "auth_role" {
+  project_id = var.project_id
+  role_id    = mongodbatlas_cloud_provider_access_setup.setup_only.role_id
+
+  azure {
+    atlas_azure_app_id   = var.azure_atlas_app_id
+    service_principal_id = azuread_service_principal.mongo.id
+    tenant_id            = var.tenant_id
+  }
+}
+
+
+resource "mongodbatlas_cloud_backup_snapshot_export_bucket" "test" {
+  project_id     = var.tenant_id
+  bucket_name    = azurerm_storage_container.test_storage_container.name
+  cloud_provider = "AZURE"
+  service_url    = azurerm_storage_account.test_storage_account.primary_blob_endpoint
+  role_id        = mongodbatlas_cloud_provider_access_authorization.auth_role.role_id
+  tenant_id      = var.tenant_id
+}

examples/mongodbatlas_cloud_backup_snapshot_export_bucket/azure/provider.tf

@@ -0,0 +1,15 @@
+provider "mongodbatlas" {
+  public_key  = var.public_key
+  private_key = var.private_key
+}
+provider "azuread" {
+  tenant_id = var.azure_tenant_id
+}
+provider "azurerm" {
+  subscription_id = var.subscription_id
+  client_id       = var.client_id
+  client_secret   = var.client_secret
+  tenant_id       = var.tenant_id
+  features {
+  }
+}

examples/mongodbatlas_cloud_backup_snapshot_export_bucket/azure/variables.tf

@@ -0,0 +1,40 @@
+variable "public_key" {
+  description = "The public API key for MongoDB Atlas"
+  type        = string
+}
+variable "private_key" {
+  description = "The private API key for MongoDB Atlas"
+  type        = string
+}
+variable "project_id" {
+  description = "Atlas project ID"
+  type        = string
+}
+variable "azure_tenant_id" {
+  type = string
+}
+variable "subscription_id" {
+  default = "Azure Subscription ID"
+  type    = string
+}
+variable "client_id" {
+  default = "Azure Client ID"
+  type    = string
+}
+variable "client_secret" {
+  default = "Azure Client Secret"
+  type    = string
+}
+variable "tenant_id" {
+  default = "Azure Tenant ID"
+  type    = string
+}
+variable "azure_atlas_app_id" {
+  type = string
+}
+variable "azure_resource_group_location" {
+  type = string
+}
+variable "storage_account_name" {
+  type = string
+}

examples/mongodbatlas_cloud_backup_snapshot_export_bucket/azure/versions.tf

@@ -0,0 +1,17 @@
+terraform {
+  required_providers {
+    azuread = {
+      source  = "hashicorp/azuread"
+      version = "~> 2.53.1"
+    }
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 3.0"
+    }
+    mongodbatlas = {
+      source  = "mongodb/mongodbatlas"
+      version = "~> 1.0"
+    }
+  }
+  required_version = ">= 1.0"
+}