Update tctl CLI output messages #3442
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
kimlisa
requested review from
fspmarshall,
klizhentas,
russjones and
webvictim
as code owners
alex-kovoy
reviewed
Mar 16, 2020
| @@ -135,7 +137,7 @@ func (u *UserCommand) ResetPassword(client auth.ClientI) error { | |||
| func (u *UserCommand) PrintResetPasswordToken(token services.ResetPasswordToken, format string) error { | |||
| err := u.printResetPasswordToken(token, | |||
| format, | |||
| "Reset password token has been created and is valid for %v. Share this URL with the user to complete password reset process:\n%v\n\n", | |||
| "User %v has been reset. Share this URL with the user to complete password reset, link is valid for %v:\n%v\n\n", | |||
There was a problem hiding this comment.
@benarent are you sure you want this message as opposed to explicitly mentioning reset password token?
There was a problem hiding this comment.
I'm happy with the solution, it focuses on the UX of the user being reset, with the outcome being a that they need to complete a reset password, vs being the other way around.
alex-kovoy
approved these changes
Mar 16, 2020
russjones
approved these changes
Mar 17, 2020
| @@ -57,10 +57,12 @@ type UserCommand struct { | |||
|
|
|||
| // Initialize allows UserCommand to plug itself into the CLI parser | |||
| func (u *UserCommand) Initialize(app *kingpin.Application, config *service.Config) { | |||
| const helpPrefix string = "[Teleport DB users only]" | |||
There was a problem hiding this comment.
What are these users called in docs? I usually refer to them as "local users".
There was a problem hiding this comment.
@benarent what do you think of Local users only vs Teleport DB users only?
webvictim
approved these changes
Mar 17, 2020
benarent
approved these changes
Mar 17, 2020
fspmarshall
approved these changes
Mar 17, 2020
|
I'm open to new names, but don't want to confuse DB user, with 'local user/UNIX logins' . Since we are already using DB Users, I would say we keep it for now. |
|
retest this please |
1 similar comment
|
retest this please |
alex-kovoy
pushed a commit
that referenced
this pull request
Apr 14, 2020
alex-kovoy
pushed a commit
that referenced
this pull request
Apr 15, 2020
alex-kovoy
added a commit
that referenced
this pull request
Apr 15, 2020
* Add monorepo * Add reset/passwd capability for local users (#3287) * Add UserTokens to allow password resets * Pass context down through ChangePasswordWithToken * Rename UserToken to ResetPasswordToken * Add auto formatting for proto files * Add common Marshaller interfaces to reset password token * Allow enterprise "tctl" reuse OSS user methods (#3344) * Pass localAuthEnabled flag to UI (#3412) * Added LocalAuthEnabled prop to WebConfigAuthSetting struct in webconfig.go * Added LocalAuthEnabled state as part of webCfg in apiserver.go * update e-refs * Fix a regression bug after merge * Update tctl CLI output msgs (#3442) * Use local user client when resolving user roles * Update webapps ref * Add and retrieve fields from Cluster struct (#3476) * Set Teleport versions for node, auth, proxy init heartbeat * Add and retrieve fields NodeCount, PublicURL, AuthVersion from Clusters * Remove debug logging to avoid log pollution when getting public_addr of proxy * Create helper func GuessProxyHost to get the public_addr of a proxy host * Refactor newResetPasswordToken to use GuessProxyHost and remove publicUrl func * Remove webapps submodule * Add webassets submodule * Replace webapps sub-module reference with webassets * Update webassets path in Makefile * Update webassets 1b11b26 Simplify and clean up Makefile (#62) gravitational/webapps@1b11b26 * Retrieve cluster details for user context (#3515) * Let GuessProxyHost also return proxy's version * Unit test GuessProxyHostAndVersion & GetClusterDetails * Update webassets 4dfef4e Fix build pipeline (#66) gravitational/webapps@4dfef4e * Update e-ref * Update webassets 0647568 Fix OSS redirects gravitational/webapps@0647568 * update e-ref * Update webassets e0f4189 Address security audit warnings Updates "minimist" package which is used by 7y old "optimist". gravitational/webapps@e0f4189 * Add new attr to Session struct (#3574) * Add fields ServerHostname and ServerAddr * Set these fields on newSession * Ensure webassets submodule during build * Update e-ref * Ensure webassets before running unit-tests * Update E-ref Co-authored-by: Lisa Kim <lisa@gravitational.com> Co-authored-by: Pierre Beaucamp <pierre@gravitational.com> Co-authored-by: Jenkins <jenkins@gravitational.io>
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 issue #3363
tctl users addandtctl users resetoutputs different messages[Teleport DB users only]prefix added tousers resettctl tokens lslists password token as typePasswordinstead ofUser SignupOSS output
Enterprise output