Upload tools uses simplestreams

Upload tools uses simplestreams

juju bootstrap --upload-tools writes simplestreams metadata.
To implement this change, chunks of functionality needed to
be copied to different packages to avoid import loops.

https://code.launchpad.net/~wallyworld/juju-core/simplestreams-uploadtools/+merge/185698

(do not edit description out of merge proposal)

[wallyworld, 2013-09-16 04:48:08]

Please take a look.

[axw1, 2013-09-16 08:35:26]

On 2013/09/16 04:48:08, wallyworld wrote:
> Please take a look.

Can httpstorage please be named ec2storage? Then it'll be obvious that it's
dependent on EC2-isms.

Also, I'm about to rename localstorage to httpstorage :)
This renamed package will not manipulate the disk directly, but will wrap
another storage object.

[wallyworld, 2013-09-16 10:47:10]

On 2013/09/16 08:35:26, axw1 wrote:
> On 2013/09/16 04:48:08, wallyworld wrote:
> > Please take a look.
> 
> Can httpstorage please be named ec2storage? Then it'll be obvious that it's
> dependent on EC2-isms.
>

There's no obvious ec2 dependencies in the code. But the data that comes back is
parsed as XML and I guess there's some ec2 specific assumptions in the format. 
I've moved to provider.ec2.httpstorage

[wallyworld, 2013-09-16 10:48:36]

Please take a look.

[axw1, 2013-09-17 04:23:11]

A few quibbles, but otherwise LGTM.

https://codereview.appspot.com/13725043/diff/7001/environs/sync/sync.go
File environs/sync/sync.go (right):

https://codereview.appspot.com/13725043/diff/7001/environs/sync/sync.go#newco...
environs/sync/sync.go:236: envtools.SetToolPrefix(envtools.DefaultToolPrefix)
Is it conceivable that someone calls Upload with NetToolPrefix already set?
Perhaps SetToolPrefix should return the old prefix, and we can reset it here.

https://codereview.appspot.com/13725043/diff/7001/environs/testing/storage.go
File environs/testing/storage.go (right):

https://codereview.appspot.com/13725043/diff/7001/environs/testing/storage.go...
environs/testing/storage.go:58: // HTTPTestStorage acts like an EC2 storage
which can be
Why the name change? I guess this is going to change to represent the new public
tools repository?

https://codereview.appspot.com/13725043/diff/7001/environs/tools/build.go
File environs/tools/build.go (right):

https://codereview.appspot.com/13725043/diff/7001/environs/tools/build.go#new...
environs/tools/build.go:208: func BundleTools(w io.Writer, forceVersion
*version.Number) (version.Binary, string, error) {
It's fairly non-obvious what the 2nd result is. Can you please give it a name?

https://codereview.appspot.com/13725043/diff/7001/environs/tools/simplestream...
File environs/tools/simplestreams.go (right):

https://codereview.appspot.com/13725043/diff/7001/environs/tools/simplestream...
environs/tools/simplestreams.go:169: fmt.Println("555555555555")
Delete me

[wallyworld, 2013-09-17 05:30:16]

https://codereview.appspot.com/13725043/diff/7001/environs/sync/sync.go
File environs/sync/sync.go (right):

https://codereview.appspot.com/13725043/diff/7001/environs/sync/sync.go#newco...
environs/sync/sync.go:236: envtools.SetToolPrefix(envtools.DefaultToolPrefix)
On 2013/09/17 04:23:11, axw1 wrote:
> Is it conceivable that someone calls Upload with NetToolPrefix already set?
> Perhaps SetToolPrefix should return the old prefix, and we can reset it here.

I can't happen like that in practice. But I've made the Set function return a
deferred cleanup function.

https://codereview.appspot.com/13725043/diff/7001/environs/testing/storage.go
File environs/testing/storage.go (right):

https://codereview.appspot.com/13725043/diff/7001/environs/testing/storage.go...
environs/testing/storage.go:58: // HTTPTestStorage acts like an EC2 storage
which can be
On 2013/09/17 04:23:11, axw1 wrote:
> Why the name change? I guess this is going to change to represent the new
public
> tools repository?

I didn't think it was EC2 specific but I guess the content it produces might be.
I'll revert the name change. But I really dislike having EC2 specific test
things outside of an EC2 package and used generally. And yes, I'm hoping it will
go once the s3 tools repository goes.

https://codereview.appspot.com/13725043/diff/7001/environs/tools/build.go
File environs/tools/build.go (right):

https://codereview.appspot.com/13725043/diff/7001/environs/tools/build.go#new...
environs/tools/build.go:208: func BundleTools(w io.Writer, forceVersion
*version.Number) (version.Binary, string, error) {
On 2013/09/17 04:23:11, axw1 wrote:
> It's fairly non-obvious what the 2nd result is. Can you please give it a name?

Done.

https://codereview.appspot.com/13725043/diff/7001/environs/tools/simplestream...
File environs/tools/simplestreams.go (right):

https://codereview.appspot.com/13725043/diff/7001/environs/tools/simplestream...
environs/tools/simplestreams.go:169: fmt.Println("555555555555")
On 2013/09/17 04:23:11, axw1 wrote:
> Delete me

Oh ffs. /me curses myself for missing that. Thanks.