Merge branch 'master' into CLOUDP-270155-access-dev

* master: doc: Adds 1.19.0 release upgrade guide (#2564) chore: Updates CHANGELOG.md for #2528 feat: Supports change_stream_options_pre_and_post_images_expire_after_seconds in `mongodbatlas_cluster` and `mongodbatlas_advanced_cluster` (#2528) chore: Disables preview mode for EAR private endpoint so it may be normally accessible (#2571) doc: Adds support for SDK_BRANCH in schema generation (#2562) update git workflow (#2572) chore: Updates CHANGELOG.md for #2566 feat: Adds `mongodbatlas_stream_processor` resource and data sources (#2566) chore: Updates CHANGELOG.md for #2569 chore: Merges Azure KMS Encryption at Rest Private Endpoint feature to master (#2569) chore: Updates CHANGELOG.md for #2568 doc: Includes sync_creation into mongodbatlas_online_archive resource documentation (#2567) fix: Sets correct `zone_id` when `use_replication_spec_per_shard` is false and refactors `replica_set_scaling_strategy` handling with old schema of advanced cluster (#2568) chore: Updates CHANGELOG.md for #2539 feat: Support `replica_set_scaling_strategy` in `mongodbatlas_advanced_cluster` (#2539) adding changelog entry for 1.18.1 to avoid confusion (#2561) # Conflicts: # internal/provider/provider.go
mongodb · Sep 10, 2024 · 8f04320 · 8f04320
2 parents 7b92a09 + cbfbe75
commit 8f04320
Show file tree

Hide file tree

Showing 125 changed files with 6,856 additions and 825 deletions.
diff --git a/.changelog/2497.txt b/.changelog/2497.txt
@@ -0,0 +1,3 @@
+```release-note:new-datasource
+data-source/mongodbatlas_stream_processor
+```
diff --git a/.changelog/2501.txt b/.changelog/2501.txt
@@ -0,0 +1,3 @@
+```release-note:new-resource
+mongodbatlas_stream_processor
+```
diff --git a/.changelog/2509.txt b/.changelog/2509.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/mongodbatlas_encryption_at_rest: Adds new `azure_key_vault_config.#.require_private_networking` field to enable connection to Azure Key Vault over private networking
+```
diff --git a/.changelog/2512.txt b/.changelog/2512.txt
@@ -0,0 +1,3 @@
+```release-note:new-resource
+resource/mongodbatlas_encryption_at_rest_private_endpoint
+```
diff --git a/.changelog/2527.txt b/.changelog/2527.txt
@@ -0,0 +1,3 @@
+```release-note:new-datasource
+data-source/mongodbatlas_encryption_at_rest_private_endpoint
+```
diff --git a/.changelog/2528.txt b/.changelog/2528.txt
@@ -0,0 +1,23 @@
+```release-note:enhancement
+resource/mongodbatlas_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_clusters: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute
+```
+
+```release-note:enhancement
+resource/mongodbatlas_advanced_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_advanced_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_advanced_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute
+```
diff --git a/.changelog/2536.txt b/.changelog/2536.txt
@@ -0,0 +1,3 @@
+```release-note:new-datasource
+data-source/mongodbatlas_encryption_at_rest_private_endpoints
+```
diff --git a/.changelog/2538.txt b/.changelog/2538.txt
@@ -0,0 +1,7 @@
+```release-note:new-datasource
+data-source/mongodbatlas_encryption_at_rest
+```
+
+```release-note:enhancement
+resource/mongodbatlas_encryption_at_rest: Adds `aws_kms_config.0.valid`, `azure_key_vault_config.0.valid` and `google_cloud_kms_config.0.valid` attribute
+```
diff --git a/.changelog/2539.txt b/.changelog/2539.txt
@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/mongodbatlas_advanced_cluster: supports replica_set_scaling_strategy attribute
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_advanced_cluster: supports replica_set_scaling_strategy attribute
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_advanced_clusters: supports replica_set_scaling_strategy attribute
+```
diff --git a/.changelog/2566.txt b/.changelog/2566.txt
@@ -0,0 +1,3 @@
+```release-note:new-datasource
+data-source/mongodbatlas_stream_processors
+```
diff --git a/.changelog/2568.txt b/.changelog/2568.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/mongodbatlas_advanced_clusters: Sets correct `zone_id` when `use_replication_spec_per_shard` is false
+```
diff --git a/.github/workflows/acceptance-tests-runner.yml b/.github/workflows/acceptance-tests-runner.yml
@@ -86,6 +86,15 @@ on:
       mongodb_atlas_federated_settings_associated_domain:
         type: string
         required: true
+      mongodb_atlas_project_ear_pe_id:
+        type: string
+        required: true
+      mongodb_atlas_enable_preview:
+        type: string
+        required: true
+      azure_private_endpoint_region:
+        type: string
+        required: true
     secrets: # all secrets are passed explicitly in this workflow
       mongodb_atlas_public_key:
         required: true
@@ -135,6 +144,18 @@ on:
         required: true
       azure_vnet_name_updated:
         required: true
+      azure_client_id:
+        required: true
+      azure_key_vault_name:
+        required: true
+      azure_key_identifier:
+        required: true
+      azure_key_vault_name_updated:
+        required: true
+      azure_key_identifier_updated:
+        required: true
+      azure_app_secret:
+        required: true
 
 env:
   TF_ACC: 1
@@ -235,10 +256,9 @@ jobs:
             - 'internal/service/rolesorgid/*.go'
             - 'internal/service/team/*.go'
             - 'internal/service/thirdpartyintegration/*.go'
-          data_lake:
-            - 'internal/service/datalakepipeline/*.go'
           encryption:
-            - 'internal/service/encryptionatrest/*.go'  
+            - 'internal/service/encryptionatrest/*.go' 
+            - 'internal/service/encryptionatrestprivateendpoint/*.go'
           event_trigger:
             - 'internal/service/eventtrigger/*.go'  
           federated:
@@ -280,6 +300,7 @@ jobs:
           stream:
             - 'internal/service/streamconnection/*.go'
             - 'internal/service/streaminstance/*.go'
+            - 'internal/service/streamprocessor/*.go'
           control_plane_ip_addresses:
             - 'internal/service/controlplaneipaddresses/*.go'
 
@@ -473,28 +494,6 @@ jobs:
             ./internal/service/team
             ./internal/service/thirdpartyintegration
         run: make testacc
-
-  data_lake:
-    needs: [ change-detection, get-provider-version ]
-    if: ${{ needs.change-detection.outputs.data_lake == 'true' || inputs.test_group == 'data_lake' }}
-    runs-on: ubuntu-latest
-    permissions: {}
-    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-        with:
-          ref: ${{ inputs.ref || github.ref }}
-      - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
-        with:
-          go-version-file: 'go.mod'
-      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd
-        with:
-          terraform_version: ${{ inputs.terraform_version }}
-          terraform_wrapper: false    
-      - name: Acceptance Tests
-        env:
-          MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
-          ACCTEST_PACKAGES: ./internal/service/datalakepipeline
-        run: make testacc
 
   encryption:
     needs: [ change-detection, get-provider-version ]
@@ -515,7 +514,21 @@ jobs:
       - name: Acceptance Tests
         env:
           MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
-          ACCTEST_PACKAGES: ./internal/service/encryptionatrest
+          ACCTEST_PACKAGES: |
+           ./internal/service/encryptionatrest
+           ./internal/service/encryptionatrestprivateendpoint
+          MONGODB_ATLAS_PROJECT_EAR_PE_ID: ${{ inputs.mongodb_atlas_project_ear_pe_id }}
+          AZURE_PRIVATE_ENDPOINT_REGION: ${{ inputs.azure_private_endpoint_region }}
+          AZURE_CLIENT_ID: ${{ secrets.azure_client_id }}
+          AZURE_RESOURCE_GROUP_NAME: ${{ secrets.azure_resource_group_name }}
+          AZURE_SUBSCRIPTION_ID: ${{ secrets.azure_subscription_id }}
+          AZURE_TENANT_ID: ${{ vars.azure_tenant_id }}
+          AZURE_APP_SECRET: ${{ secrets.azure_app_secret }}
+          AZURE_KEY_VAULT_NAME: ${{ secrets.azure_key_vault_name }}
+          AZURE_KEY_IDENTIFIER: ${{ secrets.azure_key_identifier }}
+          AZURE_KEY_VAULT_NAME_UPDATED: ${{ secrets.azure_key_vault_name_updated }}
+          AZURE_KEY_IDENTIFIER_UPDATED: ${{ secrets.azure_key_identifier_updated }}
+          MONGODB_ATLAS_ENABLE_PREVIEW: ${{ inputs.mongodb_atlas_enable_preview }}
         run: make testacc
 
   event_trigger:
@@ -835,6 +848,7 @@ jobs:
           ACCTEST_PACKAGES: |
             ./internal/service/streamconnection
             ./internal/service/streaminstance
+            ./internal/service/streamprocessor
         run: make testacc
 
   control_plane_ip_addresses:

diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -77,6 +77,12 @@ jobs:
       azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       azure_vnet_name: ${{ secrets.AZURE_VNET_NAME }}
       azure_vnet_name_updated: ${{ secrets.AZURE_VNET_NAME_UPDATED }}
+      azure_client_id: ${{ secrets.AZURE_CLIENT_ID }}
+      azure_key_vault_name: ${{ secrets.AZURE_KEY_VAULT_NAME }}
+      azure_key_identifier: ${{ secrets.AZURE_KEY_IDENTIFIER }}
+      azure_key_vault_name_updated: ${{ secrets.AZURE_KEY_VAULT_NAME_UPDATED }}
+      azure_key_identifier_updated: ${{ secrets.AZURE_KEY_IDENTIFIER_UPDATED }}
+      azure_app_secret: ${{ secrets.AZURE_APP_SECRET }}
 
     with:
       terraform_version: ${{ inputs.terraform_version || vars.TF_VERSION_LATEST }}
@@ -104,3 +110,6 @@ jobs:
       mongodb_atlas_gov_org_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_GOV_ORG_ID_QA || vars.MONGODB_ATLAS_GOV_ORG_ID_DEV }}
       mongodb_atlas_gov_project_owner_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_GOV_PROJECT_OWNER_ID_QA || vars.MONGODB_ATLAS_GOV_PROJECT_OWNER_ID_DEV }}
       mongodb_atlas_federated_settings_associated_domain: ${{ vars.MONGODB_ATLAS_FEDERATED_SETTINGS_ASSOCIATED_DOMAIN }}
+      mongodb_atlas_project_ear_pe_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_PROJECT_EAR_PE_ID_QA || vars.MONGODB_ATLAS_PROJECT_EAR_PE_ID_DEV }}
+      mongodb_atlas_enable_preview: ${{ vars.MONGODB_ATLAS_ENABLE_PREVIEW }}
+      azure_private_endpoint_region: ${{ vars.AZURE_PRIVATE_ENDPOINT_REGION }}
diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
@@ -70,13 +70,19 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       - run: make tools # all resources with auto-generated doc must be specified below here 
       - name: Doc for control_plane_ip_addresses
-        run: export resource_name=control_plane_ip_addresses && make generate-doc
+        run: make generate-doc resource_name=control_plane_ip_addresses
       - name: Doc for push_based_log_export
-        run: export resource_name=push_based_log_export && make generate-doc
+        run: make generate-doc resource_name=push_based_log_export
       - name: Doc for search_deployment
-        run: export resource_name=search_deployment && make generate-doc
+        run: make generate-doc resource_name=search_deployment
+      - name: Doc for encryption_at_rest
+        run: make generate-doc resource_name=encryption_at_rest
+      - name: Doc for encryption_at_rest_private_endpoint
+        run: make generate-doc resource_name=encryption_at_rest_private_endpoint
       - name: Doc for project_ip_addresses
-        run: export resource_name=project_ip_addresses && make generate-doc
+        run: make generate-doc resource_name=project_ip_addresses
+      - name: Doc for stream_processor
+        run: make generate-doc resource_name=stream_processor 
       - name: Find mutations
         id: self_mutation
         run: |-

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,10 +8,39 @@ NOTES:
 
 FEATURES:
 
+* **New Data Source:** `data-source/mongodbatlas_encryption_at_rest` ([#2538](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2538))
+* **New Data Source:** `data-source/mongodbatlas_encryption_at_rest_private_endpoint` ([#2527](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2527))
+* **New Data Source:** `data-source/mongodbatlas_encryption_at_rest_private_endpoints` ([#2536](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2536))
 * **New Data Source:** `data-source/mongodbatlas_project_ip_addresses` ([#2533](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2533))
+* **New Data Source:** `data-source/mongodbatlas_stream_processor` ([#2497](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2497))
+* **New Data Source:** `data-source/mongodbatlas_stream_processors` ([#2566](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2566))
+* **New Resource:** `mongodbatlas_stream_processor` ([#2501](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2501))
+* **New Resource:** `resource/mongodbatlas_encryption_at_rest_private_endpoint` ([#2512](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2512))
+
+ENHANCEMENTS:
+
+* data-source/mongodbatlas_advanced_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute ([#2528](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2528))
+* data-source/mongodbatlas_advanced_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute ([#2528](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2528))
+* data-source/mongodbatlas_advanced_cluster: supports replica_set_scaling_strategy attribute ([#2539](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2539))
+* data-source/mongodbatlas_advanced_clusters: supports replica_set_scaling_strategy attribute ([#2539](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2539))
+* data-source/mongodbatlas_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute ([#2528](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2528))
+* data-source/mongodbatlas_clusters: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute ([#2528](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2528))
+* resource/mongodbatlas_advanced_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute ([#2528](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2528))
+* resource/mongodbatlas_advanced_cluster: supports replica_set_scaling_strategy attribute ([#2539](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2539))
+* resource/mongodbatlas_cluster: Supports change_stream_options_pre_and_post_images_expire_after_seconds attribute ([#2528](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2528))
+* resource/mongodbatlas_encryption_at_rest: Adds `aws_kms_config.0.valid`, `azure_key_vault_config.0.valid` and `google_cloud_kms_config.0.valid` attribute ([#2538](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2538))
+* resource/mongodbatlas_encryption_at_rest: Adds new `azure_key_vault_config.#.require_private_networking` field to enable connection to Azure Key Vault over private networking ([#2509](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2509))
+
+BUG FIXES:
+
+* data-source/mongodbatlas_advanced_clusters: Sets correct `zone_id` when `use_replication_spec_per_shard` is false ([#2568](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2568))
 
 ## 1.18.1 (August 26, 2024)
 
+NOTES:
+
+* resource/mongodbatlas_advanced_cluster: Documentation adjustment in resource and migration guide to clarify potential `Internal Server Error` when applying updates with new sharding configuration ([#2525](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/2525))
+
 ## 1.18.0 (August 14, 2024)
 
 BREAKING CHANGES:

diff --git a/GNUmakefile b/GNUmakefile
@@ -124,8 +124,10 @@ scaffold-schemas:
 
 
 .PHONY: generate-doc
-generate-doc: ## Generate the resource documentation via tfplugindocs
-	./scripts/generate-doc.sh ${resource_name}
+# e.g. run: make generate-doc resource_name=search_deployment
+# generate the resource documentation via tfplugindocs
+generate-doc: 
+	@scripts/generate-doc.sh ${resource_name}
 
 .PHONY: update-tf-compatibility-matrix
 update-tf-compatibility-matrix: ## Update Terraform Compatibility Matrix documentation

diff --git a/contributing/development-setup.md b/contributing/development-setup.md
@@ -218,15 +218,12 @@ You must also configure the following environment variables before running the t
   export AZURE_CLIENT_ID=<YOUR_CLIENT_ID>
   export AZURE_SUBSCRIPTION_ID=<YOUR_SUBSCRIPTION_ID>
   export AZURE_RESOURCE_GROUP_NAME=<YOUR_RESOURCE_GROUP_NAME>
-  export AZURE_SECRET=<YOUR_SECRET>
+  export AZURE_APP_SECRET=<YOUR_SECRET>
   export AZURE_KEY_VAULT_NAME=<YOUR_KEY_VAULT_NAME>
   export AZURE_KEY_IDENTIFIER=<YOUR_KEY_IDENTIFIER>
   export AZURE_TENANT_ID=<YOUR_TENANT_ID>
   export AZURE_DIRECTORY_ID=<YOUR_DIRECTORY_ID>
 
-  export AZURE_CLIENT_ID_UPDATED=<YOUR_CLIENT_ID_UPDATED>
-  export AZURE_RESOURCE_GROUP_NAME_UPDATED=<YOUR_RESOURCE_GROUP_NAME_UPDATED>
-  export AZURE_SECRET_UPDATED=<YOUR_SECRET_UPDATED>
   export AZURE_KEY_VAULT_NAME_UPDATED=<YOUR_KEY_VAULT_NAME_UPDATED>
   export AZURE_KEY_IDENTIFIER_UPDATED=<YOUR_KEY_IDENTIFIER_UPDATED>
   ```

diff --git a/contributing/documentation.md b/contributing/documentation.md
@@ -12,5 +12,5 @@ We autogenerate the documentation of our provider resources and data sources via
 - Add the resource/data source templates to the [templates](https://github.com/mongodb/terraform-provider-mongodbatlas/blob/master/templates) folder. See [README.md](https://github.com/mongodb/terraform-provider-mongodbatlas/blob/master/templates/README.md) for more info.
 - Run the Makefile command `generate-doc`
 ```bash
-export resource_name=search_deployment && make generate-doc
+make generate-doc resource_name=search_deployment
 ```
diff --git a/docs/data-sources/advanced_cluster.md b/docs/data-sources/advanced_cluster.md
@@ -103,6 +103,7 @@ In addition to all arguments above, the following attributes are exported:
 * `version_release_system` - Release cadence that Atlas uses for this cluster.
 * `advanced_configuration` - Get the advanced configuration options. See [Advanced Configuration](#advanced-configuration) below for more details.
 * `global_cluster_self_managed_sharding` - Flag that indicates if cluster uses Atlas-Managed Sharding (false) or Self-Managed Sharding (true).
+* `replica_set_scaling_strategy` - (Optional) Replica set scaling mode for your cluster.
 
 ### bi_connector_config
 
@@ -196,6 +197,7 @@ Key-value pairs that categorize the cluster. Each key and value has a maximum le
 * `sample_size_bi_connector` - Number of documents per database to sample when gathering schema information. Defaults to 100. Available only for Atlas deployments in which BI Connector for Atlas is enabled.
 * `sample_refresh_interval_bi_connector` - Interval in seconds at which the mongosqld process re-samples data to create its relational schema. The default value is 300. The specified value must be a positive integer. Available only for Atlas deployments in which BI Connector for Atlas is enabled.
 * `transaction_lifetime_limit_seconds` - Lifetime, in seconds, of multi-document transactions. Defaults to 60 seconds.
+* `change_stream_options_pre_and_post_images_expire_after_seconds` - (Optional) The minimum pre- and post-image retention time in seconds.
 
 ## Attributes Reference
 

diff --git a/docs/data-sources/advanced_clusters.md b/docs/data-sources/advanced_clusters.md
@@ -105,6 +105,7 @@ In addition to all arguments above, the following attributes are exported:
 * `version_release_system` - Release cadence that Atlas uses for this cluster.
 * `advanced_configuration` - Get the advanced configuration options. See [Advanced Configuration](#advanced-configuration) below for more details.
 * `global_cluster_self_managed_sharding` - Flag that indicates if cluster uses Atlas-Managed Sharding (false) or Self-Managed Sharding (true).
+* `replica_set_scaling_strategy` - (Optional) Replica set scaling mode for your cluster.
 
 ### bi_connector_config
 
@@ -198,6 +199,8 @@ Key-value pairs that categorize the cluster. Each key and value has a maximum le
 * `oplog_min_retention_hours` - Minimum retention window for cluster's oplog expressed in hours. A value of null indicates that the cluster uses the default minimum oplog window that MongoDB Cloud calculates.
 * `sample_size_bi_connector` - Number of documents per database to sample when gathering schema information. Defaults to 100. Available only for Atlas deployments in which BI Connector for Atlas is enabled.
 * `sample_refresh_interval_bi_connector` - Interval in seconds at which the mongosqld process re-samples data to create its relational schema. The default value is 300. The specified value must be a positive integer. Available only for Atlas deployments in which BI Connector for Atlas is enabled.
+* `transaction_lifetime_limit_seconds` - (Optional) Lifetime, in seconds, of multi-document transactions. Defaults to 60 seconds.
+* `change_stream_options_pre_and_post_images_expire_after_seconds` - (Optional) The minimum pre- and post-image retention time in seconds.
 
 
 ## Attributes Reference

diff --git a/docs/data-sources/cluster.md b/docs/data-sources/cluster.md
@@ -231,5 +231,6 @@ Contains a key-value pair that tags that the cluster was created by a Terraform
 * `sample_size_bi_connector` - Number of documents per database to sample when gathering schema information. Defaults to 100. Available only for Atlas deployments in which BI Connector for Atlas is enabled.
 * `sample_refresh_interval_bi_connector` - Interval in seconds at which the mongosqld process re-samples data to create its relational schema. The default value is 300. The specified value must be a positive integer. Available only for Atlas deployments in which BI Connector for Atlas is enabled.
 * `transaction_lifetime_limit_seconds` - Lifetime, in seconds, of multi-document transactions. Defaults to 60 seconds.
+* `change_stream_options_pre_and_post_images_expire_after_seconds` - (Optional) The minimum pre- and post-image retention time in seconds.
 
 See detailed information for arguments and attributes: [MongoDB API Clusters](https://docs.atlas.mongodb.com/reference/api/clusters-create-one/)