environs/ec2: return matching ami for the region

environs/ec2: return matching ami for the region

Using defaultInstanceConstraints always specified us-east-1 when
searching for the instance ami. This branch respects the region
setting from the configuration.

https://code.launchpad.net/~dave-cheney/juju-core/go-environs-ec2-region-fix/+merge/112512

(do not edit description out of merge proposal)

[dave_cheney.net, 2012-06-28 08:49:04]

Please take a look.

[dave_cheney.net, 2012-06-28 23:56:42]

Please take a look.

[niemeyer, 2012-06-29 03:43:21]

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/ec2.go
File environs/ec2/ec2.go (left):

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/ec2.go#oldcode277
environs/ec2/ec2.go:277: spec, err :=
findInstanceSpec(defaultInstanceConstraint)
I suppose the default variable can go now?

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/ec2.go
File environs/ec2/ec2.go (right):

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/ec2.go#newcode281
environs/ec2/ec2.go:281: region:            e.config().region,
It would be nice to have a test for the problem fixed.

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/local_test.go
File environs/ec2/local_test.go (right):

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/local_test.go#n...
environs/ec2/local_test.go:152: delete(ec2.Regions,"test")
go fmt

[dave_cheney.net, 2012-06-29 07:18:41]

Please take a look.

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/ec2.go
File environs/ec2/ec2.go (left):

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/ec2.go#oldcode277
environs/ec2/ec2.go:277: spec, err :=
findInstanceSpec(defaultInstanceConstraint)
On 2012/06/29 03:43:21, niemeyer wrote:
> I suppose the default variable can go now?

yes, it was the only consumer.

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/ec2.go
File environs/ec2/ec2.go (right):

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/ec2.go#newcode281
environs/ec2/ec2.go:281: region:            e.config().region,
On 2012/06/29 03:43:21, niemeyer wrote:
> It would be nice to have a test for the problem fixed.

See the change to the query/image fixture data. Once I fixed this logic, all the
tests then broke because they were using the region 'test', which wasn't present
in the fixtures.

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/local_test.go
File environs/ec2/local_test.go (right):

https://codereview.appspot.com/6362043/diff/2002/environs/ec2/local_test.go#n...
environs/ec2/local_test.go:152: delete(ec2.Regions,"test")
On 2012/06/29 03:43:21, niemeyer wrote:
> go fmt

Done.

[niemeyer, 2012-06-29 21:29:50]

Thanks, LGTM.

[dave_cheney.net, 2012-06-30 00:43:28]

*** Submitted:

environs/ec2: return matching ami for the region

Using defaultInstanceConstraints always specified us-east-1 when
searching for the instance ami. This branch respects the region
setting from the configuration.

R=niemeyer
CC=
https://codereview.appspot.com/6362043