Merge branch 'CLOUDP-334161-service-accounts-dev' into CLOUDP-345764_credentials_hierarchy

* CLOUDP-334161-service-accounts-dev:
  chore: Remove all attributes in assume_role except role_arn (#3745)
  chore: Fix SA dev branch merge (#3744)
  chore: Fix cleanup GHA after SA changes (#3742)
  chore: Fixes backport release issues (#3734)
  chore: Support generation of singleton resources with no delete operation (#3736)

# Conflicts:
#	internal/config/client.go
#	internal/config/transport_test.go
#	internal/provider/provider_sdk2.go
#	internal/service/organization/resource_organization.go
#	internal/service/organization/resource_organization_test.go
#	internal/testutil/acc/factory.go

Author: lantoli

.github/templates/run-script-and-commit/action.yaml

@@ -28,7 +28,10 @@ inputs:
     description: "Path to the repository."
     default: ""
     required: false
-
+  branch:
+    description: "Branch to checkout."
+    default: ""
+    required: false
 runs:
   using: "composite"
   steps:
@@ -37,6 +40,7 @@ runs:
       with:
         fetch-depth: 0
         token: ${{ inputs.apix_bot_pat }}
+        ref: ${{ inputs.branch }}
 
     - name: Set up Go
       uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5

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

@@ -196,9 +196,10 @@ env:
   TF_ACC: 1
   TF_LOG: ${{ vars.LOG_LEVEL }}
   ACCTEST_TIMEOUT: ${{ vars.ACCTEST_TIMEOUT }}
-  # Only Migration tests are run when a specific previous provider version is set
-  # If the name (regex) of the test is set, only that test is run
-  ACCTEST_REGEX_RUN: ${{ inputs.test_name || inputs.provider_version == '' && '^Test(Acc|Mig)' || '^TestMig' }}
+  # If the name (regex) of the test is set, only that test is run.
+  # Don't run migration tests if using Service Accounts because previous provider versions don't support SA yet.
+  # Only Migration tests are run when a specific previous provider version is set.
+  ACCTEST_REGEX_RUN: ${{ inputs.test_name || inputs.use_sa && '^TestAcc' || inputs.provider_version == '' && '^Test(Acc|Mig)' || '^TestMig' }}
   MONGODB_ATLAS_BASE_URL: ${{ inputs.mongodb_atlas_base_url }}
   MONGODB_REALM_BASE_URL: ${{ inputs.mongodb_realm_base_url }}
   MONGODB_ATLAS_ORG_ID: ${{ inputs.mongodb_atlas_org_id }}
@@ -548,6 +549,7 @@ jobs:
           MONGODB_ATLAS_CLIENT_ID: ${{ secrets.mongodb_atlas_client_id }}
           MONGODB_ATLAS_CLIENT_SECRET: ${{ secrets.mongodb_atlas_client_secret }}
           MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
+          ACCTEST_REGEX_RUN: '^TestAcc' # Don't run migration tests because previous provider versions don't support SA.
           ACCTEST_PACKAGES: |
             ./internal/service/alertconfiguration
             ./internal/service/databaseuser

.github/workflows/release-v1.yml

@@ -69,6 +69,7 @@ jobs:
                   remote: https://svc-apix-bot:${{ secrets.APIX_BOT_PAT }}@github.com/${{ github.repository }}
                   gpg_private_key: ${{ secrets.APIX_BOT_GPG_PRIVATE_KEY }}
                   passphrase: ${{ secrets.APIX_BOT_PASSPHRASE }}
+                  branch: master-v1
 
     update-changelog-header:
         needs:
@@ -93,6 +94,7 @@ jobs:
                   remote: https://svc-apix-bot:${{ secrets.APIX_BOT_PAT }}@github.com/${{ github.repository }}
                   gpg_private_key: ${{ secrets.APIX_BOT_GPG_PRIVATE_KEY }}
                   passphrase: ${{ secrets.APIX_BOT_PASSPHRASE }}
+                  branch: master-v1
 
     create-tag:
         runs-on: ubuntu-latest
@@ -241,3 +243,4 @@ jobs:
                   remote: https://svc-apix-bot:${{ secrets.APIX_BOT_PAT }}@github.com/${{ github.repository }}
                   gpg_private_key: ${{ secrets.APIX_BOT_GPG_PRIVATE_KEY }}
                   passphrase: ${{ secrets.APIX_BOT_PASSPHRASE }}
+                  branch: master-v1

CHANGELOG.md

@@ -1,10 +1,14 @@
 ## (Unreleased)
 
+BUG FIXES:
+
+* resource/mongodbatlas_advanced_cluster: Allows upgrade from tenant and flex cluster to dedicated NVMe with backup enabled ([#3725](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3725))
+
 ## 1.41.1 (October 01, 2025)
 
 BUG FIXES:
 
-* resource/mongodbatlas_advanced_cluster: Allows upgrade from tenant and flex cluster to dedicated NVMe with backup enabled ([#3725](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3725))
+* provider: Fixes STS region resolution when using cross-region authentication ([#3718](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/3718))
 
 ## 2.0.1 (October 01, 2025)
 

Makefile

@@ -43,11 +43,16 @@ test: fmtcheck ## Run unit 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_PUBLIC_KEY=dummy)
+	@$(eval export MONGODB_ATLAS_PRIVATE_KEY=dummy)
+	@$(eval export MONGODB_ATLAS_CLIENT_ID=)
+	@$(eval export MONGODB_ATLAS_CLIENT_SECRET=)
+	@$(eval export MONGODB_ATLAS_ACCESS_TOKEN=)
 	go test ./... -timeout=120s -parallel=$(PARALLEL_GO_TEST) -race
 
 .PHONY: testmact
 testmact: ## Run MacT tests (mocked acc tests)
-	@$(eval ACCTEST_REGEX_RUN?=^TestAccMockable)
+	@$(eval export ACCTEST_REGEX_RUN?=^TestAccMockable)
 	@$(eval export HTTP_MOCKER_REPLAY?=true)
 	@$(eval export HTTP_MOCKER_CAPTURE?=false)
 	@$(eval export MONGODB_ATLAS_ORG_ID?=111111111111111111111111)
@@ -72,7 +77,7 @@ testmact-capture: ## Capture HTTP traffic for MacT tests
 
 .PHONY: testacc
 testacc: fmtcheck ## Run acc & mig tests (acceptance & migration tests)
-	@$(eval ACCTEST_REGEX_RUN?=^TestAcc)
+	@$(eval export ACCTEST_REGEX_RUN?=^TestAcc)
 	TF_ACC=1 go test $(ACCTEST_PACKAGES) -run '$(ACCTEST_REGEX_RUN)' -v -parallel $(PARALLEL_GO_TEST) $(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -ldflags="$(LINKER_FLAGS)"
 
 .PHONY: testaccgov

compliance/v1.41.1/ssdlc-compliance-1.41.1.md

@@ -34,7 +34,7 @@ output "alert_output" {
 ```
 
 Refer to the following for a full example on using this data_source as a tool to import all resources:
-* [atlas-alert-configurations](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v1.41.1/examples/atlas-alert-configurations)
+* [atlas-alert-configurations](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v2.0.1/examples/atlas-alert-configurations)
 
 ## Argument Reference
 

docs/data-sources/alert_configurations.md

@@ -28,7 +28,7 @@ data "mongodbatlas_privatelink_endpoint" "test" {
 ```
 
 ### Available complete examples
-- [Setup private connection to a MongoDB Atlas Cluster with AWS VPC](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v1.41.1/examples/mongodbatlas_privatelink_endpoint/aws/cluster)
+- [Setup private connection to a MongoDB Atlas Cluster with AWS VPC](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v2.0.1/examples/mongodbatlas_privatelink_endpoint/aws/cluster)
 
 ## Argument Reference
 

docs/data-sources/privatelink_endpoint.md

@@ -78,7 +78,7 @@ data "mongodbatlas_privatelink_endpoint_service" "test" {
 ```
 
 ### Available complete examples
-- [Setup private connection to a MongoDB Atlas Cluster with AWS VPC](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v1.41.1/examples/mongodbatlas_privatelink_endpoint/aws/cluster)
+- [Setup private connection to a MongoDB Atlas Cluster with AWS VPC](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v2.0.1/examples/mongodbatlas_privatelink_endpoint/aws/cluster)
 
 ## Argument Reference
 

docs/data-sources/privatelink_endpoint_service.md

@@ -296,7 +296,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.41.1/examples)
+We have [example configurations](https://github.com/mongodb/terraform-provider-mongodbatlas/tree/v2.0.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?