environs/*: move providers into provider

environs/*: move providers into provider

The environs name space is getting very cluttered.
This cleans it up a little and makes it easier to enumerate
all provider implementations.

https://code.launchpad.net/~rogpeppe/juju-core/367-environs-provider-move/+merge/180589

(do not edit description out of merge proposal)

[rog, 2013-08-16 15:07:26]

Please take a look.

[natefinch, 2013-08-16 15:20:45]

LGTM, bonus points for fixing the import sorting in the spots I pointed out.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/env...
File environs/provider/dummy/environs_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/env...
environs/provider/dummy/environs_test.go:11: stdtesting "testing"
Can you move this to the top of the packages?

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/local...
File environs/provider/ec2/local_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/local...
environs/provider/ec2/local_test.go:25: "sort"
sort the packages?

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/stora...
File environs/provider/ec2/storage_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/stora...
environs/provider/ec2/storage_test.go:10: . "launchpad.net/gocheck"
space below here pls

https://codereview.appspot.com/13053043/diff/1040/worker/firewaller/firewalle...
File worker/firewaller/firewaller_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/worker/firewaller/firewalle...
worker/firewaller/firewaller_test.go:7: . "launchpad.net/gocheck"
put this below the stdlib imports

[dimitern, 2013-08-16 16:09:36]

LGTM. Please, at least fix the order and separation of imports here noted. Since
the diff is tiny, fixing a bunch of gocheck->gc imports shouldn't be a problem,
but I'm OK if you at least fix the test packages ones under 200 lines.

https://codereview.appspot.com/13053043/diff/1040/cmd/juju/cmd_test.go
File cmd/juju/cmd_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/cmd/juju/cmd_test.go#newcode11
cmd/juju/cmd_test.go:11: . "launchpad.net/gocheck"
Blank line after this. Also consider changing it to gc and fixing the rest of
the file.

https://codereview.appspot.com/13053043/diff/1040/cmd/juju/main.go
File cmd/juju/main.go (right):

https://codereview.appspot.com/13053043/diff/1040/cmd/juju/main.go#newcode8
cmd/juju/main.go:8: "launchpad.net/juju-core/cmd"
Fix the imports separation please.

https://codereview.appspot.com/13053043/diff/1040/cmd/juju/main_test.go
File cmd/juju/main_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/cmd/juju/main_test.go#newco...
cmd/juju/main_test.go:18: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/cmd/jujud/machine_test.go
File cmd/jujud/machine_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/cmd/jujud/machine_test.go#n...
cmd/jujud/machine_test.go:12: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/cmd/jujud/main.go
File cmd/jujud/main.go (right):

https://codereview.appspot.com/13053043/diff/1040/cmd/jujud/main.go#newcode10
cmd/jujud/main.go:10: "net/rpc"
Fix the imports please.

https://codereview.appspot.com/13053043/diff/1040/environs/boilerplate_config...
File environs/boilerplate_config_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/boilerplate_config...
environs/boilerplate_config_test.go:7: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/environs/config_test.go
File environs/config_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/config_test.go#new...
environs/config_test.go:10: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/environs/emptystorage_test.go
File environs/emptystorage_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/emptystorage_test....
environs/emptystorage_test.go:9: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/environs/mongo_test.go
File environs/mongo_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/mongo_test.go#newc...
environs/mongo_test.go:7: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/environs/open_test.go
File environs/open_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/open_test.go#newcode7
environs/open_test.go:7: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/con...
File environs/provider/dummy/config_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/con...
environs/provider/dummy/config_test.go:7: . "launchpad.net/gocheck"
Blank line after this, also gc...

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/env...
File environs/provider/dummy/environs_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/env...
environs/provider/dummy/environs_test.go:7: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/env...
environs/provider/dummy/environs_test.go:11: stdtesting "testing"
On 2013/08/16 15:20:45, nate.finch wrote:
> Can you move this to the top of the packages?

+1

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/live_...
File environs/provider/ec2/live_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/live_...
environs/provider/ec2/live_test.go:14: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/local...
File environs/provider/ec2/local_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/local...
environs/provider/ec2/local_test.go:25: "sort"
On 2013/08/16 15:20:45, nate.finch wrote:
> sort the packages?

+1 and fix gocheck plase.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/stora...
File environs/provider/ec2/storage_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/ec2/stora...
environs/provider/ec2/storage_test.go:10: . "launchpad.net/gocheck"
On 2013/08/16 15:20:45, nate.finch wrote:
> space below here pls

+1 and gc...

https://codereview.appspot.com/13053043/diff/1040/environs/provider/local/loc...
File environs/provider/local/local_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/local/loc...
environs/provider/local/local_test.go:9: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
File environs/provider/openstack/live_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
environs/provider/openstack/live_test.go:10: . "launchpad.net/gocheck"
Fix the imports and gocheck please.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
File environs/provider/openstack/local_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
environs/provider/openstack/local_test.go:19:
"launchpad.net/juju-core/environs/provider/openstack"
Here as well.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
File environs/provider/openstack/provider_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
environs/provider/openstack/provider_test.go:8: . "launchpad.net/gocheck"
Imports, gocheck.

https://codereview.appspot.com/13053043/diff/1040/environs/tools_test.go
File environs/tools_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/tools_test.go#newc...
environs/tools_test.go:7: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/juju/apiconn_test.go
File juju/apiconn_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/juju/apiconn_test.go#newcode7
juju/apiconn_test.go:7: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/juju/conn_test.go
File juju/conn_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/juju/conn_test.go#newcode13
juju/conn_test.go:13: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/juju/testing/conn.go
File juju/testing/conn.go (right):

https://codereview.appspot.com/13053043/diff/1040/juju/testing/conn.go#newcode12
juju/testing/conn.go:12: . "launchpad.net/gocheck"
gc...

https://codereview.appspot.com/13053043/diff/1040/worker/firewaller/firewalle...
File worker/firewaller/firewaller_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/worker/firewaller/firewalle...
worker/firewaller/firewaller_test.go:7: . "launchpad.net/gocheck"
On 2013/08/16 15:20:45, nate.finch wrote:
> put this below the stdlib imports

+1 and gc...

https://codereview.appspot.com/13053043/diff/1040/worker/provisioner/provisio...
File worker/provisioner/provisioner_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/worker/provisioner/provisio...
worker/provisioner/provisioner_test.go:13: . "launchpad.net/gocheck"
gc...

[rog, 2013-08-16 16:23:32]

Please take a look.

https://codereview.appspot.com/13053043/diff/1040/cmd/juju/cmd_test.go
File cmd/juju/cmd_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/cmd/juju/cmd_test.go#newcode11
cmd/juju/cmd_test.go:11: . "launchpad.net/gocheck"
On 2013/08/16 16:09:36, dimitern wrote:
> Blank line after this. Also consider changing it to gc and fixing the rest of
> the file.

Done.

https://codereview.appspot.com/13053043/diff/1040/cmd/jujud/main.go
File cmd/jujud/main.go (right):

https://codereview.appspot.com/13053043/diff/1040/cmd/jujud/main.go#newcode10
cmd/jujud/main.go:10: "net/rpc"
On 2013/08/16 16:09:36, dimitern wrote:
> Fix the imports please.

Done.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/con...
File environs/provider/dummy/config_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/con...
environs/provider/dummy/config_test.go:7: . "launchpad.net/gocheck"
On 2013/08/16 16:09:36, dimitern wrote:
> Blank line after this, also gc...

Done.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/env...
File environs/provider/dummy/environs_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/env...
environs/provider/dummy/environs_test.go:7: . "launchpad.net/gocheck"
On 2013/08/16 16:09:36, dimitern wrote:
> gc...

Rather than make this branch two things, I'd prefer to leave those changes for
another one if that's OK.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/dummy/env...
environs/provider/dummy/environs_test.go:11: stdtesting "testing"
On 2013/08/16 16:09:36, dimitern wrote:
> On 2013/08/16 15:20:45, nate.finch wrote:
> > Can you move this to the top of the packages?
> 
> +1

Done.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
File environs/provider/openstack/local_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
environs/provider/openstack/local_test.go:19:
"launchpad.net/juju-core/environs/provider/openstack"
On 2013/08/16 16:09:36, dimitern wrote:
> Here as well.

Done.

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
File environs/provider/openstack/provider_test.go (right):

https://codereview.appspot.com/13053043/diff/1040/environs/provider/openstack...
environs/provider/openstack/provider_test.go:8: . "launchpad.net/gocheck"
On 2013/08/16 16:09:36, dimitern wrote:
> Imports, gocheck.

Done.

[rog, 2013-08-16 16:30:38]

Please take a look.

[rog, 2013-08-19 12:54:48]

On 17 August 2013 10:39, Dave Cheney <david.cheney@canonical.com> wrote:
> NOT LGTM. Please use juju-core/providers, that is what they are after all.

My view is that providers are really hidden behind the portable interface
defined in environs, so it makes sense to keep them inside
that directory (almost nothing should be importing them directly).

However, since both you and Dimiter have made the same suggestion,
I guess I'll go with it.

Any other thoughts on the colour of this shed before I go with that?

[rog, 2013-08-19 13:31:52]

Please take a look.