chore: Merge SA dev branch to master #3786

lantoli · 2025-10-16T15:43:13Z

Description

Merge SA dev branch to master

Link to any related issue(s): CLOUDP-350357

Type of change:

Bug fix (non-breaking change which fixes an issue). Please, add the "bug" label to the PR.
New feature (non-breaking change which adds functionality). Please, add the "enhancement" label to the PR. A migration guide must be created or updated if the new feature will go in a major version.
Breaking change (fix or feature that would cause existing functionality to not work as expected). Please, add the "breaking change" label to the PR. A migration guide must be created or updated.
This change requires a documentation update
Documentation fix/enhancement

Required Checklist:

I have signed the MongoDB CLA
I have read the contributing guides
I have checked that this change does not generate any credentials and that they are NOT accidentally logged anywhere.
I have added tests that prove my fix is effective or that my feature works per HashiCorp requirements
I have added any necessary documentation (if appropriate)
I have run make fmt and formatted my code
If changes include deprecations or removals I have added appropriate changelog entries.
If changes include removal or addition of 3rd party GitHub actions, I updated our internal document. Reach out to the APIx Integration slack channel to get access to the internal document.

Further comments

…, environment variables and AWS Secrets Manager (#3700) * implement service account as credentials * env variables support * aws secret support * changed condition of warning of missing credentials * changelog * change factory * Revert "change factory" This reverts commit 40e19ae. * refactor * don't fail when no valid auth method * try: fix data race failure * Revert "try: fix data race failure" This reverts commit 9c59355. * prevent data races in HTTP client mocking for OAuth2 authentication * skip reset * add test * run test in CI * fix * matrix remove * Revert "matrix remove" This reverts commit 9d901bf. * Revert "fix" This reverts commit d2fa94b. * execute only relevant test * remove increased timeout * Apply suggestions from code review Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> * use enum instead of string * pr suggestions * pr comments doc * remove matrix * use credential provider in auth helper methods * error instead of warning when no credetials are set * typo * set env vars * unit test only --------- Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com>

* master: chore: Updates CHANGELOG.md for #3701 doc: Improve documentation about advanced cluster plan verbosity (#3701) chore: Updates CHANGELOG.md for #3680 feat: Support OIDC configs in mongodbatlas_stream_connection (#3680) chore: Updates repository to use supported Terraform versions (#3699) chore: Remove `advancedcluster` folder (#3698) # Conflicts: # .github/workflows/acceptance-tests-runner.yml

* master: remove Terraform files for each example (#3713)

…nt access (#3711)

…ronment variables and AWS Secrets Manager (#3716) * support JWT token as authentication credentials * changelog * Update internal/testutil/acc/pre_check.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * token has priority over SA and PAK * rename methods * mention SA in changelog --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* master: (29 commits) build(deps): bump go.mongodb.org/atlas-sdk (#3704) chore: Bring SA dev branch non-production changes to master (#3733) chore: Add generation of `org_service_account_api` resource (#3726) chore: Update SSDLC report for v1.41.1 chore: Updates CHANGELOG.md header for v1.41.1 release chore: Update example links in registry docs for v1.41.1 release chore: Supports backport releases for v1.x (#3732) chore: Bump github.com/hashicorp/terraform-json from 0.27.1 to 0.27.2 (#3729) chore: Bump github.com/hashicorp/terraform-exec from 0.23.1 to 0.24.0 (#3728) uset ListOrgs in getKeyDetails (#3723) chore: Bump github.com/hashicorp/terraform-plugin-framework-timeouts (#3706) chore: Bump github.com/hashicorp/terraform-plugin-mux (#3707) chore: Updates CHANGELOG.md for #3725 fix: Supporting `advanced_cluster` upgrade to dedicated with NMVe instance (#3725) test: Fixes TestAccAdvancedCluster_updateDeleteTimeoutFlex test (#3730) chore: Update SSDLC report for v2.0.1 chore: Updates CHANGELOG.md header for v2.0.1 release chore: Update example links in registry docs for v2.0.1 release doc: Restores migration guide to transition out of Serverless (#3724) chore: Bump github.com/hashicorp/terraform-plugin-sdk/v2 (#3710) ... # Conflicts: # .github/workflows/acceptance-tests-runner.yml # .github/workflows/acceptance-tests.yml # internal/testutil/acc/pre_check.go

…ce-accounts-dev

* master: chore: Remove all attributes in assume_role except role_arn (#3745) # Conflicts: # internal/config/client.go

…ce-accounts-dev

* remove Atlas version 20240805 * remove admin20240530 version from resources except cluster * NormalizeBaseURL

* master: chore: Allow SA for mongodbatlas_roles_org_id datasource (#3764) doc: Fixes path for collection attributes in cluster docs (#3739) build(deps): bump go.mongodb.org/atlas-sdk (#3750) doc: Add FLEX value under provider_name in advanced_cluster docs (#3763) chore: Add codegen intermediate model serialization (#3756) chore: Bump github.com/hashicorp/terraform-plugin-framework-validators (#3761) chore: Bump softprops/action-gh-release from 2.3.3 to 2.4.0 (#3759) chore: Bump actions/stale from 10.0.0 to 10.1.0 (#3758) chore: Bump peter-evans/create-or-update-comment from 4.0.0 to 5.0.0 (#3760) chore: Bump github.com/hashicorp/terraform-plugin-framework (#3762) include acceptance tests for org service account resource (#3755) chore: Add project_settings_api acceptance tests (#3751) chore: Add create only plan modifier for non-updateable attributes in autogenerated resources (#3747) # Conflicts: # go.mod # internal/service/advancedcluster/common.go # internal/service/advancedcluster/common_model_sdk_version_conversion.go # internal/service/advancedcluster/common_model_sdk_version_conversion_test.go # internal/service/advancedcluster/resource_test.go

…ce-accounts-dev

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

…vice Accounts authentication (#3753) * DOCSP-54251 -- 1ST draft of guide for using SA auth * Apply suggestions from code review Co-authored-by: kanchana-mongodb <54281287+kanchana-mongodb@users.noreply.github.com> * Update docs/guides/migrate-to-service-accounts-authentication-guide.md Co-authored-by: kanchana-mongodb <54281287+kanchana-mongodb@users.noreply.github.com> * DOCSP-54251 -- Addressed feedback * DOCSP-54251 -- Changed typos * DOCSP-54252 -- Additional lading page changes * Apply suggestions from code review Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> Co-authored-by: Manuel Pedrozo <19614462+manupedrozo@users.noreply.github.com> * DOCSP-54251 -- Additional corrections * DOCSP-54251 & DOCSP-54252 -- Added detailed auth information by source * DOCSP-54251 -- Added mention of 10 tokens per minute limitation * rename guide file * move Programmatic access to * remove Gov as it's already in index and not relevant here * restructure info in index * access token * typos * doc warning about multiple credentials * fix important box * DOCSP-54251 & DOCSP-54252 -- Minor style adjustments * DOCSP-54251 & DOCSP-54252 -- Adjusted links to specific sections * DOCSP-54251 & DOCSP-54252 -- Adjusted links to specific sections 2 * DOCSP-54251 & DOCSP-54252 -- Adjusted links to specific sections 3 * provider configuration page with smaller index * apply feedback * make it more consistent * more concise provider config * reduce url help * simplify AWS Secrets Manager * fix example * remove link as it doesn't work anymore * revert versioning and last sections in index * apply feedback about authentication and gov * remove best practice section * AWS SM with provider attributes * doc: DOCSP-54251 -- Minimal style edits --------- Co-authored-by: kanchana-mongodb <54281287+kanchana-mongodb@users.noreply.github.com> Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> Co-authored-by: Manuel Pedrozo <19614462+manupedrozo@users.noreply.github.com>

…ce-accounts-dev

github-actions · 2025-10-16T15:43:34Z

APIx bot: a message has been sent to Docs Slack channel

Copilot

Copilot reviewed 35 out of 36 changed files in this pull request and generated 3 comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

internal/config/transport.go

internal/service/advancedcluster/resource_test.go

internal/provider/provider_sdk2.go

marcosuma · 2025-10-17T06:33:17Z

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

          MONGODB_ATLAS_CLIENT_SECRET: ${{ secrets.mongodb_atlas_client_secret }}
          MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
-          ACCTEST_REGEX_RUN: '^TestUnexisting' # TODO: SA not implemented in master yet
+          ACCTEST_REGEX_RUN: '^TestAcc' # Don't run migration tests because previous provider versions don't support SA.


at some point we can enable these, right? Do we need a TODO and CLOUDP?

yes, ticket created: CLOUDP-352095

* master: chore: Updates CHANGELOG.md for #3786 chore: Merge SA dev branch to master (#3786) chore: Updates CHANGELOG.md for #3610 feat: Add workspace_name field in stream_connection resource and datasource (#3610)

oarbusi and others added 26 commits September 23, 2025 17:42

Merge branch 'master' into CLOUDP-334161-service-accounts-dev

78c1a1d

* master: remove Terraform files for each example (#3713)

chore: Implement Service Account token caching & thread-safe concurre…

e42e6c1

…nt access (#3711)

chore: Implement Service Account token refresh policy (#3712)

00a7e12

Merge remote-tracking branch 'origin/master' into CLOUDP-334161-servi…

6a07d68

…ce-accounts-dev

chore: Fix SA dev branch merge (#3744)

394b811

Merge branch 'master' into CLOUDP-334161-service-accounts-dev

24a610e

* master: chore: Remove all attributes in assume_role except role_arn (#3745) # Conflicts: # internal/config/client.go

Merge remote-tracking branch 'origin/master' into CLOUDP-334161-servi…

7d25bf0

…ce-accounts-dev

chore: Implement credential type hierarchy (#3738)

5d09ca0

Merge remote-tracking branch 'origin/master' into CLOUDP-334161-servi…

f67386b

…ce-accounts-dev

chore: Remove unneeded Atlas versions (#3752)

8aa6d8a

* remove Atlas version 20240805 * remove admin20240530 version from resources except cluster * NormalizeBaseURL

chore: Fix some tests in PAK and SA executions (#3765)

f46bf9f

Merge remote-tracking branch 'origin/master' into CLOUDP-334161-servi…

028a185

…ce-accounts-dev

adjust env vars (#3769)

5bc272f

chore: Display specific errors if credentials values are missing (#3768)

2b411ca

Merge remote-tracking branch 'origin/master' into CLOUDP-334161-servi…

ef62c7e

…ce-accounts-dev

chore: Enable OAuth token test (#3777)

939d512

chore: Enable resource policy tests with SA credentials (#3778)

8194d8a

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

Merge remote-tracking branch 'origin/master' into CLOUDP-334161-servi…

d1a37e7

…ce-accounts-dev

no need to use credentials for unit tests (#3785)

d760895

Merge remote-tracking branch 'origin/master' into CLOUDP-334161-servi…

6e10ca9

…ce-accounts-dev

lantoli requested a review from a team as a code owner October 16, 2025 15:43

Copilot AI review requested due to automatic review settings October 16, 2025 15:43

lantoli requested a review from a team as a code owner October 16, 2025 15:43

Copilot AI reviewed Oct 16, 2025

View reviewed changes

internal/config/transport.go Show resolved Hide resolved

internal/service/advancedcluster/resource_test.go Show resolved Hide resolved

internal/provider/provider_sdk2.go Show resolved Hide resolved

jwilliams-mongo approved these changes Oct 16, 2025

View reviewed changes

marcosuma approved these changes Oct 17, 2025

View reviewed changes

lantoli merged commit 99d0c54 into master Oct 17, 2025
82 checks passed

lantoli deleted the CLOUDP-350357_merge_sa_dev branch October 17, 2025 07:22

svc-apix-Bot added a commit that referenced this pull request Oct 17, 2025

chore: Updates CHANGELOG.md for #3786

c254e89

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore: Merge SA dev branch to master #3786

chore: Merge SA dev branch to master #3786

Uh oh!

lantoli commented Oct 16, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Oct 16, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

marcosuma Oct 17, 2025

Uh oh!

lantoli Oct 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

chore: Merge SA dev branch to master #3786

chore: Merge SA dev branch to master #3786

Uh oh!

Conversation

lantoli commented Oct 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of change:

Required Checklist:

Further comments

Uh oh!

github-actions bot commented Oct 16, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

marcosuma Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

lantoli Oct 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

lantoli commented Oct 16, 2025 •

edited

Loading