Allow setting additional traits in tctl users add command #12102
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
smallinsky
approved these changes
Apr 20, 2022
| @@ -116,6 +116,7 @@ func NewPresetAccessRole() types.Role { | |||
| role.SetWindowsLogins(types.Allow, []string{teleport.TraitInternalWindowsLoginsVariable}) | |||
| role.SetKubeUsers(types.Allow, []string{teleport.TraitInternalKubeUsersVariable}) | |||
| role.SetKubeGroups(types.Allow, []string{teleport.TraitInternalKubeGroupsVariable}) | |||
| role.SetAWSRoleARNs(types.Allow, []string{teleport.TraitInternalAWSRoleARNs}) | |||
There was a problem hiding this comment.
Wonder is we should bother about migration to cover the case where an access role was already created without aws role arn trait placeholder but a user follows the doc and tries to leverage aws-role-arns tctl flag.
There was a problem hiding this comment.
We generally don't migrate existing roles (even presets) because users may have their own roles with the same names and we don't want to modify them.
jakule
approved these changes
Apr 20, 2022
r0mant
added a commit
that referenced
this pull request
Apr 20, 2022
r0mant
added a commit
that referenced
this pull request
Apr 20, 2022
Closed
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.
This PR updates
tctl users addcommand to support providing additional internal user traits which can then be used in role templating.It already had flags for
loginsandwindows_logins, this PR also adds support forkubernetes_users,kubernetes_groups,database_users,database_namesandaws_role_arns, and their respective{{internal.xxx}}role template variables.With this change admins would be able to create local users and set all traits in a single command without having to edit the user after the fact, e.g.
$ tctl users add --roles=access,editor \ --logins=root \ --database-users=postgres,test \ --database-names=\* \ --kubernetes-groups=system:masters \ aliceThis will significantly simplify parts of database access getting started guides which currently ask to create the Teleport user and then update the resource to set the traits (I'll update the docs after this merges).
Closes #10529.