feat: Adds users attribute to mongodbatlas_organization(s) singular and plural data source. #3468

csanx · 2025-07-04T10:00:36Z

Description

Adds users attribute to mongodbatlas_organization singular data source.
Adds users attribute to mongodbatlas_organizations plural data source.

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

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

Update dev branch

github-actions · 2025-07-04T13:57:47Z

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

docs/data-sources/organization.md

lantoli · 2025-07-04T14:08:15Z

internal/service/organization/data_source_organization.go

+Computed: true,
+Elem: &schema.Schema{Type: schema.TypeString},
+},
+"username": {


is this the same or similar to project ? in case we can have some common schema

They differ in some fields. Also project uses tpf and org uses sdk v2. See #3451 (comment)

ah, ok, if it's tpf and sdv2 then it's better not to reuse, thanks

Also, I think I can extract some of this logic to a common utility when implementing CLOUDP-328757

lantoli · 2025-07-04T14:10:09Z

internal/common/conversion/flatten_expand.go

@@ -17,6 +19,57 @@ func FlattenLinks(links []admin.Link) []map[string]string {
 return ret
 }

+func FlattenUsers(users []admin.OrgUserResponse) []map[string]any {


not sure about having funcs in the common packages if they're only being used in one resource. I would have them here if at least used twice

lantoli · 2025-07-04T14:11:07Z

internal/service/organization/resource_organization_test.go

+resource.TestCheckResourceAttrWith(datasourceName, "users.#", acc.IntGreatThan(0)),
+resource.TestCheckResourceAttrSet(datasourceName, "users.0.id"),
+resource.TestCheckResourceAttrSet(datasourceName, "users.0.username"),
+resource.TestCheckResourceAttrSet(datasourceName, "users.0.roles.0.org_roles.#"),


these only checks that the attribute exists, don't know if we could also assert some expected values

You can use the new ExpectKnownValue as seen in this docs.
We dont' have many examples yet, but these might help:

ConfigStateChecks: []statecheck.StateCheck{acc.PluralResultCheck(dataSourcePluralName, "role_name", knownvalue.StringExact(roleName), pluralMapChecks("INSERT", databaseName1))},

func PluralResultCheck(resourceAddress, resultAttributeID string, resultAttributeMatch knownvalue.Check, checks map[string]knownvalue.Check) statecheck.StateCheck {

KnownValue

@EspenAlbert does the ExpectKnownValue work for SDKv2 based resources as well? asking because in SDKv2, there are no nulls but empty values like ""

Followup: This was discussed offline with the team. Decided to use regex validation to check that certain attributes (username, last_auth) have the appropriate structure/format rather than exact value matching. The reasoning is that these values can be unpredictable or non-deterministic. See 1d75984

Sorry, only saw this now. @maastha yes, it should also work for SDKv2

EspenAlbert

Nice. Agree with Leo's comments

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

docs/data-sources/organization.md

docs/data-sources/organizations.md

internal/service/organization/data_source_organization.go

internal/service/organization/data_source_organizations.go

internal/service/organization/data_source_organization.go

maastha · 2025-07-07T15:25:00Z

docs/data-sources/organization.md

+* `lastName` - Last name, family name, or surname that belongs to the MongoDB Cloud user.
+* `mobileNumber` - Mobile phone number that belongs to the MongoDB Cloud user.
+
+~> **NOTE:** - Does not return pending users invited via the deprecated [Invite One MongoDB Cloud User to Join One Project](https://www.mongodb.com/docs/api/doc/atlas-admin-api-v2/operation/operation-createprojectinvitation) endpoint or pending invitations created using [`mongodbatlas_project_invitation`](../resources/project_invitation.md) resource.


can we update this message to be consistent with the one mentioned in the tech design doc?

Done e0aa80a. Added a TODO for completion in the following tickets.

the TODO can be easy to miss since it's inside docs, instead I'd say remove the TODO from this PR & create a JIRA ticket to go over all documentation related to this epic & mention the link in this note may need to be updated

Thank you for the suggestion. JIRA ticket: CLOUDP-329711

docs/data-sources/organizations.md

lmkerbey-mdb

LGTM.

maastha

LGTM, one comment related to the docs

Cristina Sánchez Sánchez added 3 commits July 4, 2025 10:19

Added users attribute, modified test and docs.

b8d91aa

Updated doc

2045012

Fixed test

eb6503e

github-actions bot added the enhancement label Jul 4, 2025

Cristina Sánchez Sánchez added 3 commits July 4, 2025 12:06

Added changelog

3a6f417

Merge branch 'CLOUDP-320243-dev-2.0.0' into CLOUDP-328752-updated

a44c5b3

Update dev branch

Fixed SDK version

e0c2c4b

csanx marked this pull request as ready for review July 4, 2025 13:57

csanx requested review from a team as code owners July 4, 2025 13:57

lantoli reviewed Jul 4, 2025

View reviewed changes

docs/data-sources/organization.md Outdated Show resolved Hide resolved

lantoli reviewed Jul 4, 2025

View reviewed changes

lantoli approved these changes Jul 4, 2025

View reviewed changes

EspenAlbert reviewed Jul 4, 2025

View reviewed changes

EspenAlbert approved these changes Jul 4, 2025

View reviewed changes

csanx and others added 4 commits July 7, 2025 09:30

Update docs/data-sources/organization.md

28114c8

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

Removed FlattenUsers and related functions from common utility

d4c7049

Merge branch 'CLOUDP-320243-dev-2.0.0' into CLOUDP-328752-updated

0414ac2

Change 3 functions to private visibility

6c24461

maastha reviewed Jul 7, 2025

View reviewed changes

docs/data-sources/organization.md Show resolved Hide resolved

maastha reviewed Jul 7, 2025

View reviewed changes

internal/service/organization/data_source_organization.go Outdated Show resolved Hide resolved

maastha reviewed Jul 7, 2025

View reviewed changes

internal/service/organization/data_source_organization.go Outdated Show resolved Hide resolved

internal/service/organization/data_source_organization.go Outdated Show resolved Hide resolved

maastha reviewed Jul 7, 2025

View reviewed changes

docs/data-sources/organizations.md Outdated Show resolved Hide resolved

Cristina Sánchez Sánchez added 2 commits July 7, 2025 17:44

Added some value checks

1d75984

Fixed doc (users attributes to be the same as in the schema)

9b82618

lmkerbey-mdb approved these changes Jul 7, 2025

View reviewed changes

Cristina Sánchez Sánchez added 4 commits July 8, 2025 09:14

Minor changes

8b4b56c

Updated note in docs

e0aa80a

Changed attributes names for consistency and type to TypeSet

86beefa

Fix

0d9703a

maastha approved these changes Jul 8, 2025

View reviewed changes

Removed TODOs

34cc5c6

csanx merged commit 5a75bcc into CLOUDP-320243-dev-2.0.0 Jul 8, 2025
41 checks passed

csanx deleted the CLOUDP-328752-updated branch July 8, 2025 13:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Adds users attribute to mongodbatlas_organization(s) singular and plural data source. #3468

feat: Adds users attribute to mongodbatlas_organization(s) singular and plural data source. #3468

Uh oh!

csanx commented Jul 4, 2025 •

edited

Loading

github-actions bot commented Jul 4, 2025

Uh oh!

lantoli Jul 4, 2025

csanx Jul 7, 2025

lantoli Jul 7, 2025

csanx Jul 7, 2025

lantoli Jul 4, 2025

lantoli Jul 4, 2025 •

edited

Loading

EspenAlbert Jul 4, 2025

maastha Jul 7, 2025

csanx Jul 7, 2025

EspenAlbert Jul 8, 2025

EspenAlbert left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

maastha Jul 7, 2025

csanx Jul 8, 2025

maastha Jul 8, 2025

csanx Jul 8, 2025

Uh oh!

lmkerbey-mdb left a comment

maastha left a comment

Uh oh!

feat: Adds users attribute to mongodbatlas_organization(s) singular and plural data source. #3468

feat: Adds users attribute to mongodbatlas_organization(s) singular and plural data source. #3468

Uh oh!

Conversation

csanx commented Jul 4, 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

github-actions bot commented Jul 4, 2025

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

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

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EspenAlbert left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Uh oh!

lmkerbey-mdb left a comment

Choose a reason for hiding this comment

maastha left a comment

Choose a reason for hiding this comment

Uh oh!

csanx commented Jul 4, 2025 •

edited

Loading

lantoli Jul 4, 2025 •

edited

Loading