Fix various bootstrap issues

Fix various bootstrap issues

This fixed bootstrap on MAAS with --upload-tools
and also general bootstrap with --metadata-source.
It also changes dummy storage so that it mimics
MAAS behaviour to hopefully help catch future issues.

https://code.launchpad.net/~wallyworld/juju-core/bootstrap-issues/+merge/203879

(do not edit description out of merge proposal)

[wallyworld, 2014-01-30 06:24:10]

Please take a look.

[axw, 2014-01-30 07:07:36]

LGTM

https://codereview.appspot.com/58510044/diff/1/cmd/plugins/juju-metadata/imag...
File cmd/plugins/juju-metadata/imagemetadata.go (right):

https://codereview.appspot.com/58510044/diff/1/cmd/plugins/juju-metadata/imag...
cmd/plugins/juju-metadata/imagemetadata.go:170: dir, err = filepath.Abs(dir)
Not really necessary is it? Doesn't hurt I suppose.

https://codereview.appspot.com/58510044/diff/1/environs/tools/tools_test.go
File environs/tools/tools_test.go (right):

https://codereview.appspot.com/58510044/diff/1/environs/tools/tools_test.go#n...
environs/tools/tools_test.go:124: err = stor.Put(filename,
bytes.NewReader([]byte("dummy")), 5)
FYI, you can use strings.NewReader("dummy")

[wallyworld, 2014-01-30 07:37:50]

https://codereview.appspot.com/58510044/diff/1/environs/tools/tools_test.go
File environs/tools/tools_test.go (right):

https://codereview.appspot.com/58510044/diff/1/environs/tools/tools_test.go#n...
environs/tools/tools_test.go:124: err = stor.Put(filename,
bytes.NewReader([]byte("dummy")), 5)
On 2014/01/30 07:07:36, axw wrote:
> FYI, you can use strings.NewReader("dummy")

Done.

[rog, 2014-01-30 09:46:49]

I'd like it if some of the issues below could be
addressed.

https://codereview.appspot.com/58510044/diff/1/cmd/juju/bootstrap.go
File cmd/juju/bootstrap.go (right):

https://codereview.appspot.com/58510044/diff/1/cmd/juju/bootstrap.go#newcode89
cmd/juju/bootstrap.go:89: c.MetadataSource, err =
utils.NormalizePath(c.MetadataSource)
This is wrong. It is the shell's responsibility to expand ~ and $ before calling
the program - we should not do it here.

https://codereview.appspot.com/58510044/diff/1/cmd/juju/bootstrap.go#newcode93
cmd/juju/bootstrap.go:93: c.MetadataSource, err = filepath.Abs(c.MetadataSource)
I believe this is wrong too - the path should be treated relatively to the
Context.Dir passed into Run (i.e. we should use filepath.Rel(ctx.Dir,
c.MetadataSource))

It's possible that we want to normalize ctx.Dir before that.

https://codereview.appspot.com/58510044/diff/1/cmd/plugins/juju-metadata/imag...
File cmd/plugins/juju-metadata/imagemetadata.go (right):

https://codereview.appspot.com/58510044/diff/1/cmd/plugins/juju-metadata/imag...
cmd/plugins/juju-metadata/imagemetadata.go:170: dir, err = filepath.Abs(dir)
filepath.Rel(context.Dir, dir)

Perhaps consider defining a method on Context to return an absolute path
relative to the context's directory.

Actually, it seems there is one. Please use c.AbsPath, changing it to use
NormalizePath if necessary (I actually don't think it is - what code relies on
that behaviour?)

https://codereview.appspot.com/58510044/diff/1/cmd/plugins/juju-metadata/sign...
File cmd/plugins/juju-metadata/signmetadata.go (right):

https://codereview.appspot.com/58510044/diff/1/cmd/plugins/juju-metadata/sign...
cmd/plugins/juju-metadata/signmetadata.go:71: c.dir, err = filepath.Abs(c.dir)
See earlier comment.

https://codereview.appspot.com/58510044/diff/1/environs/sync/sync.go
File environs/sync/sync.go (left):

https://codereview.appspot.com/58510044/diff/1/environs/sync/sync.go#oldcode245
environs/sync/sync.go:245: URL:     url,
How does the URL get into the metadata now?

https://codereview.appspot.com/58510044/diff/1/environs/tools/simplestreams.go
File environs/tools/simplestreams.go (left):

https://codereview.appspot.com/58510044/diff/1/environs/tools/simplestreams.g...
environs/tools/simplestreams.go:247: FullPath: t.URL,
Why are we ignoring the tools URL here now?

If nothing else, the doc comment on MetadataFromTools should
mention it.

https://codereview.appspot.com/58510044/diff/1/provider/dummy/storage.go
File provider/dummy/storage.go (right):

https://codereview.appspot.com/58510044/diff/1/provider/dummy/storage.go#newc...
provider/dummy/storage.go:132: found := true
This should be false.
Otherwise we'll return true when there are no files at all.