Commit0f3221f

authored

fix: use more descriptive login flags (#4493)

1 parentc13e682 commit0f3221fCopy full SHA for 0f3221f

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -248,9 +248,9 @@ func login() *cobra.Command {`
`248`	`248`	`returnnil`
`249`	`249`	`},`
`250`	`250`	`}`
`251`		`-cliflag.StringVarP(cmd.Flags(),&email,"email","e","CODER_EMAIL","","Specifies an email address toauthenticate with.")`
`252`		`-cliflag.StringVarP(cmd.Flags(),&username,"username","u","CODER_USERNAME","","Specifies a username toauthenticate with.")`
`253`		`-cliflag.StringVarP(cmd.Flags(),&password,"password","p","CODER_PASSWORD","","Specifies a password toauthenticate with.")`
	`251`	`+cliflag.StringVarP(cmd.Flags(),&email,"first-user-email","","CODER_FIRST_USER_EMAIL","","Specifies an email address touse if creating the first user for the deployment.")`
	`252`	`+cliflag.StringVarP(cmd.Flags(),&username,"first-user-username","","CODER_FIRST_USER_USERNAME","","Specifies a username touse if creating the first user for the deployment.")`
	`253`	`+cliflag.StringVarP(cmd.Flags(),&password,"first-user-password","","CODER_FIRST_USER_PASSWORD","","Specifies a password touse if creating the first user for the deployment.")`
`254`	`254`	`returncmd`
`255`	`255`	`}`
`256`	`256`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func TestLogin(t *testing.T) {`
`74`	`74`	`// accurately detect Windows ptys when they are not attached to a process:`
`75`	`75`	`// https://github.com/mattn/go-isatty/issues/59`
`76`	`76`	`doneChan:=make(chanstruct{})`
`77`		`-root,_:=clitest.New(t,"login",client.URL.String(),"--username","testuser","--email","user@coder.com","--password","password")`
	`77`	`+root,_:=clitest.New(t,"login",client.URL.String(),"--first-user-username","testuser","--first-user-email","user@coder.com","--first-user-password","password")`
`78`	`78`	`pty:=ptytest.New(t)`
`79`	`79`	`root.SetIn(pty.Input())`
`80`	`80`	`root.SetOut(pty.Output())`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ provision:`
`95`	`95`	`# If we are already logged in, nothing to do`
`96`	`96`	`coder templates list >/dev/null 2>&1 && exit 0`
`97`	`97`	`# Set up initial user`
`98`		`- [ ! -e ~/.config/coderv2/session ] && coder login http://localhost:3000 --username admin --email admin@coder.com --password $(< /dev/urandom tr -dc _A-Z-a-z-0-9 \| head -c8 \| tee ${HOME}/.config/coderv2/password)`
	`98`	`+ [ ! -e ~/.config/coderv2/session ] && coder login http://localhost:3000 --first-user-username admin --first-user-email admin@coder.com --first-user-password $(< /dev/urandom tr -dc _A-Z-a-z-0-9 \| head -c8 \| tee ${HOME}/.config/coderv2/password)`
`99`	`99`	`# Create an initial template`
`100`	`100`	`temp_template_dir=$(mktemp -d)`
`101`	`101`	`echo code-server \| coder templates init "${temp_template_dir}"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ CODER_DEV_SHIM="${PROJECT_ROOT}/scripts/coder-dev.sh"`
`66`	`66`
`67`	`67`	`if [!-f"${PROJECT_ROOT}/.coderv2/developsh-did-first-setup" ];then`
`68`	`68`	`# Try to create the initial admin user.`
`69`		`-"${CODER_DEV_SHIM}" login http://127.0.0.1:3000 --username=admin --email=admin@coder.com --password="${password}"\|\|`
	`69`	`+"${CODER_DEV_SHIM}" login http://127.0.0.1:3000 --first-user-username=admin --first-user-email=admin@coder.com --first-user-password="${password}"\|\|`
`70`	`70`	`echo'Failed to create admin user. To troubleshoot, try running this command manually.'`
`71`	`71`
`72`	`72`	`# Try to create a regular user.`

Comments

(0)