When multiple organization users found, filter results for an exact match on email or login #2285
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… exact match on 'login'
|
In order to lower resource usage and have a faster runtime, PRs will not run Cloud tests automatically. |
volcanonoodle
approved these changes
Aug 1, 2025
internal/resources/grafana/data_source_organization_user_test.go
Outdated
Show resolved
Hide resolved
cinaglia
force-pushed
the
grafana-organization-user-should-filter-results
branch
from
2397aa0 to
8171106
Compare
cinaglia
changed the title
|
FYI Looks like the acceptance tests are failing for an unrelated issue. I've spot checked other recent PRs that have the same issue. |
colin-stuart
commented
Aug 7, 2025
There was a problem hiding this comment.
I can't approve @cinaglia's changes since this is my own PR, but the changes look good.
volcanonoodle
approved these changes
Aug 7, 2025
cinaglia
approved these changes
Aug 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of https://github.com/grafana/support-escalations/issues/17635
Why?
Querying the grafana_organization_user resource from the terraform provider gets all users within the current organization in Grafana. The
SearchOrgUserssql query uses thelikeoperator, so the query isWHERE email LIKE '%[[email protected]](mailto:[email protected])%'and the result can include multiple users. Currently, if multiple users are returned in the query, the TF provider returns an error.Fix
The fix relies on switching from
GetOrgUsersForCurrentOrgLookupover toGetOrgUsersForCurrentOrgwhich returns more information, including theemail. That allows us to then tweak the logic to perform an exact match onemailorlogin.loginis provided: the TF provider iterates through the results of the query to return a single user if an exact match onuser.loginis found.emailprovided: The TF provider now iterates through the results of the query to return a single user if an exact match onuser.emailis found.