reverting testing stuff

builder/amazon/chroot/builder.go

@@ -7,7 +7,7 @@ package chroot
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/common"

builder/amazon/chroot/step_attach_volume.go

@@ -3,7 +3,7 @@ package chroot
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"

builder/amazon/chroot/step_create_volume.go

@@ -2,7 +2,7 @@ package chroot
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"

builder/amazon/chroot/step_instance_info.go

@@ -2,8 +2,8 @@ package chroot
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"log"

builder/amazon/chroot/step_register_ami.go

@@ -2,7 +2,7 @@ package chroot
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"

builder/amazon/chroot/step_snapshot.go

@@ -3,7 +3,7 @@ package chroot
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"

builder/amazon/chroot/step_source_ami_info.go

@@ -2,7 +2,7 @@ package chroot
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )

builder/amazon/common/access_config.go

@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
+	"github.com/mitchellh/goamz/aws"
 	"github.com/mitchellh/packer/packer"
 	"strings"
 	"unicode"

builder/amazon/common/ami_config.go

@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
+	"github.com/mitchellh/goamz/aws"
 	"github.com/mitchellh/packer/packer"
 )
 

builder/amazon/common/artifact.go

@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/packer/packer"
 	"log"
 	"strings"

builder/amazon/common/block_device.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 )
 
 // BlockDevice

builder/amazon/common/block_device_test.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"reflect"
 	"testing"
 )

builder/amazon/common/ssh.go

@@ -4,7 +4,7 @@ import (
 	gossh "code.google.com/p/go.crypto/ssh"
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/communicator/ssh"
 	"time"

builder/amazon/common/state.go

@@ -3,7 +3,7 @@ package common
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"log"
 	"time"

builder/amazon/common/step_ami_region_copy.go

@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )

builder/amazon/common/step_create_tags.go

@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )

builder/amazon/common/step_key_pair.go

@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"os"

builder/amazon/common/step_modify_ami_attributes.go

@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/aws"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/aws"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )

builder/amazon/common/step_run_source_instance.go

@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"io/ioutil"

builder/amazon/common/step_security_group.go

@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/common/uuid"
 	"github.com/mitchellh/packer/packer"

builder/amazon/ebs/builder.go

@@ -7,7 +7,7 @@ package ebs
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/common"

builder/amazon/ebs/step_create_ami.go

@@ -2,7 +2,7 @@ package ebs
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"

builder/amazon/ebs/step_stop_instance.go

@@ -2,7 +2,7 @@ package ebs
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"

builder/amazon/instance/builder.go

@@ -5,7 +5,7 @@ package instance
 import (
 	"errors"
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/common"

builder/amazon/instance/step_bundle_volume.go

@@ -2,7 +2,7 @@ package instance
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 )

builder/amazon/instance/step_register_ami.go

@@ -2,7 +2,7 @@ package instance
 
 import (
 	"fmt"
-	"github.com/CpuID/goamz/ec2"
+	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/multistep"
 	awscommon "github.com/mitchellh/packer/builder/amazon/common"
 	"github.com/mitchellh/packer/packer"