cmd/juju: "juju user add" now takes --password

cmd/juju: "juju user add" now takes --password

As per requirements, changed the password option for the "user add"
command from a positional argument to an option (--password). This is
a better way of handling an optional argument anyway.

Also fixed a number of problems with the tests (excessive copy and
paste, misnamed test names etc).

https://code.launchpad.net/~menno.smits/juju-core/user-add-password-opt/+merge/220416

(do not edit description out of merge proposal)

[menn0, 2014-05-21 10:04:15]

Please take a look.

[menn0, 2014-05-21 10:14:09]

Please take a look.

[dave_cheney.net, 2014-05-22 04:10:54]

On 2014/05/21 10:14:09, menn0 wrote:
> Please take a look.

I'm seeing a test failure, which is possibly related

[LOG] 0:00.318 DEBUG juju.state.apiserver <- [116] <unknown>
{"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 0:00.319 DEBUG juju.state.apiserver hostPorts: []
[LOG] 0:00.319 DEBUG juju.state.apiserver -> [116] user-admin 634.639us
{"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
removeuser_test.go:22:
    c.Assert(err, gc.IsNil)
... value *errors.errorString = &errors.errorString{s:"unrecognized args:
[\"password\"]"} ("unrecognized args: [\"password\"]")

[LOG] 0:00.323 INFO juju.provider.dummy reset environment
[LOG] 0:00.323 INFO juju.state.apiserver [116] user-admin API connection
terminated after 5.534003ms
[LOG] 0:00.344 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.359 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.364 INFO juju.testing reset successfully reset admin password
OOPS: 233 passed, 2 skipped, 1 FAILED
--- FAIL: TestPackage (300.53 seconds)
FAIL
exit status 1
FAIL    launchpad.net/juju-core/cmd/juju        300.626s

[menn0, 2014-05-22 04:32:50]

On 2014/05/22 04:10:54, dfc wrote:
> On 2014/05/21 10:14:09, menn0 wrote:
> > Please take a look.
> 
> I'm seeing a test failure, which is possibly related
> 
> [LOG] 0:00.318 DEBUG juju.state.apiserver <- [116] <unknown>
>
{"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
> [LOG] 0:00.319 DEBUG juju.state.apiserver hostPorts: []
> [LOG] 0:00.319 DEBUG juju.state.apiserver -> [116] user-admin 634.639us
> {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
> removeuser_test.go:22:
>     c.Assert(err, gc.IsNil)
> ... value *errors.errorString = &errors.errorString{s:"unrecognized args:
> [\"password\"]"} ("unrecognized args: [\"password\"]")
> 
> [LOG] 0:00.323 INFO juju.provider.dummy reset environment
> [LOG] 0:00.323 INFO juju.state.apiserver [116] user-admin API connection
> terminated after 5.534003ms
> [LOG] 0:00.344 INFO juju.testing reset successfully reset admin password
> [LOG] 0:00.359 INFO juju.testing reset successfully reset admin password
> [LOG] 0:00.364 INFO juju.testing reset successfully reset admin password
> OOPS: 233 passed, 2 skipped, 1 FAILED
> --- FAIL: TestPackage (300.53 seconds)
> FAIL
> exit status 1
> FAIL    launchpad.net/juju-core/cmd/juju        300.626s

Fixed.

[menn0, 2014-05-22 04:36:46]

Please take a look.

[dave_cheney.net, 2014-05-22 05:10:56]

LGTM. Thanks.

https://codereview.appspot.com/100620046/diff/40001/cmd/juju/user_add.go
File cmd/juju/user_add.go (right):

https://codereview.appspot.com/100620046/diff/40001/cmd/juju/user_add.go#newc...
cmd/juju/user_add.go:64: return nil
delete, this code is unreachable

https://codereview.appspot.com/100620046/diff/40001/cmd/juju/user_add_test.go
File cmd/juju/user_add_test.go (left):

https://codereview.appspot.com/100620046/diff/40001/cmd/juju/user_add_test.go...
cmd/juju/user_add_test.go:50: func (s *UserAddCommandSuite)
TestJenvYamlFileOutput(c *gc.C) {
Please try to avoid moving large blocks of code around as it makes the diff
harder to read.

[menn0, 2014-05-22 05:32:12]

Thanks

https://codereview.appspot.com/100620046/diff/40001/cmd/juju/user_add.go
File cmd/juju/user_add.go (right):

https://codereview.appspot.com/100620046/diff/40001/cmd/juju/user_add.go#newc...
cmd/juju/user_add.go:64: return nil
On 2014/05/22 05:10:55, dfc wrote:
> delete, this code is unreachable

What about if len(args) == 1?

https://codereview.appspot.com/100620046/diff/40001/cmd/juju/user_add_test.go
File cmd/juju/user_add_test.go (left):

https://codereview.appspot.com/100620046/diff/40001/cmd/juju/user_add_test.go...
cmd/juju/user_add_test.go:50: func (s *UserAddCommandSuite)
TestJenvYamlFileOutput(c *gc.C) {
On 2014/05/22 05:10:56, dfc wrote:
> Please try to avoid moving large blocks of code around as it makes the diff
> harder to read.

Sorry. The original tests weren't too flash (test method names the wrong way
around and more) so I ended up doing quite a bit of reorganisation. In
retrospect, I should have done the clean up as a separate change and perhaps in
multiple steps.