chore: Update CLOUDP-320243-dev-2.0.0 from master (#3457)

* chore: Creates temporary workflow to create a test tag using Github actions (#3440)

* chore: Use rebase instead of merge to update dev branches (#3442)

* use rebase instead of merge to update dev branches

* Update .github/workflows/update-dev-branches.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* improve doc

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* chore: Updates repository to use supported Terraform versions (#3450)

Co-authored-by: maastha <122359335+maastha@users.noreply.github.com>

* chore: JSON attributes in auto-generated resources (#3445)

* stream_processor_api config

* marshal JSON custom type

* generate JSON custom type

* formatGoFile

* generated code

* acc test

* fix resouce.tmpl imports

* revert changes to template

* add import for custom types

* wait

* marshal tests

* autogen tests

* acc test with update of equivalent pipeline JSON

* unmarshal test for custom type list

* marshal error test

* join acc tests

* update generated code

* fix marshal tests

* fix delete config

* same config as curated resource

* chore: Use SP10 instead of default SP30 for stream_instance acceptance tests (#3453)

* use SP10 instead of default SP30 for stream_instance

* fix linter

* Revert "fix linter"

This reverts commit 46270c0.

* chore: Replace fwtypes.JSONStringType with jsontypes.NormalizedType (#3452)

* use JSON custom type

* fix linter

* chore: Updates Atlas Go SDK (#3446)

* build(deps): bump go.mongodb.org/atlas-sdk

* sdk changes

---------

Co-authored-by: oarbusi <55513886+oarbusi@users.noreply.github.com>
Co-authored-by: Oriol Arbusi Abadal <oriol.abadal@mongodb.com>

* doc: Updates Terraform Compatibility Matrix documentation (#3449)

Co-authored-by: maastha <122359335+maastha@users.noreply.github.com>

* chore: Remove `links` attributes in auto-generated resources (#3455)

* remove links attributes

* move comment

* chore: Fixes broken link because of ending parenthesis. (#3448)

* chore: Fixes broken link because of ending parenthesis.

* using link markdown syntax to avoid broken link

---------

Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com>

* feat: Adds `send_user_provided_resource_tags` attribute for `mongodbatlas_third_party_integration` (#3454)

* add send_user_provided_resource_tags

* changelog

* fmt

* docs and example

* test

* refactor

* rename files

* new line

* chore: Updates CHANGELOG.md for #3454

* chore: Singletons in auto-generated resources (#3458)

* initial auditing_api and maintenance_window_api generation

* fix unmarshal for empty JSON

* improve maintenance_window_api

* checkDestroy in manual resource tests

* explicit version header

* check apiResp is not nil

* support FixedRequestBody

* auditing except delete

* support FixedRequestBody

* comment in MakeApiError

* comment Unmarshal

* use same flow as in SDK

* rename FixedRequestBody to StaticRequestBody

* codegen tests

* revert unneeded test

* lowering timeout value to ensure creation fails consistently (#3462)

* doc: Fixing inconsistent docs in `federated_settings_org_role_mapping` associated to required attributes (#3460)

* fixing inconsistent documentation

* remove human-readable term in external_group_id attribute

* fix: Avoids 0 itemsPerPage and pageNum when the args are missing in plural data sources (#3459)

* chore: Add windsurf ignore

* fix: Standardizes API params with WithParams pattern and IntPtr conversion

* chore: Adds changelog file

* refactor: use ListBackupExportJobsWithParams for export job listing

* chore: Updates CHANGELOG.md for #3459

* feat: Adds `users` attribute to `mongodbatlas_project` singular data source (#3439)

* WIP

* Fixed acceptance test

* Added a comment

* Added changelog

* Update docs/data-sources/project.md

* Update .changelog/3439.txt

Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com>

* PR comments

* Fix

* Arguments fixed

* Fix constant

---------

Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com>
Co-authored-by: maastha <122359335+maastha@users.noreply.github.com>
Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com>

* feat: Adds users attribute to mongodbatlas_projects plural data source (#3451)

* WIP

* Fixed acceptance test

* Added a comment

* Added changelog

* Added users attribute to projects data source

* Added changelog and fixed docs

* Factored out users schema

* Refactored schemas and fixed test and doc

* Minor code review suggestions and fixed doc

---------

Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com>

---------

Co-authored-by: maastha <122359335+maastha@users.noreply.github.com>
Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: oarbusi <55513886+oarbusi@users.noreply.github.com>
Co-authored-by: Oriol Arbusi Abadal <oriol.abadal@mongodb.com>
Co-authored-by: Marco Suma <marco.suma@mongodb.com>
Co-authored-by: Agustin Bettati <bettatiagustin@gmail.com>
Co-authored-by: Espen Albert <EspenAlbert@users.noreply.github.com>
Co-authored-by: Cristina Sánchez <c.sanchezprincipal@gmail.com>
Co-authored-by: Cristina Sánchez Sánchez <cristina.sanchez@mongodb.com>

Author: 10 people

.changelog/3454.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/mongodbatlas_third_party_integration Adds `send_user_provided_resource_tags` attribute to support sending $querystats to DataDog
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_third_party_integration Adds `send_user_provided_resource_tags` attribute to support sending $querystats to DataDog
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_third_party_integrations Adds `send_user_provided_resource_tags` attribute to support sending $querystats to DataDog
+```

.changelog/3459.txt

@@ -0,0 +1,23 @@
+```release-note:bug
+data-source/mongodbatlas_cloud_backup_snapshots: Fix pagination when `items_per_page` or `page_num` are not set
+```
+
+```release-note:bug
+data-source/mongodbatlas_cloud_backup_snapshot_export_buckets: Fix pagination when `items_per_page` or `page_num` are not set
+```
+
+```release-note:bug
+data-source/mongodbatlas_cloud_backup_snapshot_restore_jobs: Fix pagination when `items_per_page` or `page_num` are not set
+```
+
+```release-note:bug
+data-source/mongodbatlas_federated_settings_org_configs: Fix pagination when `items_per_page` or `page_num` are not set
+```
+
+```release-note:bug
+data-source/mongodbatlas_organizations: Fix pagination when `items_per_page` or `page_num` are not set
+```
+
+```release-note:bug
+data-source/mongodbatlas_cloud_backup_snapshot_export_jobs: Fix pagination when `items_per_page` or `page_num` are not set
+```

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

@@ -280,9 +280,11 @@ jobs:
             - 'internal/provider/*.go'
           autogen:
             - 'internal/common/autogen/*.go'
+            - 'internal/serviceapi/auditingapi/*.go'
             - 'internal/serviceapi/clusterapi/*.go'
             - 'internal/serviceapi/customdbroleapi/*.go'
             - 'internal/serviceapi/databaseuserapi/*.go'
+            - 'internal/serviceapi/maintenancewindowapi/*.go'
             - 'internal/serviceapi/projectapi/*.go'
             - 'internal/serviceapi/pushbasedlogexportapi/*.go'
             - 'internal/serviceapi/resourcepolicyapi/*.go'            
@@ -515,9 +517,11 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }}
           MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
           ACCTEST_PACKAGES: |
+            ./internal/serviceapi/auditingapi
             ./internal/serviceapi/clusterapi
             ./internal/serviceapi/customdbroleapi
             ./internal/serviceapi/databaseuserapi
+            ./internal/serviceapi/maintenancewindowapi
             ./internal/serviceapi/projectapi
             ./internal/serviceapi/pushbasedlogexportapi
             ./internal/serviceapi/resourcepolicyapi

.github/workflows/create-test-tag.yml

@@ -0,0 +1,28 @@
+name: 'test papertrail on tag create workflow - will be reverted'
+
+on:
+  workflow_dispatch:
+
+
+jobs:
+
+  create-tag:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps: 
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          ref: 'test-submitter'
+      - name: Get the latest commit SHA
+        id: get-sha
+        run: echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+      - name: Create test tag
+        uses: rickstaa/action-create-tag@a1c7777fcb2fee4f19b0f283ba888afa11678b72
+        with:
+          tag: 'test-v1.37.0'
+          commit_sha: ${{ steps.get-sha.outputs.sha }}
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg_passphrase: ${{ secrets.PASSPHRASE }}
+

.github/workflows/test-suite.yml

@@ -9,7 +9,7 @@ on:
     inputs:
       terraform_matrix:
         description: 'Terraform version matrix (JSON array)'
-        default: '["1.12.x","1.11.x","1.10.x","1.9.x","1.8.x","1.7.x","1.6.x","1.5.x"]'
+        default: '["1.12.x","1.11.x","1.10.x","1.9.x","1.8.x","1.7.x","1.6.x"]'
       provider_matrix:
         description: 'Previous MongoDB Atlas Provider version matrix for migration tests (JSON array)'
         default: '[""]' # "" for latest version

.github/workflows/update-dev-branches.yml

@@ -6,6 +6,11 @@ on:
       branches:
         description: 'Dev branch names to update from master'
         default: '["CLOUDP-320243-dev-2.0.0"]'
+      force-auto-resolve:
+        description: 'Force auto-resolve conflicts by favoring master changes. Some changes in dev branch might be lost.'
+        required: false
+        default: false
+        type: boolean
   schedule:
     - cron: "0 5 * * 3" # workflow runs every Wednesday at 5 AM UTC
 
@@ -45,16 +50,24 @@ jobs:
         git fetch origin ${{ matrix.branch }}        
         git checkout -B ${{ matrix.branch }} origin/${{ matrix.branch }}
         
-        if git merge origin/master --no-edit; then
-          echo "OK: Merge completed successfully with no conflicts."
+        if git rebase origin/master; then
+          echo "OK: Rebase completed successfully with no conflicts."
         else
-          git merge --abort
-          if git merge origin/master --strategy-option=theirs --no-edit; then
-            echo "ERROR: Merge conflicts detected that can be auto-resolved by favoring master changes."
+          # Check if conflicts can be auto-resolved
+          git rebase --abort
+          if git rebase origin/master -X theirs; then
+            if [ "${{ inputs.force-auto-resolve }}" = "true" ]; then
+              echo "WARNING: Rebase conflicts detected but auto-resolved by favoring master changes because force-auto-resolve is true."
+            else
+              echo "ERROR: Rebase conflicts detected that can be auto-resolved by favoring master changes."
+              echo "Manual review required to ensure no important changes are lost. Set force-auto-resolve to true to auto-resolve these conflicts."
+              git rebase --abort
+              exit 1
+            fi
           else
-            echo "ERROR: Merge conflicts detected that need manual intervention."
+            echo "ERROR: Rebase conflicts detected that need manual intervention, they can't be auto-resolved."
+            exit 1
           fi
-          exit 1
         fi
 
     - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e

.gitignore

@@ -3,6 +3,7 @@ bin
 .DS_Store
 .idea
 .vscode
+.windsurf
 *.env
 *.bak
 *.log

CHANGELOG.md

@@ -1,5 +1,20 @@
 ## (Unreleased)
 
+ENHANCEMENTS:
+
+* data-source/mongodbatlas_third_party_integration Adds `send_user_provided_resource_tags` attribute to support sending $querystats to DataDog ([#3454](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3454))
+* data-source/mongodbatlas_third_party_integrations Adds `send_user_provided_resource_tags` attribute to support sending $querystats to DataDog ([#3454](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3454))
+* resource/mongodbatlas_third_party_integration Adds `send_user_provided_resource_tags` attribute to support sending $querystats to DataDog ([#3454](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3454))
+
+BUG FIXES:
+
+* data-source/mongodbatlas_cloud_backup_snapshot_export_buckets: Fix pagination when `items_per_page` or `page_num` are not set ([#3459](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3459))
+* data-source/mongodbatlas_cloud_backup_snapshot_export_jobs: Fix pagination when `items_per_page` or `page_num` are not set ([#3459](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3459))
+* data-source/mongodbatlas_cloud_backup_snapshot_restore_jobs: Fix pagination when `items_per_page` or `page_num` are not set ([#3459](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3459))
+* data-source/mongodbatlas_cloud_backup_snapshots: Fix pagination when `items_per_page` or `page_num` are not set ([#3459](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3459))
+* data-source/mongodbatlas_federated_settings_org_configs: Fix pagination when `items_per_page` or `page_num` are not set ([#3459](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3459))
+* data-source/mongodbatlas_organizations: Fix pagination when `items_per_page` or `page_num` are not set ([#3459](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3459))
+
 ## 1.37.0 (June 26, 2025)
 
 ENHANCEMENTS:

build/ci/papertrail.yml

@@ -121,8 +121,9 @@ functions:
       params:
         key_id: ${papertrail_key_id}
         secret_key: ${papertrail_secret_key}
-        product: "terraform-provider-mongodbatlas"
+        product: "tmp2-terraform-provider-mongodbatlas"
         version: ${release_version}
+        submitter: "svc-apix-Bot"
         filenames:
           - "src/github.com/mongodb/terraform-provider-mongodbatlas/release_artifacts/*.zip"
 

docs/data-sources/federated_settings_org_role_mapping.md

@@ -38,14 +38,15 @@ data "mongodbatlas_federated_settings_org_role_mapping" "role_mapping" {
 ## Argument Reference
 
 * `federation_settings_id` - (Required) Unique 24-hexadecimal digit string that identifies the federated authentication configuration.
-* `org_id` - Unique 24-hexadecimal digit string that identifies the organization that contains your projects.
+* `org_id` - (Required) Unique 24-hexadecimal digit string that identifies the organization that contains your projects.
+* `role_mapping_id` - (Required) Unique 24-hexadecimal digit string that identifies this role mapping.
 
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:
 ### FederatedSettingsOrgRoleMappings
 
-* `external_group_name` - Unique human-readable label that identifies the identity provider group to which this role mapping applies.
+* `external_group_name` - Unique label that identifies the identity provider group to which this role mapping applies.
 * `id` - Unique 24-hexadecimal digit string that identifies this role mapping.
 * `role_assignments` - Atlas roles and the unique identifiers of the groups and organizations associated with each role.
 * `group_id` - Unique identifier of the project to which you want the role mapping to apply.