Merge lp:~mattyw/juju-core/user-add-remove-cli into lp:~go-bot/juju-core/trunk

[Matthew Williams]

https://codereview.appspot.com/75600044/

Preliminary support for basic juju id commands:

juju add-user <username> <password>

if password is not supplied a strong one is generated.
The resulting jenv file is output (or saved to a file if -o option is provided)

juju remove-user <username>

doesn't actually remove the user. But mark them as inactive

add-user and remove-user aren't registered yet as they are useless without
login. But the details of this are still being worked out.

This branch also contains fixes for lp:1285256.
The EnvCommandBase struct includes a function for ensuring the envname is not ""

Preliminary support for basic juju id commands:

juju add-user <username> <password>

if password is not supplied uses gopass to take the password from the command line

juju remove-user <username>

doesn't actually remove the user. But mark them as inactive

add-user and remove-user aren't registered yet as they are useless without
login. But the details of this are still being worked out.

This branch also contains fixes for lp:1285256.
The EnvCommandBase struct includes a function for ensuring the envname is not "".

This replaces a review at https://codereview.appspot.com/51450047/

https://codereview.appspot.com/75600044/

[Matthew Williams (mattyw)]

Reviewers: mp+210962_code.launchpad.net,

Message:
Please take a look.

Description:
Preliminary support for basic juju id commands:

juju add-user <username> <password>

if password is not supplied uses gopass to take the password from the
command line

juju remove-user <username>

doesn't actually remove the user. But mark them as inactive

add-user and remove-user aren't registered yet as they are useless
without
login. But the details of this are still being worked out.

This branch also contains fixes for lp:1285256.
The EnvCommandBase struct includes a function for ensuring the envname
is not "".

This replaces a review at https://codereview.appspot.com/51450047/

https://code.launchpad.net/~mattyw/juju-core/user-add-remove-cli/+merge/210962

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/75600044/

Affected files (+497, -109 lines):
   A [revision details]
   M cmd/cmd.go
   M cmd/envcmd/environmentcommand.go
   M cmd/envcmd/environmentcommand_test.go
   M cmd/envcmd/export_test.go
   M cmd/juju/addmachine.go
   M cmd/juju/addrelation.go
   M cmd/juju/addunit.go
   A cmd/juju/adduser.go
   A cmd/juju/adduser_test.go
   M cmd/juju/authorisedkeys_add.go
   M cmd/juju/authorisedkeys_delete.go
   M cmd/juju/authorisedkeys_import.go
   M cmd/juju/authorisedkeys_list.go
   M cmd/juju/bootstrap.go
   M cmd/juju/cmd_test.go
   M cmd/juju/constraints.go
   M cmd/juju/debuglog_test.go
   M cmd/juju/deploy.go
   M cmd/juju/destroymachine.go
   M cmd/juju/destroyrelation.go
   M cmd/juju/destroyservice.go
   M cmd/juju/destroyunit.go
   M cmd/juju/endpoint.go
   M cmd/juju/environment.go
   M cmd/juju/expose.go
   M cmd/juju/get.go
   M cmd/juju/plugin.go
   M cmd/juju/publish.go
   M cmd/juju/publish_test.go
   A cmd/juju/removeuser.go
   A cmd/juju/removeuser_test.go
   M cmd/juju/resolved.go
   M cmd/juju/run.go
   M cmd/juju/set.go
   M cmd/juju/ssh.go
   M cmd/juju/status.go
   M cmd/juju/switch.go
   M cmd/juju/switch_test.go
   M cmd/juju/synctools.go
   M cmd/juju/unexpose.go
   M cmd/juju/unset.go
   M cmd/juju/upgradecharm.go
   M cmd/juju/upgradejuju.go
   M cmd/jujud/run.go
   M cmd/jujud/run_test.go
   M cmd/package_test.go
   M cmd/plugins/juju-metadata/imagemetadata.go
   M cmd/plugins/juju-metadata/toolsmetadata.go
   M cmd/plugins/juju-metadata/validateimagemetadata.go
   M cmd/plugins/juju-metadata/validatetoolsmetadata.go
   M cmd/plugins/juju-restore/restore.go
   M cmd/supercommand.go
   M errors/errors.go
   M juju/api.go
   M juju/osenv/vars_windows_test.go
   M state/api/params/params.go
   M state/apiserver/client/api_test.go
   M state/user.go
   M state/user_test.go
   M testing/environ.go
   M utils/ssh/ssh.go
   M utils/ssh/ssh_test.go

[Matthew Williams (mattyw)]

On 2014/03/14 05:17:51, mattyw wrote:
> Please take a look.

This follows on from the review here:
https://codereview.appspot.com/51450047/

https://codereview.appspot.com/75600044/

[William Reade (fwereade)]

Sorry, I don't think we're quite done here yet.

I am very happy with the EnvCommandBase stuff, though, so I'd swiftly
approve a CL that just landed those changes while we argue about the
UI/UX for user management.

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/addmachine.go
File cmd/juju/addmachine.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/addmachine.go#newcode60
cmd/juju/addmachine.go:60: envcmd.EnvCommandBase
This has been scratching at the back of my mind for a while... "Base"
isn't quite the right term. "EnvCommand" -- or, hey, why not
"EnvironmentCommand"? -- might actually be a bit clearer, but then it's
not really itself a *command* in itself. Bah.

Nothing necessarily actionable here because I can't actually suggest
anything better, but I'd love it if we did come up with a better name.

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser.go
File cmd/juju/adduser.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser.go#newcode59
cmd/juju/adduser.go:59: c.Password = args[1]
I'm still not really in love with allowing people to specify passwords
(especially in the absence of resetting post-distribution).

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser.go#newcode70
cmd/juju/adduser.go:70: return client.AddUser(c.User, c.Password)
Any possibility we could design this to output a .jenv (*without* all
the bootstrap-config stuff) on stdout? I think that the
pass-jenvs-around model is pretty tolerable, really.

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser_test.go
File cmd/juju/adduser_test.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser_test.go#newcode21
cmd/juju/adduser_test.go:21: func (s *AddUserSuite) Testadduser(c *gc.C)
{
TestAddUser, please

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser_test.go#newcode27
cmd/juju/adduser_test.go:27: c.Assert(err, gc.ErrorMatches, "Failed to
create user: user already exists")
we don't seem to have tests for the automatic password generation...

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/removeuser_test.go
File cmd/juju/removeuser_test.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/removeuser_test.go#newcode19
cmd/juju/removeuser_test.go:19: func (s *RemoveUserSuite)
Testremoveuser(c *gc.C) {
TestRemoveUser

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/removeuser_test.go#newcode24
cmd/juju/removeuser_test.go:24: c.Assert(err, gc.IsNil)
no tests for CheckEmpty etc (same applies to AddUser as well fwiw)

https://codereview.appspot.com/75600044/diff/20001/cmd/plugins/juju-metadata/validatetoolsmetadata.go
File cmd/plugins/juju-metadata/validatetoolsmetadata.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/plugins/juju-metadata/validatetoolsmetadata.go#newcode24
cmd/plugins/juju-metadata/validatetoolsmetadata.go:24:
envcmd.EnvCommandBase
Hmm. Shouldn't these be using Ensure..?

https://codereview.appspot.com/75600044/diff/20001/errors/errors.go
File errors/errors.go (right):

https://codereview.appspot.com/75600044/diff/20001/errors/errors.go#newcod...

[Matthew Williams (mattyw)]

Updated the comments, stuff I haven't commented on is stuff I will do

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser.go
File cmd/juju/adduser.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser.go#newcode59
cmd/juju/adduser.go:59: c.Password = args[1]
On 2014/03/18 01:11:39, fwereade wrote:
> I'm still not really in love with allowing people to specify passwords
> (especially in the absence of resetting post-distribution).

I'm not a huge fan of this either, it was added for two reasons:
1) Makes testing easier
2) Allows people to "script" adding users

Suggestions welcome

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser.go#newcode70
cmd/juju/adduser.go:70: return client.AddUser(c.User, c.Password)
On 2014/03/18 01:11:39, fwereade wrote:
> Any possibility we could design this to output a .jenv (*without* all
the
> bootstrap-config stuff) on stdout? I think that the pass-jenvs-around
model is
> pretty tolerable, really.

Let's discuss this

https://codereview.appspot.com/75600044/diff/20001/juju/osenv/vars_windows_test.go
File juju/osenv/vars_windows_test.go (right):

https://codereview.appspot.com/75600044/diff/20001/juju/osenv/vars_windows_test.go#newcode9
juju/osenv/vars_windows_test.go:9:
"launchpad.net/juju-core/testing/testbase"
On 2014/03/18 01:11:39, fwereade wrote:
> This is a bit surprising. Are you sure it's right?

I'll double check - I'm sure I was left with no choice at the time

https://codereview.appspot.com/75600044/diff/20001/state/user.go
File state/user.go (right):

https://codereview.appspot.com/75600044/diff/20001/state/user.go#newcode32
state/user.go:32: return nil, fmt.Errorf("password can't be empty")
On 2014/03/18 01:11:39, fwereade wrote:
> why can admin have an empty password set? (and wasn't there a constant
for
> "admin"?)

Admin does have a constant- must have missed this one.

I'm sure there was a reason for this - either we discussed it or not
having it caused problems - I'll double check

https://codereview.appspot.com/75600044/

[Matthew Williams (mattyw)]

https://codereview.appspot.com/75600044/diff/20001/errors/errors.go
File errors/errors.go (right):

https://codereview.appspot.com/75600044/diff/20001/errors/errors.go#newcode98
errors/errors.go:98: return fmt.Sprintf("rc: %v", e.Code)
On 2014/03/18 01:11:39, fwereade wrote:
> If we're touching this can we please do something about the
overwhelmingly
> shitty UX of being told "rc: 2", which means literally nothing to most
> semi-normal humans? just "subprocess exited with code 2" or
something... it'd be
> way better if we said *which* one but that's way out of scope.

Done.

https://codereview.appspot.com/75600044/diff/20001/juju/osenv/vars_windows_test.go
File juju/osenv/vars_windows_test.go (right):

https://codereview.appspot.com/75600044/diff/20001/juju/osenv/vars_windows_test.go#newcode9
juju/osenv/vars_windows_test.go:9:
"launchpad.net/juju-core/testing/testbase"
On 2014/03/18 03:45:22, mattyw wrote:
> On 2014/03/18 01:11:39, fwereade wrote:
> > This is a bit surprising. Are you sure it's right?

> I'll double check - I'm sure I was left with no choice at the time

Done.

https://codereview.appspot.com/75600044/diff/20001/state/user.go
File state/user.go (right):

https://codereview.appspot.com/75600044/diff/20001/state/user.go#newcode32
state/user.go:32: return nil, fmt.Errorf("password can't be empty")
On 2014/03/18 03:45:22, mattyw wrote:
> On 2014/03/18 01:11:39, fwereade wrote:
> > why can admin have an empty password set? (and wasn't there a
constant for
> > "admin"?)

> Admin does have a constant- must have missed this one.

> I'm sure there was a reason for this - either we discussed it or not
having it
> caused problems - I'll double check

Done.

https://codereview.appspot.com/75600044/

[Matthew Williams (mattyw)]

Please take a look.

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser_test.go
File cmd/juju/adduser_test.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser_test.go#newcode21
cmd/juju/adduser_test.go:21: func (s *AddUserSuite) Testadduser(c *gc.C)
{
On 2014/03/18 01:11:39, fwereade wrote:
> TestAddUser, please

Done.

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/adduser_test.go#newcode27
cmd/juju/adduser_test.go:27: c.Assert(err, gc.ErrorMatches, "Failed to
create user: user already exists")
On 2014/03/18 01:11:39, fwereade wrote:
> we don't seem to have tests for the automatic password generation...
This isn't supported in the adduser stuff at the moment. Can I add this
in a separate branch?

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/removeuser_test.go
File cmd/juju/removeuser_test.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/removeuser_test.go#newcode19
cmd/juju/removeuser_test.go:19: func (s *RemoveUserSuite)
Testremoveuser(c *gc.C) {
On 2014/03/18 01:11:39, fwereade wrote:
> TestRemoveUser

Done.

https://codereview.appspot.com/75600044/diff/20001/cmd/juju/removeuser_test.go#newcode24
cmd/juju/removeuser_test.go:24: c.Assert(err, gc.IsNil)
On 2014/03/18 01:11:39, fwereade wrote:
> no tests for CheckEmpty etc (same applies to AddUser as well fwiw)

Done.

https://codereview.appspot.com/75600044/diff/20001/cmd/plugins/juju-metadata/validatetoolsmetadata.go
File cmd/plugins/juju-metadata/validatetoolsmetadata.go (right):

https://codereview.appspot.com/75600044/diff/20001/cmd/plugins/juju-metadata/validatetoolsmetadata.go#newcode24
cmd/plugins/juju-metadata/validatetoolsmetadata.go:24:
envcmd.EnvCommandBase
On 2014/03/18 01:11:39, fwereade wrote:
> Hmm. Shouldn't these be using Ensure..?

Done.

https://codereview.appspot.com/75600044/diff/20001/errors/errors.go
File errors/errors.go (right):

https://codereview.appspot.com/75600044/diff/20001/errors/errors.go#newcode124
errors/errors.go:124: // return code from the cmd.Main function rather
than the default of 1 if
On 2014/03/18 01:11:39, fwereade wrote:
> and this comment in particular makes me wonder whether it's right to
have moved
> it. I think it *is* but it's a conceptual boundary violation to
mention cmd.Main
> in this context -- can we maybe just give it a generic name like
"ExitCodeError"
> and keep the special handling details in cmd.Main?

> Scope issues again, though, so you can TODO this with a bug tagged
tech-debt if
> you like.

Done.

https://codereview.appspot.com/75600044/

[William Reade (fwereade)]

TYVM for all the fixes -- a couple of bits need some work, but they'll
hopefully be changes that simplify/reduce scope rather than otherwise.
Let me know what you think.

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

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode61
cmd/juju/adduser.go:61: pass, err := terminal.ReadPassword(0)
I'm not sure we really want this -- it STM to qualify as actual logic,
and thus to belong in Run rather than Init. It also should be using
stdin/out/err from the cmd.Context passed into run. Furthermore,
ReadPassword seems like overkill when we're just going to be storing it
in plaintext locally.

Let's just give them a default strong password in that case?

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode68
cmd/juju/adduser.go:68: c.Password = args[1]
I feel this lot could be easier to follow. If we drop the terminal
stuff, how about something like:

switch len(args) {
case 0:
     return fmt.Errorf("no username supplied")
case 1:
     c.Password = utils.RandomPassword()
case 2:
     c.Password = args[1]
default:
     return cmd.CheckEmpty(args[2:])
}
c.User = args[0]
return nil

..? YMMV, just a suggestion.

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode88
cmd/juju/adduser.go:88:
//info.SetAPICredentials(configstore.APICredentials{c.User, c.Password})
d

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode89
cmd/juju/adduser.go:89:
//info.SetBootstrapConfig(map[string]interface{}{})
d

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode98
cmd/juju/adduser.go:98: err = ioutil.WriteFile(c.OutputFile, data, 0777)
You need to ctx.AbsPath() this so we can test relative paths work right.

https://codereview.appspot.com/75600044/diff/40001/environs/configstore/disk.go
File environs/configstore/disk.go (right):

https://codereview.appspot.com/75600044/diff/40001/environs/configstore/disk.go#newcode33
environs/configstore/disk.go:33: type EnvInfo struct {
I don't think we can just expose this type, it opens up all sorts of
cans of worms with Write and suchlike.

Would you extract the exported fields into a separate exported type, but
keep this one private, and embed the exported type therein? You'd need
to tweak the marshalling to read/write the embedded struct, not
environInfo itself, but it should otherwise be trivial. Make sense?

https://codereview.appspot.com/75600044/diff/40001/environs/configstore/disk.go#newcode168
environs/configstore/disk.go:168: func (info *EnvInfo) Write() error {
Yeah, this isn't going to be too happy if it's created without a .path.
Keep this type private, please.

https://codereview.appspot.com/75600044/

[Matthew Williams (mattyw)]

Please take a look.

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

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode61
cmd/juju/adduser.go:61: pass, err := terminal.ReadPassword(0)
On 2014/03/27 12:14:34, fwereade wrote:
> I'm not sure we really want this -- it STM to qualify as actual logic,
and thus
> to belong in Run rather than Init. It also should be using
stdin/out/err from
> the cmd.Context passed into run. Furthermore, ReadPassword seems like
overkill
> when we're just going to be storing it in plaintext locally.

> Let's just give them a default strong password in that case?

Done.

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode68
cmd/juju/adduser.go:68: c.Password = args[1]
On 2014/03/27 12:14:34, fwereade wrote:
> I feel this lot could be easier to follow. If we drop the terminal
stuff, how
> about something like:

> switch len(args) {
> case 0:
> return fmt.Errorf("no username supplied")
> case 1:
> c.Password = utils.RandomPassword()
> case 2:
> c.Password = args[1]
> default:
> return cmd.CheckEmpty(args[2:])
> }
> c.User = args[0]
> return nil

> ..? YMMV, just a suggestion.

This is a great idea - let'd do this!

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode68
cmd/juju/adduser.go:68: c.Password = args[1]
On 2014/03/27 12:14:34, fwereade wrote:
> I feel this lot could be easier to follow. If we drop the terminal
stuff, how
> about something like:

> switch len(args) {
> case 0:
> return fmt.Errorf("no username supplied")
> case 1:
> c.Password = utils.RandomPassword()
> case 2:
> c.Password = args[1]
> default:
> return cmd.CheckEmpty(args[2:])
> }
> c.User = args[0]
> return nil

> ..? YMMV, just a suggestion.

Done.

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode88
cmd/juju/adduser.go:88:
//info.SetAPICredentials(configstore.APICredentials{c.User, c.Password})
On 2014/03/27 12:14:34, fwereade wrote:
> d

Done.

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode89
cmd/juju/adduser.go:89:
//info.SetBootstrapConfig(map[string]interface{}{})
On 2014/03/27 12:14:34, fwereade wrote:
> d

Done.

https://codereview.appspot.com/75600044/diff/40001/cmd/juju/adduser.go#newcode98
cmd/juju/adduser.go:98: err = ioutil.WriteFile(c.OutputFile, data, 0777)
On 2014/03/27 12:14:34, fwereade wrote:
> You need to ctx.AbsPath() this so we can test relative paths work
right.

Done.

https://codereview.appspot.com/75600044/

[William Reade (fwereade)]

Couple more tweaks to the command, and a couple of tests (and the json
marshalling); should be the last round.

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser.go
File cmd/juju/adduser.go (right):

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser.go#newcode21
cmd/juju/adduser.go:21: when the environent is destroyed.
Mention that it writes to stdout by default?

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser.go#newcode64
cmd/juju/adduser.go:64: fmt.Println(c.Password)
This isn't using the context to print, which it should; but it can't,
because Init. And really, dammit, we shouldn't be erroring for reasons
unrelated to arg-parsing here at all. Sorry I didn't spot this earlier.

Let's just lose the printing, because it'll be written out anyway in a
mo -- or, ?nicer?, leave c.Password empty, and do the RandomPassword in
Run if c.Password == "".

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser.go#newcode98
cmd/juju/adduser.go:98: return c.out.Write(ctx, outputInfo)
I think I'd still write this stuff out before calling AddUser -- a
nonsense jenv can be regenerated, but you can't recover the password if
the process goes down before we write it out.

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser_test.go
File cmd/juju/adduser_test.go (right):

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser_test.go#newcode59
cmd/juju/adduser_test.go:59: c.Assert(string(data), gc.DeepEquals,
string(expectedStr))
We should have some basic tests for --format to stdout and to -o. Don't
necessarily need to go overboard.

https://codereview.appspot.com/75600044/

[Matthew Williams (mattyw)]

Please take a look.

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser.go
File cmd/juju/adduser.go (right):

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser.go#newcode21
cmd/juju/adduser.go:21: when the environent is destroyed.
On 2014/03/27 17:27:23, fwereade wrote:
> Mention that it writes to stdout by default?

Done.

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser.go#newcode64
cmd/juju/adduser.go:64: fmt.Println(c.Password)
On 2014/03/27 17:27:23, fwereade wrote:
> This isn't using the context to print, which it should; but it can't,
because
> Init. And really, dammit, we shouldn't be erroring for reasons
unrelated to
> arg-parsing here at all. Sorry I didn't spot this earlier.

> Let's just lose the printing, because it'll be written out anyway in a
mo -- or,
> ?nicer?, leave c.Password empty, and do the RandomPassword in Run if
c.Password
> == "".

Done.

https://codereview.appspot.com/75600044/diff/60001/cmd/juju/adduser.go#newcode98
cmd/juju/adduser.go:98: return c.out.Write(ctx, outputInfo)
On 2014/03/27 17:27:23, fwereade wrote:
> I think I'd still write this stuff out before calling AddUser -- a
nonsense jenv
> can be regenerated, but you can't recover the password if the process
goes down
> before we write it out.

Done.

https://codereview.appspot.com/75600044/

[William Reade (fwereade)]

LGTM with trivial fixes:

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser.go
File cmd/juju/adduser.go (right):

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser.go#newcode22
cmd/juju/adduser.go:22: An example jenv file will be output to allow you
to use the environment as that user.
A jenv file identifying the user and the environment will be written to
stdout, or to a path you specify with --output.

When add-environment lands, please add a note to this doc saying what
you can do with the jenv.

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser.go#newcode35
cmd/juju/adduser.go:35: generatePassword bool
I rather like exporting the fields that get set up by Init at least --
and this field should really go next to Password.

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser_test.go
File cmd/juju/adduser_test.go (right):

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser_test.go#newcode48
cmd/juju/adduser_test.go:48: ca-cert: ""
because yaml is evil, please test the output by parsing it, rather than
just checking for equality.

https://codereview.appspot.com/75600044/diff/80001/environs/info/info.go
File environs/info/info.go (right):

https://codereview.appspot.com/75600044/diff/80001/environs/info/info.go#newcode6
environs/info/info.go:6: // TODO add json tags
d

https://codereview.appspot.com/75600044/

[Matthew Williams (mattyw)]

Please take a look.

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser.go
File cmd/juju/adduser.go (right):

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser.go#newcode22
cmd/juju/adduser.go:22: An example jenv file will be output to allow you
to use the environment as that user.
On 2014/03/28 10:09:22, fwereade wrote:
> A jenv file identifying the user and the environment will be written
to stdout,
> or to a path you specify with --output.

> When add-environment lands, please add a note to this doc saying what
you can do
> with the jenv.

Done.

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser.go#newcode35
cmd/juju/adduser.go:35: generatePassword bool
On 2014/03/28 10:09:22, fwereade wrote:
> I rather like exporting the fields that get set up by Init at least --
and this
> field should really go next to Password.

Done.

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser_test.go
File cmd/juju/adduser_test.go (right):

https://codereview.appspot.com/75600044/diff/80001/cmd/juju/adduser_test.go#newcode48
cmd/juju/adduser_test.go:48: ca-cert: ""
On 2014/03/28 10:09:22, fwereade wrote:
> because yaml is evil, please test the output by parsing it, rather
than just
> checking for equality.

Done.

https://codereview.appspot.com/75600044/diff/80001/environs/info/info.go
File environs/info/info.go (right):

https://codereview.appspot.com/75600044/diff/80001/environs/info/info.go#newcode6
environs/info/info.go:6: // TODO add json tags
On 2014/03/28 10:09:22, fwereade wrote:
> d

Done.

https://codereview.appspot.com/75600044/

[William Reade (fwereade)]

LGTM, thanks

https://codereview.appspot.com/75600044/

[Matthew Williams (mattyw)]

Please take a look.

https://codereview.appspot.com/75600044/

[Go Bot (go-bot)]

The attempt to merge lp:~mattyw/juju-core/user-add-remove-cli into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.013s
ok launchpad.net/juju-core/agent 1.083s
ok launchpad.net/juju-core/agent/mongo 0.554s
ok launchpad.net/juju-core/agent/tools 0.208s
ok launchpad.net/juju-core/bzr 5.396s
ok launchpad.net/juju-core/cert 2.426s
ok launchpad.net/juju-core/charm 0.381s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.027s
ok launchpad.net/juju-core/cloudinit/sshinit 0.834s
ok launchpad.net/juju-core/cmd 0.152s
ok launchpad.net/juju-core/cmd/charm-admin 0.780s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.248s

----------------------------------------------------------------------
FAIL: bootstrap_test.go:364: BootstrapSuite.TestBootstrapTwice

[LOG] 17.73050 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 17.73051 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 17.73059 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/gocheck-1976235410884491574/24/tools/streams/v1/index.sjson": stat /tmp/gocheck-1976235410884491574/24/tools/streams/v1/index.sjson: no such file or directory
[LOG] 17.73062 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/gocheck-1976235410884491574/24/tools/streams/v1/index.sjson": invalid URL "file:///tmp/gocheck-1976235410884491574/24/tools/streams/v1/index.sjson" not found
[LOG] 17.73067 DEBUG juju.environs.simplestreams fetchData failed for "file:///tmp/gocheck-1976235410884491574/24/tools/streams/v1/index.json": stat /tmp/gocheck-1976235410884491574/24/tools/streams/v1/index.json: no such file or directory
[LOG] 17.73070 DEBUG juju.environs.simplestreams cannot load index "file:///tmp/gocheck-1976235410884491574/24/tools/streams/v1/index.json": invalid URL "file:///tmp/gocheck-1976235410884491574/24/tools/streams/v1/index.json" not found
[LOG] 17.73211 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 17.73241 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 17.73290 INFO juju.provider.dummy reset environment
[LOG] 17.73654 INFO juju Reset successfully reset admin password
[LOG] 17.73733 DEBUG juju.environs.configstore Making /tmp/gocheck-1976235410884491574/25/.juju/environments
clearing private storage
removing files: []
[LOG] 17.84044 WARNING juju.cmd.juju ignoring environments.yaml: using bootstrap config in file "/tmp/gocheck-1976235410884491574/25/.juju/environments/peckham.jenv"
[LOG] 17.84120 DEBUG juju.environs ConfigForName found bootstrap config map[string]interface {}{"admin-secret":"arble", "bootstrap-addresses-delay":10, "image-stream":"", "logging-config":"<root>=DEBUG;unit=DEBUG", "development":false, "firewall-mode":"instance", "syslog-port":6514, "bootstrap-timeout":600, "broken":"", "name":"peckham", "ca-cert":"-----BEGIN CERTIFICATE-----\nMIIB2DCCAY...

[Roger Peppe (rogpeppe)]

Looks great in general, with some comments and suggestions below.

https://codereview.appspot.com/75600044/diff/120001/cmd/envcmd/environmentcommand.go
File cmd/envcmd/environmentcommand.go (right):

https://codereview.appspot.com/75600044/diff/120001/cmd/envcmd/environmentcommand.go#newcode67
cmd/envcmd/environmentcommand.go:67: func (c *EnvCommandBase)
EnsureEnvNameSet() error {
I suggest that Init would be a more appropriate name for this method (we
want every command that embeds it to call it)

// Init initializes the Command.
func (c *Command) Init() error

https://codereview.appspot.com/75600044/diff/120001/cmd/plugins/juju-restore/restore.go
File cmd/plugins/juju-restore/restore.go (right):

https://codereview.appspot.com/75600044/diff/120001/cmd/plugins/juju-restore/restore.go#newcode92
cmd/plugins/juju-restore/restore.go:92: if c.showDescription {
this should call EnsureEnvNameSet, presumably?

https://codereview.appspot.com/75600044/diff/120001/environs/info/info.go
File environs/info/info.go (right):

https://codereview.appspot.com/75600044/diff/120001/environs/info/info.go#newcode6
environs/info/info.go:6: type EnvironInfo struct {
Why does this need its own package?

https://codereview.appspot.com/75600044/diff/120001/environs/manual/provisioner_test.go
File environs/manual/provisioner_test.go (right):

https://codereview.appspot.com/75600044/diff/120001/environs/manual/provisioner_test.go#newcode112
environs/manual/provisioner_test.go:112: c.Assert(err, gc.ErrorMatches,
"error checking if provisioned: subprocess encountered error code 255")
I know it's not your doing, but I don't like seeing these error
messages. An error code tells us almost nothing. We really need to
change things so we use stderr when possible. No action required, just
saying.

https://codereview.appspot.com/75600044/diff/120001/errors/errors.go
File errors/errors.go (right):

https://codereview.appspot.com/75600044/diff/120001/errors/errors.go#newcode101
errors/errors.go:101: func IsRcPassthroughError(err error) bool {
If reasonable, I think this really does belong to cmd, because it
pertains directly to functionality in that package.

https://codereview.appspot.com/75600044/diff/120001/errors/errors.go#newcode126
errors/errors.go:126: // TODO (mattyw) It's odd that we're talking about
cmd.Main in here.
indeed

https://codereview.appspot.com/75600044/diff/120001/juju/api.go
File juju/api.go (right):

https://codereview.appspot.com/75600044/diff/120001/juju/api.go#newcode104
juju/api.go:104: func NewUserManagerClient(envName string)
(*usermanager.Client, error) {
Rather than create a new function in juju for every single API client,
I'd prefer to just export NewAPIClient here, and for clients to use
facade New methods as appropriate.

So I'd delete NewKeyManagerClient and NewUserManagerClient, and add
methods to api.Client, KeyManager and UserManager.

That means a certain amount of shake up (the New functions need to
change to take an interface to avoid cyclic imports), but it's the same
pattern that works well for agents, and consistency is good.

Perhaps leave it like it is for now, and address that in a subsequent
CL?

https://codereview.appspot.com/7560...

[Matthew Williams (mattyw)]

https://codereview.appspot.com/75600044/diff/120001/cmd/envcmd/environmentcommand.go
File cmd/envcmd/environmentcommand.go (right):

https://codereview.appspot.com/75600044/diff/120001/cmd/envcmd/environmentcommand.go#newcode67
cmd/envcmd/environmentcommand.go:67: func (c *EnvCommandBase)
EnsureEnvNameSet() error {
On 2014/03/31 14:21:12, rog wrote:
> I suggest that Init would be a more appropriate name for this method
(we want
> every command that embeds it to call it)

> // Init initializes the Command.
> func (c *Command) Init() error

Done.

https://codereview.appspot.com/75600044/diff/120001/cmd/plugins/juju-restore/restore.go
File cmd/plugins/juju-restore/restore.go (right):

https://codereview.appspot.com/75600044/diff/120001/cmd/plugins/juju-restore/restore.go#newcode92
cmd/plugins/juju-restore/restore.go:92: if c.showDescription {
On 2014/03/31 14:21:12, rog wrote:
> this should call EnsureEnvNameSet, presumably?

Done.

https://codereview.appspot.com/75600044/diff/120001/environs/info/info.go
File environs/info/info.go (right):

https://codereview.appspot.com/75600044/diff/120001/environs/info/info.go#newcode6
environs/info/info.go:6: type EnvironInfo struct {
On 2014/03/31 14:21:12, rog wrote:
> Why does this need its own package?

Done.

https://codereview.appspot.com/75600044/diff/120001/errors/errors.go
File errors/errors.go (right):

https://codereview.appspot.com/75600044/diff/120001/errors/errors.go#newcode101
errors/errors.go:101: func IsRcPassthroughError(err error) bool {
On 2014/03/31 14:21:12, rog wrote:
> If reasonable, I think this really does belong to cmd, because it
pertains
> directly to functionality in that package.

Done.

https://codereview.appspot.com/75600044/diff/120001/errors/errors.go#newcode126
errors/errors.go:126: // TODO (mattyw) It's odd that we're talking about
cmd.Main in here.
On 2014/03/31 14:21:12, rog wrote:
> indeed

Done.

https://codereview.appspot.com/75600044/diff/120001/juju/api.go
File juju/api.go (right):

https://codereview.appspot.com/75600044/diff/120001/juju/api.go#newcode104
juju/api.go:104: func NewUserManagerClient(envName string)
(*usermanager.Client, error) {
On 2014/03/31 14:21:12, rog wrote:
> Rather than create a new function in juju for every single API client,
I'd
> prefer to just export NewAPIClient here, and for clients to use facade
New
> methods as appropriate.

> So I'd delete NewKeyManagerClient and NewUserManagerClient, and add
methods to
> api.Client, KeyManager and UserManager.

https://bugs.launchpad.net/juju-core/+bug/1300637
> That means a certain amount of shake up (the New functions need to
change to
> take an interface to avoid cyclic imports), but it's the same pattern
that works
> well for agents, and consistency is good.

> Perhaps leave it like it is for now, and address that in a subsequent
CL?

https://codereview.appspot.com/75600044/diff/120001/testing/environ.go
File testing/environ.go (right):

https://codereview.appspot.com/75600044/diff/120001/testing/environ.go#newcode247
testing/environ.go:247: func MakeSampleHomeWithFiles(c *gc.C, files
[]TestFile) *FakeHome {
On 2014/03/31 14:21:12, rog wrote:
> Or perhaps change MakeSampleHome to be:

> func...

[Matthew Williams (mattyw)]

Please take a look.

https://codereview.appspot.com/75600044/

[William Reade (fwereade)]

I'm a little bit irritated at the changes to EnsureEnvNameSet, and the
EnvironInfoData type, but neither decision is irrevocable and I really
cannot be bothered to fight them; let's just land this.

LGTM contingent on the other tweaks below, ping me if anything's not
clear.

https://codereview.appspot.com/75600044/diff/120001/cmd/envcmd/environmentcommand.go
File cmd/envcmd/environmentcommand.go (right):

https://codereview.appspot.com/75600044/diff/120001/cmd/envcmd/environmentcommand.go#newcode67
cmd/envcmd/environmentcommand.go:67: func (c *EnvCommandBase)
EnsureEnvNameSet() error {
On 2014/04/01 08:07:31, mattyw wrote:
> On 2014/03/31 14:21:12, rog wrote:
> > I suggest that Init would be a more appropriate name for this method
(we want
> > every command that embeds it to call it)
> >
> > // Init initializes the Command.
> > func (c *Command) Init() error

> Done.

I suggest that it would not, because it's aping the cmd.Command
interface but not actually satisfying it; and it has different
responsibilities, which might be most relevant at Init time but are
actually to do with, uh, ensuring an environment is set...

https://codereview.appspot.com/75600044/diff/120001/environs/info/info.go
File environs/info/info.go (right):

https://codereview.appspot.com/75600044/diff/120001/environs/info/info.go#newcode6
environs/info/info.go:6: type EnvironInfo struct {
On 2014/04/01 08:07:31, mattyw wrote:
> On 2014/03/31 14:21:12, rog wrote:
> > Why does this need its own package?

> Done.

What's the benefit of removing a small and focused package in favour of
jamming its contents into a tangentially-related one? at the cost of a
sensible type name?

https://codereview.appspot.com/75600044/diff/120001/environs/manual/provisioner_test.go
File environs/manual/provisioner_test.go (right):

https://codereview.appspot.com/75600044/diff/120001/environs/manual/provisioner_test.go#newcode112
environs/manual/provisioner_test.go:112: c.Assert(err, gc.ErrorMatches,
"error checking if provisioned: subprocess encountered error code 255")
On 2014/03/31 14:21:12, rog wrote:
> I know it's not your doing, but I don't like seeing these error
messages. An
> error code tells us almost nothing. We really need to change things so
we use
> stderr when possible. No action required, just saying.

Progress not perfection. This beats the hell out of "rc:255" :).

https://codereview.appspot.com/75600044/diff/140001/cmd/juju/adduser.go
File cmd/juju/adduser.go (right):

https://codereview.appspot.com/75600044/diff/140001/cmd/juju/adduser.go#newcode98
cmd/juju/adduser.go:98: c.out.Write(ctx, outputInfo)
doesn't this return an error?

https://codereview.appspot.com/75600044/diff/140001/cmd/juju/environment.go
File cmd/juju/environment.go (right):

https://codereview.appspot.com/75600044/diff/140001/cmd/juju/environment.go#newcode219
cmd/juju/environment.go:219: func (c *UnsetEnvironmentCommand) Init(args
[]string) (err error) {
This needs EnsureEnvNameSet as well

https://codereview.appspot.com/75600044/diff/140001/juju/api.go
File juju/api.go (right):

https://codereview.appspot.com/75600044/diff/140001/juju/api.go#newcode136
juju/api.go:136: envs, err := environs.ReadEnvirons(""...

[Matthew Williams (mattyw)]

https://codereview.appspot.com/75600044/diff/140001/cmd/juju/adduser.go
File cmd/juju/adduser.go (right):

https://codereview.appspot.com/75600044/diff/140001/cmd/juju/adduser.go#newcode98
cmd/juju/adduser.go:98: c.out.Write(ctx, outputInfo)
On 2014/04/01 09:40:54, fwereade wrote:
> doesn't this return an error?

Done.

https://codereview.appspot.com/75600044/diff/140001/cmd/juju/environment.go
File cmd/juju/environment.go (right):

https://codereview.appspot.com/75600044/diff/140001/cmd/juju/environment.go#newcode219
cmd/juju/environment.go:219: func (c *UnsetEnvironmentCommand) Init(args
[]string) (err error) {
On 2014/04/01 09:40:54, fwereade wrote:
> This needs EnsureEnvNameSet as well

Done.

https://codereview.appspot.com/75600044/diff/140001/juju/api.go
File juju/api.go (right):

https://codereview.appspot.com/75600044/diff/140001/juju/api.go#newcode136
juju/api.go:136: envs, err := environs.ReadEnvirons("")
On 2014/04/01 09:40:54, fwereade wrote:
> Shouldn't this code have been deleted? We should never have an empty
envName to
> deal with now...
https://bugs.launchpad.net/juju-core/+bug/1300823

https://codereview.appspot.com/75600044/

[Matthew Williams (mattyw)]

Please take a look.

https://codereview.appspot.com/75600044/

=== modified file 'cmd/cmd.go'
--- cmd/cmd.go	2014-03-26 01:17:17 +0000
+++ cmd/cmd.go	2014-04-01 14:32:48 +0000
@@ -17,16 +17,16 @@
 	"launchpad.net/gnuflag"
 )
 
-type rcPassthroughError struct {
-	code int
+type RcPassthroughError struct {
+	Code int
 }
 
-func (e *rcPassthroughError) Error() string {
-	return fmt.Sprintf("rc: %v", e.code)
+func (e *RcPassthroughError) Error() string {
+	return fmt.Sprintf("subprocess encountered error code %v", e.Code)
 }
 
 func IsRcPassthroughError(err error) bool {
-	_, ok := err.(*rcPassthroughError)
+	_, ok := err.(*RcPassthroughError)
 	return ok
 }
 
@@ -34,7 +34,7 @@
 // return code from the cmd.Main function rather than the default of 1 if
 // there is an error.
 func NewRcPassthroughError(code int) error {
-	return &rcPassthroughError{code}
+	return &RcPassthroughError{code}
 }
 
 // ErrSilent can be returned from Run to signal that Main should exit with
@@ -243,7 +243,7 @@
 	}
 	if err := c.Run(ctx); err != nil {
 		if IsRcPassthroughError(err) {
-			return err.(*rcPassthroughError).code
+			return err.(*RcPassthroughError).Code
 		}
 		if err != ErrSilent {
 			fmt.Fprintf(ctx.Stderr, "error: %v\n", err)

=== added directory 'cmd/envcmd'
=== renamed file 'cmd/environmentcommand.go' => 'cmd/envcmd/environmentcommand.go'
--- cmd/environmentcommand.go	2014-01-22 22:48:54 +0000
+++ cmd/envcmd/environmentcommand.go	2014-04-01 14:32:48 +0000
@@ -1,7 +1,7 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package cmd
+package envcmd
 
 import (
 	"fmt"
@@ -12,6 +12,8 @@
 
 	"launchpad.net/gnuflag"
 
+	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/juju/osenv"
 )
 
@@ -20,7 +22,7 @@
 // The purpose of EnvCommandBase is to provide a default member and flag
 // setting for commands that deal across different environments.
 type EnvCommandBase struct {
-	CommandBase
+	cmd.CommandBase
 	EnvName string
 }
 
@@ -62,6 +64,17 @@
 	return ReadCurrentEnvironment()
 }
 
+func (c *EnvCommandBase) Init() error {
+	if c.EnvName == "" {
+		envs, err := environs.ReadEnvirons("")
+		if err != nil {
+			return err
+		}
+		c.EnvName = envs.Default
+	}
+	return nil
+}
+
 func (c *EnvCommandBase) SetFlags(f *gnuflag.FlagSet) {
 	defaultEnv := getDefaultEnvironment()
 	f.StringVar(&c.EnvName, "e", defaultEnv, "juju environment to operate in")

=== renamed file 'cmd/environmentcommand_test.go' => 'cmd/envcmd/environmentcommand_test.go'
--- cmd/environmentcommand_test.go	2014-01-22 22:48:54 +0000
+++ cmd/envcmd/environmentcommand_test.go	2014-04-01 14:32:48 +0000
@@ -1,27 +1,30 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package cmd_test
+package envcmd_test
 
 import (
 	"io/ioutil"
 	"os"
+	"testing"
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju/osenv"
-	"launchpad.net/juju-core/testing"
+	jujutesting "launchpad.net/juju-core/testing"
 )
 
 type EnvironmentCommandSuite struct {
-	home *testing.FakeHome
+	home *jujutesting.FakeHome
 }
 
 var _ = gc.Suite(&EnvironmentCommandSuite{})
 
+func Test(t *testing.T) { gc.TestingT(t) }
+
 func (s *EnvironmentCommandSuite) SetUpTest(c *gc.C) {
-	s.home = testing.MakeEmptyFakeHome(c)
+	s.home = jujutesting.MakeEmptyFakeHome(c)
 }
 
 func (s *EnvironmentCommandSuite) TearDownTest(c *gc.C) {
@@ -29,54 +32,54 @@
 }
 
 func (s *EnvironmentCommandSuite) TestReadCurrentEnvironmentUnset(c *gc.C) {
-	env := cmd.ReadCurrentEnvironment()
+	env := envcmd.ReadCurrentEnvironment()
 	c.Assert(env, gc.Equals, "")
 }
 
 func (s *EnvironmentCommandSuite) TestReadCurrentEnvironmentSet(c *gc.C) {
-	err := cmd.WriteCurrentEnvironment("fubar")
+	err := envcmd.WriteCurrentEnvironment("fubar")
 	c.Assert(err, gc.IsNil)
-	env := cmd.ReadCurrentEnvironment()
+	env := envcmd.ReadCurrentEnvironment()
 	c.Assert(env, gc.Equals, "fubar")
 }
 
 func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentNothingSet(c *gc.C) {
-	env := cmd.GetDefaultEnvironment()
+	env := envcmd.GetDefaultEnvironment()
 	c.Assert(env, gc.Equals, "")
 }
 
 func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentCurrentEnvironmentSet(c *gc.C) {
-	err := cmd.WriteCurrentEnvironment("fubar")
+	err := envcmd.WriteCurrentEnvironment("fubar")
 	c.Assert(err, gc.IsNil)
-	env := cmd.GetDefaultEnvironment()
+	env := envcmd.GetDefaultEnvironment()
 	c.Assert(env, gc.Equals, "fubar")
 }
 
 func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentJujuEnvSet(c *gc.C) {
 	os.Setenv(osenv.JujuEnvEnvKey, "magic")
-	env := cmd.GetDefaultEnvironment()
+	env := envcmd.GetDefaultEnvironment()
 	c.Assert(env, gc.Equals, "magic")
 }
 
 func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentBothSet(c *gc.C) {
 	os.Setenv(osenv.JujuEnvEnvKey, "magic")
-	err := cmd.WriteCurrentEnvironment("fubar")
+	err := envcmd.WriteCurrentEnvironment("fubar")
 	c.Assert(err, gc.IsNil)
-	env := cmd.GetDefaultEnvironment()
+	env := envcmd.GetDefaultEnvironment()
 	c.Assert(env, gc.Equals, "magic")
 }
 
 func (s *EnvironmentCommandSuite) TestWriteAddsNewline(c *gc.C) {
-	err := cmd.WriteCurrentEnvironment("fubar")
+	err := envcmd.WriteCurrentEnvironment("fubar")
 	c.Assert(err, gc.IsNil)
-	current, err := ioutil.ReadFile(cmd.GetCurrentEnvironmentFilePath())
+	current, err := ioutil.ReadFile(envcmd.GetCurrentEnvironmentFilePath())
 	c.Assert(err, gc.IsNil)
 	c.Assert(string(current), gc.Equals, "fubar\n")
 }
 
 func (*EnvironmentCommandSuite) TestErrorWritingFile(c *gc.C) {
 	// Can't write a file over a directory.
-	os.MkdirAll(cmd.GetCurrentEnvironmentFilePath(), 0777)
-	err := cmd.WriteCurrentEnvironment("fubar")
+	os.MkdirAll(envcmd.GetCurrentEnvironmentFilePath(), 0777)
+	err := envcmd.WriteCurrentEnvironment("fubar")
 	c.Assert(err, gc.ErrorMatches, "unable to write to the environment file: .*")
 }

=== renamed file 'cmd/export_test.go' => 'cmd/envcmd/export_test.go'
--- cmd/export_test.go	2014-03-25 22:31:46 +0000
+++ cmd/envcmd/export_test.go	2014-04-01 14:32:48 +0000
@@ -1,7 +1,7 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package cmd
+package envcmd
 
 var (
 	GetDefaultEnvironment         = getDefaultEnvironment

=== modified file 'cmd/juju/addmachine.go'
--- cmd/juju/addmachine.go	2014-02-22 15:40:29 +0000
+++ cmd/juju/addmachine.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/manual"
 	"launchpad.net/juju-core/instance"
@@ -56,7 +57,7 @@
 
 // AddMachineCommand starts a new machine and registers it in the environment.
 type AddMachineCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	// If specified, use this series, else use the environment default-series
 	Series string
 	// If specified, these constraints are merged with those already in the environment.
@@ -82,6 +83,10 @@
 }
 
 func (c *AddMachineCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if c.Constraints.Container != nil {
 		return fmt.Errorf("container constraint %q not allowed when adding a machine", *c.Constraints.Container)
 	}

=== modified file 'cmd/juju/addrelation.go'
--- cmd/juju/addrelation.go	2013-11-05 04:12:48 +0000
+++ cmd/juju/addrelation.go	2014-04-01 14:32:48 +0000
@@ -7,12 +7,13 @@
 	"fmt"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
 // AddRelationCommand adds a relation between two service endpoints.
 type AddRelationCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	Endpoints []string
 }
 
@@ -25,6 +26,10 @@
 }
 
 func (c *AddRelationCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) != 2 {
 		return fmt.Errorf("a relation must involve two services")
 	}

=== modified file 'cmd/juju/addunit.go'
--- cmd/juju/addunit.go	2013-10-08 14:53:20 +0000
+++ cmd/juju/addunit.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
@@ -42,7 +43,7 @@
 
 // AddUnitCommand is responsible adding additional units to a service.
 type AddUnitCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	UnitCommandBase
 	ServiceName string
 }

=== added file 'cmd/juju/adduser.go'
--- cmd/juju/adduser.go	1970-01-01 00:00:00 +0000
+++ cmd/juju/adduser.go	2014-04-01 14:32:48 +0000
@@ -0,0 +1,103 @@
+// Copyright 2012, 2013, 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package main
+
+import (
+	"fmt"
+
+	"launchpad.net/gnuflag"
+	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
+	"launchpad.net/juju-core/environs/configstore"
+	"launchpad.net/juju-core/juju"
+	"launchpad.net/juju-core/utils"
+)
+
+const addUserDoc = `
+Add users to an existing environment
+The user information is stored within an existing environment, and will be lost
+when the environent is destroyed.
+A jenv file identifying the user and the environment will be written to stdout,
+or to a path you specify with --output.
+
+Examples:
+  juju add-user foobar mypass      (Add user foobar with password mypass)
+  juju add-user foobar             (Add user foobar. A strong password will be generated and printed)
+  juju add-user foobar -o filename (Add user foobar (with generated password) and save example jenv file to filename)
+`
+
+type AddUserCommand struct {
+	envcmd.EnvCommandBase
+	User             string
+	Password         string
+	GeneratePassword bool
+	out              cmd.Output
+}
+
+func (c *AddUserCommand) Info() *cmd.Info {
+	return &cmd.Info{
+		Name:    "add-user",
+		Args:    "<username> <password>",
+		Purpose: "adds a user",
+		Doc:     addUserDoc,
+	}
+}
+
+func (c *AddUserCommand) SetFlags(f *gnuflag.FlagSet) {
+	c.out.AddFlags(f, "yaml", map[string]cmd.Formatter{
+		"yaml": cmd.FormatYaml,
+		"json": cmd.FormatJson,
+	})
+}
+func (c *AddUserCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
+	switch len(args) {
+	case 0:
+		return fmt.Errorf("no username supplied")
+	case 1:
+		c.GeneratePassword = true
+	case 2:
+		c.Password = args[1]
+	default:
+		return cmd.CheckEmpty(args[2:])
+	}
+
+	c.User = args[0]
+	return nil
+}
+
+func (c *AddUserCommand) Run(ctx *cmd.Context) error {
+	store, err := configstore.Default()
+	if err != nil {
+		return fmt.Errorf("cannot open environment info storage: %v", err)
+	}
+	storeInfo, err := store.ReadInfo(c.EnvName)
+	if err != nil {
+		return err
+	}
+	client, err := juju.NewUserManagerClient(c.EnvName)
+	if err != nil {
+		return err
+	}
+	defer client.Close()
+	if c.GeneratePassword {
+		c.Password, err = utils.RandomPassword()
+		if err != nil {
+			return fmt.Errorf("Failed to generate password: %v", err)
+		}
+	}
+	outputInfo := configstore.EnvironInfoData{}
+	outputInfo.User = c.User
+	outputInfo.Password = c.Password
+	outputInfo.StateServers = storeInfo.APIEndpoint().Addresses
+	outputInfo.CACert = storeInfo.APIEndpoint().CACert
+	err = c.out.Write(ctx, outputInfo)
+	if err != nil {
+		return err
+	}
+	return client.AddUser(c.User, c.Password)
+}

=== added file 'cmd/juju/adduser_test.go'
--- cmd/juju/adduser_test.go	1970-01-01 00:00:00 +0000
+++ cmd/juju/adduser_test.go	2014-04-01 14:32:48 +0000
@@ -0,0 +1,106 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package main
+
+import (
+	"bytes"
+	"io/ioutil"
+
+	gc "launchpad.net/gocheck"
+	"launchpad.net/goyaml"
+	jujutesting "launchpad.net/juju-core/juju/testing"
+
+	"launchpad.net/juju-core/testing"
+)
+
+// All of the functionality of the AddUser api call is contained elsewhere
+// This suite provides basic tests for the AddUser command
+type AddUserSuite struct {
+	jujutesting.RepoSuite
+}
+
+var _ = gc.Suite(&AddUserSuite{})
+
+func (s *AddUserSuite) TestAddUser(c *gc.C) {
+
+	_, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password"})
+	c.Assert(err, gc.IsNil)
+
+	_, err = testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "newpassword"})
+	c.Assert(err, gc.ErrorMatches, "Failed to create user: user already exists")
+}
+
+func (s *AddUserSuite) TestTooManyArgs(c *gc.C) {
+	_, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password", "whoops"})
+	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["whoops"\]`)
+}
+
+func (s *AddUserSuite) TestNotEnoughArgs(c *gc.C) {
+	_, err := testing.RunCommand(c, &AddUserCommand{}, []string{})
+	c.Assert(err, gc.ErrorMatches, `no username supplied`)
+}
+
+func (s *AddUserSuite) TestJenvYamlFileOutput(c *gc.C) {
+	expected := map[string]interface{}{
+		"user":          "foobar",
+		"password":      "password",
+		"state-servers": []interface{}{},
+		"ca-cert":       ""}
+	tempFile, err := ioutil.TempFile("", "adduser-test")
+	tempFile.Close()
+	c.Assert(err, gc.IsNil)
+	_, err = testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password", "-o", tempFile.Name()})
+	c.Assert(err, gc.IsNil)
+	data, err := ioutil.ReadFile(tempFile.Name())
+	result := map[string]interface{}{}
+	err = goyaml.Unmarshal(data, &result)
+	c.Assert(err, gc.IsNil)
+	c.Assert(result, gc.DeepEquals, expected)
+}
+
+func (s *AddUserSuite) TestJenvYamlOutput(c *gc.C) {
+	expected := map[string]interface{}{
+		"user":          "foobar",
+		"password":      "password",
+		"state-servers": []interface{}{},
+		"ca-cert":       ""}
+	ctx, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password"})
+	c.Assert(err, gc.IsNil)
+	stdout := ctx.Stdout.(*bytes.Buffer).Bytes()
+	result := map[string]interface{}{}
+	err = goyaml.Unmarshal(stdout, &result)
+	c.Assert(err, gc.IsNil)
+	c.Assert(result, gc.DeepEquals, expected)
+}
+
+func (s *AddUserSuite) TestJenvJsonOutput(c *gc.C) {
+	expected := `{"User":"foobar","Password":"password","state-servers":null,"ca-cert":""}
+`
+	tempFile, err := ioutil.TempFile("", "adduser-test")
+	tempFile.Close()
+	c.Assert(err, gc.IsNil)
+	_, err = testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password", "-o", tempFile.Name(), "--format", "json"})
+	c.Assert(err, gc.IsNil)
+	data, err := ioutil.ReadFile(tempFile.Name())
+	c.Assert(string(data), gc.DeepEquals, expected)
+}
+
+func (s *AddUserSuite) TestJenvJsonFileOutput(c *gc.C) {
+	expected := `{"User":"foobar","Password":"password","state-servers":null,"ca-cert":""}
+`
+	ctx, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password", "--format", "json"})
+	c.Assert(err, gc.IsNil)
+	stdout := ctx.Stdout.(*bytes.Buffer).String()
+	c.Assert(stdout, gc.DeepEquals, expected)
+}
+
+func (s *AddUserSuite) TestGeneratePassword(c *gc.C) {
+	ctx, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar"})
+	c.Assert(err, gc.IsNil)
+	stdout := ctx.Stdout.(*bytes.Buffer).Bytes()
+	var d map[string]interface{}
+	err = goyaml.Unmarshal(stdout, &d)
+	c.Assert(err, gc.IsNil)
+	c.Assert(d["user"], gc.DeepEquals, "foobar")
+}

=== modified file 'cmd/juju/authorisedkeys_add.go'
--- cmd/juju/authorisedkeys_add.go	2013-12-13 06:53:01 +0000
+++ cmd/juju/authorisedkeys_add.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
@@ -19,7 +20,7 @@
 
 // AddKeysCommand is used to add a new authorized ssh key for a user.
 type AddKeysCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	user    string
 	sshKeys []string
 }
@@ -34,6 +35,10 @@
 }
 
 func (c *AddKeysCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	switch len(args) {
 	case 0:
 		return errors.New("no ssh key specified")

=== modified file 'cmd/juju/authorisedkeys_delete.go'
--- cmd/juju/authorisedkeys_delete.go	2013-12-13 06:53:01 +0000
+++ cmd/juju/authorisedkeys_delete.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
@@ -21,7 +22,7 @@
 
 // DeleteKeysCommand is used to delete authorized ssh keys for a user.
 type DeleteKeysCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	user   string
 	keyIds []string
 }
@@ -36,6 +37,10 @@
 }
 
 func (c *DeleteKeysCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	switch len(args) {
 	case 0:
 		return errors.New("no ssh key id specified")

=== modified file 'cmd/juju/authorisedkeys_import.go'
--- cmd/juju/authorisedkeys_import.go	2013-12-13 06:53:01 +0000
+++ cmd/juju/authorisedkeys_import.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
@@ -20,7 +21,7 @@
 
 // ImportKeysCommand is used to add new authorized ssh keys for a user.
 type ImportKeysCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	user      string
 	sshKeyIds []string
 }
@@ -35,6 +36,10 @@
 }
 
 func (c *ImportKeysCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	switch len(args) {
 	case 0:
 		return errors.New("no ssh key id specified")

=== modified file 'cmd/juju/authorisedkeys_list.go'
--- cmd/juju/authorisedkeys_list.go	2013-12-12 22:14:52 +0000
+++ cmd/juju/authorisedkeys_list.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/utils/ssh"
 )
@@ -22,7 +23,7 @@
 
 // ListKeysCommand is used to list the authorized ssh keys.
 type ListKeysCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	showFullKey bool
 	user        string
 }
@@ -41,6 +42,14 @@
 	f.StringVar(&c.user, "user", "admin", "the user for which to list the keys")
 }
 
+func (c *ListKeysCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
+	return cmd.CheckEmpty(args)
+}
+
 func (c *ListKeysCommand) Run(context *cmd.Context) error {
 	client, err := juju.NewKeyManagerClient(c.EnvName)
 	if err != nil {

=== modified file 'cmd/juju/bootstrap.go'
--- cmd/juju/bootstrap.go	2014-03-26 03:30:35 +0000
+++ cmd/juju/bootstrap.go	2014-04-01 14:32:48 +0000
@@ -12,6 +12,7 @@
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/imagemetadata"
@@ -58,7 +59,7 @@
 // BootstrapCommand is responsible for launching the first machine in a juju
 // environment, and setting up everything necessary to continue working.
 type BootstrapCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	Constraints    constraints.Value
 	UploadTools    bool
 	Series         []string
@@ -82,6 +83,10 @@
 }
 
 func (c *BootstrapCommand) Init(args []string) (err error) {
+	err = c.EnvCommandBase.Init()
+	if err != nil {
+		return
+	}
 	if len(c.Series) > 0 && !c.UploadTools {
 		return fmt.Errorf("--series requires --upload-tools")
 	}

=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go	2014-03-25 08:47:50 +0000
+++ cmd/juju/bootstrap_test.go	2014-04-01 14:32:48 +0000
@@ -374,8 +374,7 @@
 	ctx2 := coretesting.Context(c)
 	code2 := cmd.Main(&BootstrapCommand{}, ctx2, nil)
 	c.Check(code2, gc.Equals, 1)
-	expectedErrText := "Bootstrap failed, destroying environment\n"
-	expectedErrText += "error: environment is already bootstrapped\n"
+	expectedErrText := "error: environment is already bootstrapped\n"
 	c.Check(coretesting.Stderr(ctx2), gc.Equals, expectedErrText)
 	c.Check(coretesting.Stdout(ctx2), gc.Equals, "")
 }
@@ -542,8 +541,7 @@
 	code := cmd.Main(&BootstrapCommand{}, context, nil)
 	c.Assert(code, gc.Equals, 1)
 	errText := context.Stderr.(*bytes.Buffer).String()
-	expectedErrText := "Bootstrap failed, destroying environment\n"
-	expectedErrText += "error: cannot upload bootstrap tools: Juju cannot bootstrap because no tools are available for your environment(.|\n)*"
+	expectedErrText := "error: cannot upload bootstrap tools: Juju cannot bootstrap because no tools are available for your environment(.|\n)*"
 	c.Assert(errText, gc.Matches, expectedErrText)
 }
 
@@ -559,7 +557,6 @@
 	c.Assert(code, gc.Equals, 1)
 	errText := context.Stderr.(*bytes.Buffer).String()
 	expectedErrText := "uploading tools for series \\[precise raring\\]\n"
-	expectedErrText += "Bootstrap failed, destroying environment\n"
 	expectedErrText += "error: cannot upload bootstrap tools: an error\n"
 	c.Assert(errText, gc.Matches, expectedErrText)
 }

=== modified file 'cmd/juju/cmd_test.go'
--- cmd/juju/cmd_test.go	2014-03-24 10:42:51 +0000
+++ cmd/juju/cmd_test.go	2014-04-01 14:32:48 +0000
@@ -97,7 +97,7 @@
 		c.Logf("test %d", i)
 		com, args := cmdFunc()
 		testInit(c, com, args, "")
-		assertConnName(c, com, "")
+		assertConnName(c, com, "peckham")
 
 		com, args = cmdFunc()
 		testInit(c, com, append(args, "-e", "walthamstow"), "")
@@ -192,6 +192,7 @@
 	if com.RepoPath == "" {
 		com.RepoPath = "/path/to/repo"
 	}
+	com.EnvCommandBase.EnvName = "peckham"
 }
 
 func initDeployCommand(args ...string) (*DeployCommand, error) {

=== modified file 'cmd/juju/constraints.go'
--- cmd/juju/constraints.go	2013-12-17 18:21:26 +0000
+++ cmd/juju/constraints.go	2014-04-01 14:32:48 +0000
@@ -9,6 +9,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
@@ -51,7 +52,7 @@
 
 // GetConstraintsCommand shows the constraints for a service or environment.
 type GetConstraintsCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName string
 	out         cmd.Output
 }
@@ -79,6 +80,10 @@
 }
 
 func (c *GetConstraintsCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) > 0 {
 		if !names.IsService(args[0]) {
 			return fmt.Errorf("invalid service name %q", args[0])
@@ -129,7 +134,7 @@
 
 // SetConstraintsCommand shows the constraints for a service or environment.
 type SetConstraintsCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName string
 	Constraints constraints.Value
 }
@@ -150,6 +155,10 @@
 }
 
 func (c *SetConstraintsCommand) Init(args []string) (err error) {
+	err = c.EnvCommandBase.Init()
+	if err != nil {
+		return
+	}
 	if c.ServiceName != "" && !names.IsService(c.ServiceName) {
 		return fmt.Errorf("invalid service name %q", c.ServiceName)
 	}

=== modified file 'cmd/juju/debuglog_test.go'
--- cmd/juju/debuglog_test.go	2013-08-13 07:37:58 +0000
+++ cmd/juju/debuglog_test.go	2014-04-01 14:32:48 +0000
@@ -36,7 +36,7 @@
 // debug-log is implemented by invoking juju ssh with the correct arguments.
 // This test helper checks for the expected invocation.
 func (s *DebugLogSuite) assertDebugLogInvokesSSHCommand(c *gc.C, expected string, args ...string) {
-	defer testing.MakeEmptyFakeHome(c).Restore()
+	defer testing.MakeSampleHome(c).Restore()
 	debugLogCmd, err := runDebugLog(c, args...)
 	c.Assert(err, gc.IsNil)
 	debugCmd := debugLogCmd.sshCmd.(*dummySSHCommand)
@@ -65,7 +65,7 @@
 }
 
 func (s *DebugLogSuite) TestDebugLogValidation(c *gc.C) {
-	defer testing.MakeEmptyFakeHome(c).Restore()
+	defer testing.MakeSampleHome(c).Restore()
 	_, err := runDebugLog(c, "-n", "0")
 	c.Assert(err, gc.ErrorMatches, "invalid value \"0\" for flag -n: invalid number of lines")
 	_, err = runDebugLog(c, "-n", "-1")

=== modified file 'cmd/juju/deploy.go'
--- cmd/juju/deploy.go	2014-03-31 08:55:49 +0000
+++ cmd/juju/deploy.go	2014-04-01 14:32:48 +0000
@@ -13,6 +13,7 @@
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
@@ -24,7 +25,7 @@
 )
 
 type DeployCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	UnitCommandBase
 	CharmName       string
 	ServiceName     string
@@ -109,6 +110,10 @@
 }
 
 func (c *DeployCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	switch len(args) {
 	case 2:
 		if !names.IsService(args[1]) {

=== modified file 'cmd/juju/destroymachine.go'
--- cmd/juju/destroymachine.go	2014-02-25 22:19:30 +0000
+++ cmd/juju/destroymachine.go	2014-04-01 14:32:48 +0000
@@ -9,6 +9,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api/params"
@@ -17,7 +18,7 @@
 
 // DestroyMachineCommand causes an existing machine to be destroyed.
 type DestroyMachineCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	MachineIds []string
 	Force      bool
 }
@@ -45,6 +46,10 @@
 }
 
 func (c *DestroyMachineCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 {
 		return fmt.Errorf("no machines specified")
 	}

=== modified file 'cmd/juju/destroyrelation.go'
--- cmd/juju/destroyrelation.go	2013-11-05 04:12:48 +0000
+++ cmd/juju/destroyrelation.go	2014-04-01 14:32:48 +0000
@@ -7,12 +7,13 @@
 	"fmt"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
 // DestroyRelationCommand causes an existing service relation to be shut down.
 type DestroyRelationCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	Endpoints []string
 }
 
@@ -26,6 +27,10 @@
 }
 
 func (c *DestroyRelationCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) != 2 {
 		return fmt.Errorf("a relation must involve two services")
 	}

=== modified file 'cmd/juju/destroyservice.go'
--- cmd/juju/destroyservice.go	2014-02-25 22:19:30 +0000
+++ cmd/juju/destroyservice.go	2014-04-01 14:32:48 +0000
@@ -7,13 +7,14 @@
 	"fmt"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
 )
 
 // DestroyServiceCommand causes an existing service to be destroyed.
 type DestroyServiceCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName string
 }
 
@@ -28,6 +29,10 @@
 }
 
 func (c *DestroyServiceCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 {
 		return fmt.Errorf("no service specified")
 	}

=== modified file 'cmd/juju/destroyunit.go'
--- cmd/juju/destroyunit.go	2013-12-04 15:34:47 +0000
+++ cmd/juju/destroyunit.go	2014-04-01 14:32:48 +0000
@@ -8,13 +8,14 @@
 	"fmt"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
 )
 
 // DestroyUnitCommand is responsible for destroying service units.
 type DestroyUnitCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	UnitNames []string
 }
 
@@ -28,6 +29,10 @@
 }
 
 func (c *DestroyUnitCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	c.UnitNames = args
 	if len(c.UnitNames) == 0 {
 		return errors.New("no units specified")

=== modified file 'cmd/juju/endpoint.go'
--- cmd/juju/endpoint.go	2013-09-30 17:23:28 +0000
+++ cmd/juju/endpoint.go	2014-04-01 14:32:48 +0000
@@ -7,13 +7,14 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/configstore"
 )
 
 // EndpointCommand returns the API endpoints
 type EndpointCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	out cmd.Output
 }
 
@@ -37,6 +38,10 @@
 }
 
 func (c *EndpointCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	return cmd.CheckEmpty(args)
 }
 

=== modified file 'cmd/juju/ensureavailability.go'
--- cmd/juju/ensureavailability.go	2014-03-28 09:55:10 +0000
+++ cmd/juju/ensureavailability.go	2014-04-01 14:32:48 +0000
@@ -9,12 +9,13 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/juju"
 )
 
 type EnsureAvailabilityCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	NumStateServers int
 	// If specified, use this series for newly created machines,
 	// else use the environment's default-series
@@ -63,6 +64,10 @@
 }
 
 func (c *EnsureAvailabilityCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if c.NumStateServers%2 != 1 || c.NumStateServers <= 0 {
 		return fmt.Errorf("must specify a number of state servers odd and greater than zero")
 	}

=== modified file 'cmd/juju/environment.go'
--- cmd/juju/environment.go	2014-03-26 06:32:05 +0000
+++ cmd/juju/environment.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/state/api/params"
 )
@@ -17,7 +18,7 @@
 // GetEnvironmentCommand is able to output either the entire environment or
 // the requested value in a format of the user's choosing.
 type GetEnvironmentCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	key string
 	out cmd.Output
 }
@@ -50,6 +51,10 @@
 }
 
 func (c *GetEnvironmentCommand) Init(args []string) (err error) {
+	err = c.EnvCommandBase.Init()
+	if err != nil {
+		return
+	}
 	c.key, err = cmd.ZeroOrOneArgs(args)
 	return
 }
@@ -105,7 +110,7 @@
 
 // SetEnvironment
 type SetEnvironmentCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	values attributes
 }
 
@@ -127,6 +132,10 @@
 // SetFlags handled entirely by cmd.EnvCommandBase
 
 func (c *SetEnvironmentCommand) Init(args []string) (err error) {
+	err = c.EnvCommandBase.Init()
+	if err != nil {
+		return
+	}
 	if len(args) == 0 {
 		return fmt.Errorf("No key, value pairs specified")
 	}
@@ -184,7 +193,7 @@
 
 // UnsetEnvironment
 type UnsetEnvironmentCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	keys []string
 }
 
@@ -208,6 +217,10 @@
 }
 
 func (c *UnsetEnvironmentCommand) Init(args []string) (err error) {
+	err = c.EnvCommandBase.Init()
+	if err != nil {
+		return
+	}
 	if len(args) == 0 {
 		return fmt.Errorf("No keys specified")
 	}

=== modified file 'cmd/juju/expose.go'
--- cmd/juju/expose.go	2013-11-01 09:09:43 +0000
+++ cmd/juju/expose.go	2014-04-01 14:32:48 +0000
@@ -7,12 +7,13 @@
 	"errors"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
 // ExposeCommand is responsible exposing services.
 type ExposeCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName string
 }
 
@@ -25,6 +26,10 @@
 }
 
 func (c *ExposeCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 {
 		return errors.New("no service name specified")
 	}

=== modified file 'cmd/juju/get.go'
--- cmd/juju/get.go	2013-09-30 20:58:11 +0000
+++ cmd/juju/get.go	2014-04-01 14:32:48 +0000
@@ -9,12 +9,13 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
 // GetCommand retrieves the configuration of a service.
 type GetCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName string
 	out         cmd.Output
 }
@@ -36,6 +37,10 @@
 }
 
 func (c *GetCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	// TODO(dfc) add --schema-only
 	if len(args) == 0 {
 		return errors.New("no service name specified")

=== modified file 'cmd/juju/plugin.go'
--- cmd/juju/plugin.go	2014-02-17 12:57:06 +0000
+++ cmd/juju/plugin.go	2014-04-01 14:32:48 +0000
@@ -16,6 +16,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/log"
 )
@@ -72,7 +73,7 @@
 }
 
 type PluginCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	name string
 	args []string
 }
@@ -85,7 +86,7 @@
 
 func (c *PluginCommand) Init(args []string) error {
 	c.args = args
-	return nil
+	return c.EnvCommandBase.Init()
 }
 
 func (c *PluginCommand) SetFlags(f *gnuflag.FlagSet) {

=== modified file 'cmd/juju/publish.go'
--- cmd/juju/publish.go	2014-03-18 05:08:25 +0000
+++ cmd/juju/publish.go	2014-04-01 14:32:48 +0000
@@ -14,11 +14,12 @@
 	"launchpad.net/juju-core/bzr"
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/log"
 )
 
 type PublishCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	URL       string
 	CharmPath string
 
@@ -60,6 +61,10 @@
 }
 
 func (c *PublishCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 {
 		return nil
 	}

=== modified file 'cmd/juju/publish_test.go'
--- cmd/juju/publish_test.go	2014-03-18 05:08:25 +0000
+++ cmd/juju/publish_test.go	2014-04-01 14:32:48 +0000
@@ -75,11 +75,9 @@
 func (s *PublishSuite) SetUpTest(c *gc.C) {
 	s.LoggingSuite.SetUpTest(c)
 	s.HTTPSuite.SetUpTest(c)
-	s.home = testing.MakeFakeHomeWithFiles(c, []testing.TestFile{
-		{
-			Name: ".bazaar/bazaar.conf",
-			Data: "[DEFAULT]\nemail = Test <[e-mail]>\n",
-		},
+	s.home = testing.MakeSampleHome(c, testing.TestFile{
+		Name: ".bazaar/bazaar.conf",
+		Data: "[DEFAULT]\nemail = Test <[e-mail]>\n",
 	})
 
 	s.dir = c.MkDir()

=== added file 'cmd/juju/removeuser.go'
--- cmd/juju/removeuser.go	1970-01-01 00:00:00 +0000
+++ cmd/juju/removeuser.go	2014-04-01 14:32:48 +0000
@@ -0,0 +1,55 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package main
+
+import (
+	"errors"
+
+	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
+	"launchpad.net/juju-core/juju"
+)
+
+const removeUserDoc = `
+Remove users from an existing environment
+
+Examples:
+  juju remove-user foobar
+`
+
+type RemoveUserCommand struct {
+	envcmd.EnvCommandBase
+	User string
+}
+
+func (c *RemoveUserCommand) Info() *cmd.Info {
+	return &cmd.Info{
+		Name:    "remove-user",
+		Args:    "<username>",
+		Purpose: "removes a user",
+		Doc:     removeUserDoc,
+	}
+}
+
+func (c *RemoveUserCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
+	if len(args) == 0 {
+		return errors.New("no username supplied")
+	}
+	c.User = args[0]
+
+	return cmd.CheckEmpty(args[1:])
+}
+
+func (c *RemoveUserCommand) Run(_ *cmd.Context) error {
+	client, err := juju.NewUserManagerClient(c.EnvName)
+	if err != nil {
+		return err
+	}
+	defer client.Close()
+	return client.RemoveUser(c.User)
+}

=== added file 'cmd/juju/removeuser_test.go'
--- cmd/juju/removeuser_test.go	1970-01-01 00:00:00 +0000
+++ cmd/juju/removeuser_test.go	2014-04-01 14:32:48 +0000
@@ -0,0 +1,35 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package main
+
+import (
+	gc "launchpad.net/gocheck"
+
+	jujutesting "launchpad.net/juju-core/juju/testing"
+	"launchpad.net/juju-core/testing"
+)
+
+type RemoveUserSuite struct {
+	jujutesting.RepoSuite
+}
+
+var _ = gc.Suite(&RemoveUserSuite{})
+
+func (s *RemoveUserSuite) TestRemoveUser(c *gc.C) {
+	_, err := testing.RunCommand(c, &AddUserCommand{}, []string{"foobar", "password"})
+	c.Assert(err, gc.IsNil)
+
+	_, err = testing.RunCommand(c, &RemoveUserCommand{}, []string{"foobar"})
+	c.Assert(err, gc.IsNil)
+}
+
+func (s *RemoveUserSuite) TestTooManyArgs(c *gc.C) {
+	_, err := testing.RunCommand(c, &RemoveUserCommand{}, []string{"foobar", "password"})
+	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["password"\]`)
+}
+
+func (s *RemoveUserSuite) TestNotEnoughArgs(c *gc.C) {
+	_, err := testing.RunCommand(c, &RemoveUserCommand{}, []string{})
+	c.Assert(err, gc.ErrorMatches, `no username supplied`)
+}

=== modified file 'cmd/juju/resolved.go'
--- cmd/juju/resolved.go	2013-11-01 09:26:22 +0000
+++ cmd/juju/resolved.go	2014-04-01 14:32:48 +0000
@@ -9,13 +9,14 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
 )
 
 // ResolvedCommand marks a unit in an error state as ready to continue.
 type ResolvedCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	UnitName string
 	Retry    bool
 }
@@ -35,6 +36,10 @@
 }
 
 func (c *ResolvedCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) > 0 {
 		c.UnitName = args[0]
 		if !names.IsUnit(c.UnitName) {

=== modified file 'cmd/juju/retryprovisioning.go'
--- cmd/juju/retryprovisioning.go	2014-03-26 12:43:56 +0000
+++ cmd/juju/retryprovisioning.go	2014-04-01 14:32:48 +0000
@@ -7,6 +7,7 @@
 	"fmt"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
 )
@@ -14,7 +15,7 @@
 // RetryProvisioningCommand updates machines' error status to tell
 // the provisoner that it should try to re-provision the machine.
 type RetryProvisioningCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	Machines []string
 }
 

=== modified file 'cmd/juju/run.go'
--- cmd/juju/run.go	2014-01-12 20:28:39 +0000
+++ cmd/juju/run.go	2014-04-01 14:32:48 +0000
@@ -14,6 +14,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api/params"
@@ -21,7 +22,7 @@
 
 // RunCommand is responsible for running arbitrary commands on remote machines.
 type RunCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	out      cmd.Output
 	all      bool
 	timeout  time.Duration
@@ -79,6 +80,10 @@
 }
 
 func (c *RunCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 {
 		return errors.New("no commands specified")
 	}

=== modified file 'cmd/juju/run_test.go'
--- cmd/juju/run_test.go	2014-03-13 07:54:56 +0000
+++ cmd/juju/run_test.go	2014-04-01 14:32:48 +0000
@@ -321,7 +321,7 @@
 		message:    "smart (default)",
 		stdout:     "stdout\n",
 		stderr:     "stderr\n",
-		errorMatch: "rc: 42",
+		errorMatch: "subprocess encountered error code 42",
 	}, {
 		message: "yaml output",
 		format:  "yaml",

=== modified file 'cmd/juju/set.go'
--- cmd/juju/set.go	2013-12-17 18:21:26 +0000
+++ cmd/juju/set.go	2014-04-01 14:32:48 +0000
@@ -11,13 +11,14 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/state/api/params"
 )
 
 // SetCommand updates the configuration of a service.
 type SetCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName     string
 	SettingsStrings map[string]string
 	SettingsYAML    cmd.FileVar
@@ -44,6 +45,10 @@
 }
 
 func (c *SetCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 || len(strings.Split(args[0], "=")) > 1 {
 		return errors.New("no service name specified")
 	}

=== modified file 'cmd/juju/ssh.go'
--- cmd/juju/ssh.go	2014-03-20 02:30:15 +0000
+++ cmd/juju/ssh.go	2014-04-01 14:32:48 +0000
@@ -9,6 +9,7 @@
 	"time"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
@@ -25,7 +26,7 @@
 
 // SSHCommon provides common methods for SSHCommand, SCPCommand and DebugHooksCommand.
 type SSHCommon struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	Target    string
 	Args      []string
 	apiClient *api.Client
@@ -68,6 +69,10 @@
 }
 
 func (c *SSHCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 {
 		return errors.New("no target name specified")
 	}

=== modified file 'cmd/juju/status.go'
--- cmd/juju/status.go	2014-03-26 12:42:03 +0000
+++ cmd/juju/status.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/state/api"
@@ -18,7 +19,7 @@
 )
 
 type StatusCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	out      cmd.Output
 	patterns []string
 }
@@ -57,7 +58,7 @@
 
 func (c *StatusCommand) Init(args []string) error {
 	c.patterns = args
-	return nil
+	return c.EnvCommandBase.Init()
 }
 
 var connectionError = `Unable to connect to environment "%s".

=== modified file 'cmd/juju/switch.go'
--- cmd/juju/switch.go	2014-01-29 15:57:25 +0000
+++ cmd/juju/switch.go	2014-04-01 14:32:48 +0000
@@ -12,6 +12,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs"
 )
 
@@ -96,7 +97,7 @@
 		}
 	}
 
-	currentEnv := cmd.ReadCurrentEnvironment()
+	currentEnv := envcmd.ReadCurrentEnvironment()
 	if currentEnv == "" {
 		currentEnv = environments.Default
 	}
@@ -114,7 +115,7 @@
 		if !validEnvironmentName(c.EnvName, names) {
 			return fmt.Errorf("%q is not a name of an existing defined environment", c.EnvName)
 		}
-		if err := cmd.WriteCurrentEnvironment(c.EnvName); err != nil {
+		if err := envcmd.WriteCurrentEnvironment(c.EnvName); err != nil {
 			return err
 		}
 		if currentEnv == "" {

=== modified file 'cmd/juju/switch_test.go'
--- cmd/juju/switch_test.go	2014-01-29 13:46:37 +0000
+++ cmd/juju/switch_test.go	2014-04-01 14:32:48 +0000
@@ -8,7 +8,7 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	_ "launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/testing"
 )
@@ -69,7 +69,7 @@
 	context, err := testing.RunCommand(c, &SwitchCommand{}, []string{"erewhemos-2"})
 	c.Assert(err, gc.IsNil)
 	c.Assert(testing.Stdout(context), gc.Equals, "erewhemos -> erewhemos-2\n")
-	c.Assert(cmd.ReadCurrentEnvironment(), gc.Equals, "erewhemos-2")
+	c.Assert(envcmd.ReadCurrentEnvironment(), gc.Equals, "erewhemos-2")
 }
 
 func (*SwitchSimpleSuite) TestSettingToUnknown(c *gc.C) {

=== modified file 'cmd/juju/synctools.go'
--- cmd/juju/synctools.go	2014-03-10 00:45:41 +0000
+++ cmd/juju/synctools.go	2014-04-01 14:32:48 +0000
@@ -8,6 +8,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/sync"
 	"launchpad.net/juju-core/version"
@@ -18,7 +19,7 @@
 // SyncToolsCommand copies all the tools from the us-east-1 bucket to the local
 // bucket.
 type SyncToolsCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	allVersions  bool
 	versionStr   string
 	majorVersion int
@@ -63,6 +64,10 @@
 }
 
 func (c *SyncToolsCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if c.destination != "" {
 		// Override localDir with destination as localDir now replaces destination
 		c.localDir = c.destination

=== modified file 'cmd/juju/unexpose.go'
--- cmd/juju/unexpose.go	2013-11-01 09:09:43 +0000
+++ cmd/juju/unexpose.go	2014-04-01 14:32:48 +0000
@@ -7,12 +7,13 @@
 	"errors"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 )
 
 // UnexposeCommand is responsible exposing services.
 type UnexposeCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName string
 }
 
@@ -25,6 +26,10 @@
 }
 
 func (c *UnexposeCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 {
 		return errors.New("no service name specified")
 	}

=== modified file 'cmd/juju/unset.go'
--- cmd/juju/unset.go	2013-12-17 18:21:26 +0000
+++ cmd/juju/unset.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/state/api/params"
 )
@@ -17,7 +18,7 @@
 // UnsetCommand sets configuration values of a service back
 // to their default.
 type UnsetCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName string
 	Options     []string
 }
@@ -42,6 +43,10 @@
 }
 
 func (c *UnsetCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if len(args) == 0 {
 		return errors.New("no service name specified")
 	}

=== modified file 'cmd/juju/upgradecharm.go'
--- cmd/juju/upgradecharm.go	2014-03-18 05:08:25 +0000
+++ cmd/juju/upgradecharm.go	2014-04-01 14:32:48 +0000
@@ -12,6 +12,7 @@
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
@@ -20,7 +21,7 @@
 
 // UpgradeCharm is responsible for upgrading a service's charm.
 type UpgradeCharmCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	ServiceName string
 	Force       bool
 	RepoPath    string // defaults to JUJU_REPOSITORY
@@ -84,6 +85,10 @@
 }
 
 func (c *UpgradeCharmCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	switch len(args) {
 	case 1:
 		if !names.IsService(args[0]) {

=== modified file 'cmd/juju/upgradejuju.go'
--- cmd/juju/upgradejuju.go	2014-03-18 23:44:18 +0000
+++ cmd/juju/upgradejuju.go	2014-04-01 14:32:48 +0000
@@ -12,6 +12,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/config"
@@ -28,7 +29,7 @@
 
 // UpgradeJujuCommand upgrades the agents in a juju installation.
 type UpgradeJujuCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	vers        string
 	Version     version.Number
 	UploadTools bool
@@ -84,6 +85,10 @@
 }
 
 func (c *UpgradeJujuCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if c.vers != "" {
 		vers, err := version.Parse(c.vers)
 		if err != nil {

=== modified file 'cmd/jujud/run_test.go'
--- cmd/jujud/run_test.go	2014-03-13 07:54:56 +0000
+++ cmd/jujud/run_test.go	2014-04-01 14:32:48 +0000
@@ -105,7 +105,7 @@
 	go func() {
 		ctx, err := testing.RunCommand(c, &RunCommand{}, params)
 		c.Assert(err, jc.Satisfies, cmd.IsRcPassthroughError)
-		c.Assert(err, gc.ErrorMatches, "rc: 0")
+		c.Assert(err, gc.ErrorMatches, "subprocess encountered error code 0")
 		resultChannel <- ctx
 		close(resultChannel)
 	}()
@@ -118,7 +118,7 @@
 
 	ctx, err := testing.RunCommand(c, &RunCommand{}, []string{"--no-context", "echo done"})
 	c.Assert(err, jc.Satisfies, cmd.IsRcPassthroughError)
-	c.Assert(err, gc.ErrorMatches, "rc: 0")
+	c.Assert(err, gc.ErrorMatches, "subprocess encountered error code 0")
 	c.Assert(testing.Stdout(ctx), gc.Equals, "done\n")
 }
 
@@ -168,7 +168,7 @@
 
 	ctx, err := testing.RunCommand(c, &RunCommand{}, []string{"foo", "bar"})
 	c.Check(cmd.IsRcPassthroughError(err), jc.IsTrue)
-	c.Assert(err, gc.ErrorMatches, "rc: 42")
+	c.Assert(err, gc.ErrorMatches, "subprocess encountered error code 42")
 	c.Assert(testing.Stdout(ctx), gc.Equals, "bar stdout")
 	c.Assert(testing.Stderr(ctx), gc.Equals, "bar stderr")
 }

=== modified file 'cmd/plugins/juju-metadata/imagemetadata.go'
--- cmd/plugins/juju-metadata/imagemetadata.go	2014-03-17 03:45:21 +0000
+++ cmd/plugins/juju-metadata/imagemetadata.go	2014-04-01 14:32:48 +0000
@@ -11,6 +11,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
@@ -23,7 +24,7 @@
 
 // ImageMetadataCommand is used to write out simplestreams image metadata information.
 type ImageMetadataCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	Dir            string
 	Series         string
 	Arch           string

=== modified file 'cmd/plugins/juju-metadata/toolsmetadata.go'
--- cmd/plugins/juju-metadata/toolsmetadata.go	2014-03-21 03:27:16 +0000
+++ cmd/plugins/juju-metadata/toolsmetadata.go	2014-04-01 14:32:48 +0000
@@ -10,6 +10,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
@@ -22,7 +23,7 @@
 
 // ToolsMetadataCommand is used to generate simplestreams metadata for juju tools.
 type ToolsMetadataCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	fetch       bool
 	metadataDir string
 	public      bool
@@ -41,6 +42,14 @@
 	f.BoolVar(&c.public, "public", false, "tools are for a public cloud, so generate mirrors information")
 }
 
+func (c *ToolsMetadataCommand) Init(args []string) (err error) {
+	err = c.EnvCommandBase.Init()
+	if err != nil {
+		return
+	}
+	return cmd.CheckEmpty(args)
+}
+
 func (c *ToolsMetadataCommand) Run(context *cmd.Context) error {
 	loggo.RegisterWriter("toolsmetadata", cmd.NewCommandLogWriter("juju.environs.tools", context.Stdout, context.Stderr), loggo.INFO)
 	defer loggo.RemoveWriter("toolsmetadata")

=== modified file 'cmd/plugins/juju-metadata/validateimagemetadata.go'
--- cmd/plugins/juju-metadata/validateimagemetadata.go	2014-03-21 03:27:16 +0000
+++ cmd/plugins/juju-metadata/validateimagemetadata.go	2014-04-01 14:32:48 +0000
@@ -12,6 +12,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
@@ -22,7 +23,7 @@
 
 // ValidateImageMetadataCommand
 type ValidateImageMetadataCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	out          cmd.Output
 	providerType string
 	metadataDir  string
@@ -91,6 +92,10 @@
 }
 
 func (c *ValidateImageMetadataCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if c.providerType != "" {
 		if c.series == "" {
 			return fmt.Errorf("series required if provider type is specified")
@@ -102,7 +107,7 @@
 			return fmt.Errorf("metadata directory required if provider type is specified")
 		}
 	}
-	return c.EnvCommandBase.Init(args)
+	return nil
 }
 
 var _ environs.ConfigGetter = (*overrideEnvStream)(nil)

=== modified file 'cmd/plugins/juju-metadata/validatetoolsmetadata.go'
--- cmd/plugins/juju-metadata/validatetoolsmetadata.go	2014-03-21 03:27:16 +0000
+++ cmd/plugins/juju-metadata/validatetoolsmetadata.go	2014-04-01 14:32:48 +0000
@@ -11,6 +11,7 @@
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/configstore"
 	"launchpad.net/juju-core/environs/simplestreams"
@@ -22,7 +23,7 @@
 
 // ValidateToolsMetadataCommand
 type ValidateToolsMetadataCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	out          cmd.Output
 	providerType string
 	metadataDir  string
@@ -117,6 +118,10 @@
 }
 
 func (c *ValidateToolsMetadataCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if c.providerType != "" {
 		if c.region == "" {
 			return fmt.Errorf("region required if provider type is specified")
@@ -134,7 +139,7 @@
 			return err
 		}
 	}
-	return c.EnvCommandBase.Init(args)
+	return nil
 }
 
 func (c *ValidateToolsMetadataCommand) Run(context *cmd.Context) error {

=== modified file 'cmd/plugins/juju-restore/restore.go'
--- cmd/plugins/juju-restore/restore.go	2014-03-26 12:38:12 +0000
+++ cmd/plugins/juju-restore/restore.go	2014-04-01 14:32:48 +0000
@@ -19,6 +19,7 @@
 	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
@@ -64,7 +65,7 @@
 `
 
 type restoreCommand struct {
-	cmd.EnvCommandBase
+	envcmd.EnvCommandBase
 	Log             cmd.Log
 	Constraints     constraints.Value
 	backupFile      string
@@ -88,6 +89,10 @@
 }
 
 func (c *restoreCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
 	if c.showDescription {
 		return cmd.CheckEmpty(args)
 	}

=== modified file 'cmd/supercommand.go'
--- cmd/supercommand.go	2014-03-20 06:01:50 +0000
+++ cmd/supercommand.go	2014-04-01 14:32:48 +0000
@@ -13,7 +13,6 @@
 
 	"github.com/juju/loggo"
 	"launchpad.net/gnuflag"
-
 	"launchpad.net/juju-core/version"
 )
 

=== modified file 'environs/configstore/disk.go'
--- environs/configstore/disk.go	2014-03-12 10:59:17 +0000
+++ environs/configstore/disk.go	2014-04-01 14:32:48 +0000
@@ -30,6 +30,14 @@
 	dir string
 }
 
+type EnvironInfoData struct {
+	User         string
+	Password     string
+	StateServers []string               `json:"state-servers" yaml:"state-servers"`
+	CACert       string                 `json:"ca-cert" yaml:"ca-cert"`
+	Config       map[string]interface{} `json:"bootstrap-config,omitempty" yaml:"bootstrap-config,omitempty"`
+}
+
 type environInfo struct {
 	path string
 	// initialized signifies whether the info has been written.
@@ -37,12 +45,9 @@
 
 	// created signifies whether the info was returned from
 	// a CreateInfo call.
-	created      bool
-	User         string
-	Password     string
-	StateServers []string               `yaml:"state-servers"`
-	CACert       string                 `yaml:"ca-cert"`
-	Config       map[string]interface{} `yaml:"bootstrap-config,omitempty"`
+	created bool
+
+	EnvInfo EnvironInfoData
 }
 
 // NewDisk returns a ConfigStorage implementation that stores
@@ -106,7 +111,7 @@
 	if len(data) == 0 {
 		return &info, nil
 	}
-	if err := goyaml.Unmarshal(data, &info); err != nil {
+	if err := goyaml.Unmarshal(data, &info.EnvInfo); err != nil {
 		return nil, fmt.Errorf("error unmarshalling %q: %v", path, err)
 	}
 	info.initialized = true
@@ -120,22 +125,22 @@
 
 // BootstrapConfig implements EnvironInfo.BootstrapConfig.
 func (info *environInfo) BootstrapConfig() map[string]interface{} {
-	return info.Config
+	return info.EnvInfo.Config
 }
 
 // APICredentials implements EnvironInfo.APICredentials.
 func (info *environInfo) APICredentials() APICredentials {
 	return APICredentials{
-		User:     info.User,
-		Password: info.Password,
+		User:     info.EnvInfo.User,
+		Password: info.EnvInfo.Password,
 	}
 }
 
 // APIEndpoint implements EnvironInfo.APIEndpoint.
 func (info *environInfo) APIEndpoint() APIEndpoint {
 	return APIEndpoint{
-		Addresses: info.StateServers,
-		CACert:    info.CACert,
+		Addresses: info.EnvInfo.StateServers,
+		CACert:    info.EnvInfo.CACert,
 	}
 }
 
@@ -144,19 +149,19 @@
 	if !info.created {
 		panic("bootstrap config set on environment info that has not just been created")
 	}
-	info.Config = attrs
+	info.EnvInfo.Config = attrs
 }
 
 // SetAPIEndpoint implements EnvironInfo.SetAPIEndpoint.
 func (info *environInfo) SetAPIEndpoint(endpoint APIEndpoint) {
-	info.StateServers = endpoint.Addresses
-	info.CACert = endpoint.CACert
+	info.EnvInfo.StateServers = endpoint.Addresses
+	info.EnvInfo.CACert = endpoint.CACert
 }
 
 // SetAPICredentials implements EnvironInfo.SetAPICredentials.
 func (info *environInfo) SetAPICredentials(creds APICredentials) {
-	info.User = creds.User
-	info.Password = creds.Password
+	info.EnvInfo.User = creds.User
+	info.EnvInfo.Password = creds.Password
 }
 
 // Location returns the location of the environInfo in human readable format.
@@ -166,7 +171,7 @@
 
 // Write implements EnvironInfo.Write.
 func (info *environInfo) Write() error {
-	data, err := goyaml.Marshal(info)
+	data, err := goyaml.Marshal(info.EnvInfo)
 	if err != nil {
 		return errgo.Annotate(err, "cannot marshal environment info")
 	}

=== modified file 'environs/configstore/mem.go'
--- environs/configstore/mem.go	2014-03-06 12:50:38 +0000
+++ environs/configstore/mem.go	2014-04-01 14:32:48 +0000
@@ -28,10 +28,10 @@
 	// references, which makes this OK to do.
 	info1 := *info
 	newAttrs := make(map[string]interface{})
-	for name, attr := range info.Config {
+	for name, attr := range info.EnvInfo.Config {
 		newAttrs[name] = attr
 	}
-	info1.Config = newAttrs
+	info1.EnvInfo.Config = newAttrs
 	info1.created = false
 	return &info1
 }

=== modified file 'environs/manual/init_test.go'
--- environs/manual/init_test.go	2014-03-13 07:54:56 +0000
+++ environs/manual/init_test.go	2014-04-01 14:32:48 +0000
@@ -43,7 +43,7 @@
 	// will return an error. stderr will be included in the error message.
 	defer installFakeSSH(c, manual.DetectionScript, []string{scriptResponse, "oh noes"}, 33)()
 	hc, _, err := manual.DetectSeriesAndHardwareCharacteristics("hostname")
-	c.Assert(err, gc.ErrorMatches, "rc: 33 \\(oh noes\\)")
+	c.Assert(err, gc.ErrorMatches, "subprocess encountered error code 33 \\(oh noes\\)")
 	// if the script doesn't fail, stderr is simply ignored.
 	defer installFakeSSH(c, manual.DetectionScript, []string{scriptResponse, "non-empty-stderr"}, 0)()
 	hc, _, err = manual.DetectSeriesAndHardwareCharacteristics("hostname")
@@ -134,7 +134,7 @@
 	// will return an error. stderr will be included in the error message.
 	defer installFakeSSH(c, manual.CheckProvisionedScript, []string{"non-empty-stdout", "non-empty-stderr"}, 255)()
 	_, err = manual.CheckProvisioned("example.com")
-	c.Assert(err, gc.ErrorMatches, "rc: 255 \\(non-empty-stderr\\)")
+	c.Assert(err, gc.ErrorMatches, "subprocess encountered error code 255 \\(non-empty-stderr\\)")
 }
 
 func (s *initialisationSuite) TestInitUbuntuUserNonExisting(c *gc.C) {
@@ -153,5 +153,5 @@
 	defer installFakeSSH(c, "", []string{"", "failed to create ubuntu user"}, 123)()
 	defer installFakeSSH(c, "", "", 1)() // simulate failure of ubuntu@ login
 	err := manual.InitUbuntuUser("testhost", "testuser", "", nil, nil)
-	c.Assert(err, gc.ErrorMatches, "rc: 123 \\(failed to create ubuntu user\\)")
+	c.Assert(err, gc.ErrorMatches, "subprocess encountered error code 123 \\(failed to create ubuntu user\\)")
 }

=== modified file 'environs/manual/provisioner_test.go'
--- environs/manual/provisioner_test.go	2014-03-17 03:17:04 +0000
+++ environs/manual/provisioner_test.go	2014-04-01 14:32:48 +0000
@@ -75,7 +75,7 @@
 		}.install(c).Restore()
 		machineId, err = manual.ProvisionMachine(args)
 		if errorCode != 0 {
-			c.Assert(err, gc.ErrorMatches, fmt.Sprintf("rc: %d", errorCode))
+			c.Assert(err, gc.ErrorMatches, fmt.Sprintf("subprocess encountered error code %d", errorCode))
 			c.Assert(machineId, gc.Equals, "")
 		} else {
 			c.Assert(err, gc.IsNil)
@@ -109,7 +109,7 @@
 		SkipProvisionAgent:       true,
 	}.install(c).Restore()
 	_, err = manual.ProvisionMachine(args)
-	c.Assert(err, gc.ErrorMatches, "error checking if provisioned: rc: 255")
+	c.Assert(err, gc.ErrorMatches, "error checking if provisioned: subprocess encountered error code 255")
 }
 
 func (s *provisionerSuite) TestFinishMachineConfig(c *gc.C) {

=== modified file 'juju/api.go'
--- juju/api.go	2014-03-31 12:24:52 +0000
+++ juju/api.go	2014-04-01 14:32:48 +0000
@@ -19,6 +19,7 @@
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/keymanager"
+	"launchpad.net/juju-core/state/api/usermanager"
 	"launchpad.net/juju-core/utils/parallel"
 )
 
@@ -102,6 +103,14 @@
 	return keymanager.NewClient(st), nil
 }
 
+func NewUserManagerClient(envName string) (*usermanager.Client, error) {
+	st, err := newAPIClient(envName)
+	if err != nil {
+		return nil, err
+	}
+	return usermanager.NewClient(st), nil
+}
+
 // NewAPIFromName returns an api.State connected to the API Server for
 // the named environment. If envName is "", the default environment will
 // be used.

=== modified file 'state/api/params/params.go'
--- state/api/params/params.go	2014-03-31 12:30:31 +0000
+++ state/api/params/params.go	2014-04-01 14:32:48 +0000
@@ -361,6 +361,12 @@
 	Keys []string
 }
 
+// ModifyUser stores the parameters used for a UserManager.Add|Remove call
+type ModifyUser struct {
+	Tag      string
+	Password string
+}
+
 // MarshalJSON implements json.Marshaler.
 func (d *Delta) MarshalJSON() ([]byte, error) {
 	b, err := json.Marshal(d.Entity)

=== modified file 'state/apiserver/client/api_test.go'
--- state/apiserver/client/api_test.go	2014-03-13 13:42:50 +0000
+++ state/apiserver/client/api_test.go	2014-04-01 14:32:48 +0000
@@ -267,7 +267,7 @@
 	setDefaultPassword(c, u)
 	add(u)
 
-	u, err = s.State.AddUser("other", "")
+	u, err = s.State.AddUser("other", "password")
 	c.Assert(err, gc.IsNil)
 	setDefaultPassword(c, u)
 	add(u)

=== modified file 'state/user_test.go'
--- state/user_test.go	2014-03-13 13:42:50 +0000
+++ state/user_test.go	2014-04-01 14:32:48 +0000
@@ -58,7 +58,7 @@
 }
 
 func (s *UserSuite) TestSetPassword(c *gc.C) {
-	u, err := s.State.AddUser("someuser", "")
+	u, err := s.State.AddUser("someuser", "password")
 	c.Assert(err, gc.IsNil)
 
 	testSetPassword(c, func() (state.Authenticator, error) {
@@ -92,7 +92,7 @@
 }
 
 func (s *UserSuite) TestSetPasswordHash(c *gc.C) {
-	u, err := s.State.AddUser("someuser", "")
+	u, err := s.State.AddUser("someuser", "password")
 	c.Assert(err, gc.IsNil)
 
 	err = u.SetPasswordHash(utils.UserPasswordHash("foo", utils.CompatSalt), utils.CompatSalt)
@@ -111,7 +111,7 @@
 }
 
 func (s *UserSuite) TestSetPasswordHashWithSalt(c *gc.C) {
-	u, err := s.State.AddUser("someuser", "")
+	u, err := s.State.AddUser("someuser", "password")
 	c.Assert(err, gc.IsNil)
 
 	err = u.SetPasswordHash(utils.UserPasswordHash("foo", "salted"), "salted")
@@ -124,7 +124,7 @@
 }
 
 func (s *UserSuite) TestPasswordValidUpdatesSalt(c *gc.C) {
-	u, err := s.State.AddUser("someuser", "")
+	u, err := s.State.AddUser("someuser", "password")
 	c.Assert(err, gc.IsNil)
 
 	compatHash := utils.UserPasswordHash("foo", utils.CompatSalt)
@@ -152,7 +152,7 @@
 }
 
 func (s *UserSuite) TestName(c *gc.C) {
-	u, err := s.State.AddUser("someuser", "")
+	u, err := s.State.AddUser("someuser", "password")
 	c.Assert(err, gc.IsNil)
 
 	c.Assert(u.Name(), gc.Equals, "someuser")
@@ -160,7 +160,7 @@
 }
 
 func (s *UserSuite) TestDeactivate(c *gc.C) {
-	u, err := s.State.AddUser("someuser", "")
+	u, err := s.State.AddUser("someuser", "password")
 	c.Assert(err, gc.IsNil)
 	c.Assert(u.IsDeactivated(), gc.Equals, false)
 

=== modified file 'testing/environ.go'
--- testing/environ.go	2014-02-18 17:15:06 +0000
+++ testing/environ.go	2014-04-01 14:32:48 +0000
@@ -240,8 +240,10 @@
 	return fake
 }
 
-func MakeSampleHome(c *gc.C) *FakeHome {
-	return MakeFakeHome(c, SingleEnvConfig, SampleCertName)
+func MakeSampleHome(c *gc.C, files ...TestFile) *FakeHome {
+	fake := MakeFakeHome(c, SingleEnvConfig, SampleCertName)
+	fake.AddFiles(c, files)
+	return fake
 }
 
 func MakeMultipleEnvHome(c *gc.C) *FakeHome {