Connect: Fetch correct role set when listing db users #13790
Merged
Conversation
This file contains 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
#12281 fixed fetching db users for remote clusters for `tsh db ls`. #13617 applied the same fix to `tsh db ls --all` and extracted the `fetchRoleSet` function. This commit extracts it to `lib/client` so that we can reuse it in `lib/teleterm`. Other than accepting `log` as an argument, nothing was changed about that function.
github-actions
bot
added
the
tsh
codingllama
reviewed
Jun 23, 2022
|
@codingllama I moved the function to lib/services and added some tests, let me know what you think. |
ravicious
commented
Jun 24, 2022
ravicious
commented
Jun 24, 2022
codingllama
reviewed
Jun 24, 2022
Comment on lines
+5016
to
+5018
| } | ||
|
|
||
| func TestFetchAllClusterRoles_UsesDefaultRolesAndTraitsIfCurrentUserIsUnavailable(t *testing.T) { |
There was a problem hiding this comment.
Let's combine those 2 test cases in a single table-driven test, so we take advantage of their common setup.
There was a problem hiding this comment.
Is it fine if I leave them as separate tests for now? IMHO updating something that was repeated just once doesn't require that much work vs untangling the code in case we need to add a third case that's just slightly different than the other two.
Co-authored-by: Alan Parra <[email protected]>
Co-authored-by: Alan Parra <[email protected]>
Co-authored-by: Alan Parra <[email protected]>
codingllama
approved these changes
Jun 24, 2022
atburke
approved these changes
Jun 24, 2022
|
@ravicious See the table below for backport results.
|
ravicious
added a commit
that referenced
this pull request
Jun 27, 2022
* Move fetchRoleSet from tsh/db to lib/services as FetchAllClusterRoles. * Connect: Fetch correct role set when listing db users * Add tests for FetchAllClusterRoles
greedy52
added a commit
that referenced
this pull request
Jul 10, 2022
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.
Fixes gravitational/webapps.e#290.
#12281 fixed fetching db users for remote clusters for
tsh db ls. #13617 applied the same fix totsh db ls --alland extracted thefetchRoleSetfunction.This PR extracts that function to
lib/clientso that we can reuse itlib/teleterm. Other than acceptinglogas an argument, nothing was changed about that function.In Connect we basically needed to apply the same fix that was applied in #12281 to
tool/tsh/db.go. As mentioned above, that whole section of code was extracted intofetchRoleSetin #13617.