cmd/jujud: do not change password

environs/ec2/export_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package ec2
 
 import (
         "io"
         "launchpad.net/goamz/aws"
         "launchpad.net/goamz/ec2"
         "launchpad.net/goamz/s3"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/imagemetadata"
         "launchpad.net/juju-core/environs/jujutest"
-        "launchpad.net/juju-core/state"
+        "launchpad.net/juju-core/instance"
         "launchpad.net/juju-core/utils"
         "net/http"
 )
 
 type BootstrapState struct {
-        StateInstances []state.InstanceId
+        StateInstances []instance.Id
 }
 
 func LoadState(e environs.Environ) (*BootstrapState, error) {
         s, err := e.(*environ).loadState()
         if err != nil {
                 return nil, err
         }
         return &BootstrapState{s.StateInstances}, nil
 }
 
@@ skipping 10 matching lines @@
 }
 
 func EnvironS3(e environs.Environ) *s3.S3 {
         return e.(*environ).s3()
 }
 
 func DeleteStorageContent(s environs.Storage) error {
         return s.(*storage).deleteAll()
 }
 
-func InstanceEC2(inst environs.Instance) *ec2.Instance {
-        return inst.(*instance).Instance
+func InstanceEC2(inst instance.Instance) *ec2.Instance {
+        return inst.(*ec2Instance).Instance
 }
 
 // BucketStorage returns a storage instance addressing
 // an arbitrary s3 bucket.
 func BucketStorage(b *s3.Bucket) environs.Storage {
         return &storage{
                 bucket: b,
         }
 }
 
@@ skipping 77 matching lines @@
 }
 
 var ShortAttempt = &shortAttempt
 
 func EC2ErrCode(err error) string {
         return ec2ErrCode(err)
 }
 
 // FabricateInstance creates a new fictitious instance
 // given an existing instance and a new id.
-func FabricateInstance(inst environs.Instance, newId string) environs.Instance {
-        oldi := inst.(*instance)
-        newi := &instance{oldi.e, &ec2.Instance{}}
+func FabricateInstance(inst instance.Instance, newId string) instance.Instance {
+        oldi := inst.(*ec2Instance)
+        newi := &ec2Instance{
+                e:        oldi.e,
+                Instance: &ec2.Instance{},
+                arch:     oldi.arch,
+                instType: oldi.instType,
+        }
         *newi.Instance = *oldi.Instance
         newi.InstanceId = newId
         return newi
 }
 
 // Access non exported methods on ec2.storage
 type Storage interface {
         Put(file string, r io.Reader, length int64) error
         ResetMadeBucket()
 }
@@ skipping 221 matching lines @@
         "m1.large":    240,
         "m1.xlarge":   480,
         "t1.micro":    20,
         "c1.medium":   145,
         "c1.xlarge":   580,
         "cc1.4xlarge": 1300,
         "cc2.8xlarge": 2400,
 }
 
 var TestRegions = map[string]aws.Region{
-        "test": aws.Region{
+        "test": {
                 Name:        "test",
                 EC2Endpoint: "https://ec2.endpoint.com",
         },
 }