cmd/juju/user: set controller name properly #7092
Conversation
cmd/juju/user/login.go
Outdated
| @@ -128,6 +129,7 @@ func (c *loginCommand) Init(args []string) error { | |||
|
|
|||
| // Run implements Command.Run. | |||
| func (c *loginCommand) Run(ctx *cmd.Context) error { | |||
| logger.Infof("in loginCommand.Run") | |||
There was a problem hiding this comment.
debugging remnant, deleted
| @@ -76,7 +76,7 @@ func (s *LoginCommandSuite) TestInitError(c *gc.C) { | |||
| } | |||
|
|
|||
| func (s *LoginCommandSuite) TestLogin(c *gc.C) { | |||
| stdout, stderr, code := runLogin(c, "current-user\nsekrit\n") | |||
| stdout, stderr, code := runLogin(c, "current-user\nsekrit\n", "-u") | |||
There was a problem hiding this comment.
Just checking, are there still some tests which check user logins without -u?
There was a problem hiding this comment.
You can't do a user login without -u any more.
|
Looks good overall. @juju/docs: Possible minor docs impact here. |
rogpeppe
force-pushed
the
136-fix-login-set-controller
branch
2 times, most recently
from
dbf7d6d
to
71ba0ff
Compare
cmd/juju/user/login.go
Outdated
| if controllerHost == "" { | ||
| if !c.forceHost { | ||
| return errNotControllerLogin | ||
| logger.Infof("controllerLogin") |
There was a problem hiding this comment.
Info looks high for this message, left over debugging?
There was a problem hiding this comment.
agreed that this probably shouldn't be here
rogpeppe
force-pushed
the
136-fix-login-set-controller
branch
2 times, most recently
from
6db30d6
to
a2ad6bb
Compare
cmd/juju/user/login.go
Outdated
| (either a known public controller or the host name of a public | ||
| controller). In this case, the -c flag can be used to choose a name for | ||
| the new controller. The -u flag causes it to log into a controller as a | ||
| local user instead - the -c flag names a current controller in this case. |
There was a problem hiding this comment.
I think this might be clearer for the above paragraph:
By default, the juju login command logs the user into a public controller. If the controller is already known it can be specified by name. Alternatively, the host name of a public controller can be specified. The -c flag can be used to specify a name for the controller when a host name is provided.
If the -u flag is provided, the juju login command will attempt to log into a controller as a local user. In this case, the -c flag names the controller to log in to.
This still assumes a fair bit of knowledge (e.g. the "public controller" and "local user" concepts) but I think it's clearer.
There was a problem hiding this comment.
Better, thanks. Done.
cmd/juju/user/login.go
Outdated
| if controllerHost == "" { | ||
| if !c.forceHost { | ||
| return errNotControllerLogin | ||
| logger.Infof("controllerLogin") |
There was a problem hiding this comment.
agreed that this probably shouldn't be here
| @@ -76,7 +76,7 @@ func (s *LoginCommandSuite) TestInitError(c *gc.C) { | |||
| } | |||
|
|
|||
| func (s *LoginCommandSuite) TestLogin(c *gc.C) { | |||
| stdout, stderr, code := runLogin(c, "current-user\nsekrit\n") | |||
| stdout, stderr, code := runLogin(c, "current-user\nsekrit\n", "-u") | |||
rogpeppe
force-pushed
the
136-fix-login-set-controller
branch
from
a2ad6bb
to
e83f06d
Compare
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Tests failed |
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
Because the controller wasn't being set, the ListControllers
call was failing. The tests still passed because the ListControllers
call was entirely mocked.
Also make a backwardly incompatible change so that the old
"juju login $user" behaviour is no longer the default - to log in as
a user, the "--user" (or "-u") flag is required.