only forward iops if it is non-zero

.gitignore

@@ -1,9 +1,7 @@
-glide.lock
 .site/
 site/
 .build/*/
 .build/*-filtered.json
-vendor/
 .project
 
 # Created by https://www.gitignore.io

drivers/storage/ec2/ec2.go

@@ -14,6 +14,7 @@ import (
 	"github.com/akutz/gofig"
 	"github.com/akutz/goof"
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
@@ -480,12 +481,17 @@ func (d *driver) createVolume(
 
 	d.createVolumeEnsureAvailabilityZone(&availabilityZone, &server)
 
+	// only forward iops if it's non-zero
+	var iops *int64
+	if IOPS > 0 {
+		iops = &IOPS
+	}
 	options := &ec2.CreateVolumeInput{
 		Size:             &size,
 		SnapshotId:       &snapshotID,
 		AvailabilityZone: &availabilityZone,
 		VolumeType:       &volumeType,
-		Iops:             &IOPS,
+		Iops:             iops,
 	}
 
 	var resp *ec2.Volume
@@ -517,6 +523,12 @@ func (d *driver) createVolumeCreateSnapshot(
 		return "", err
 	}
 
+	err = d.waitSnapshotComplete(snapshots[0].SnapshotID)
+
+	if err != nil {
+		return "", err
+	}
+
 	return snapshots[0].SnapshotID, nil
 }
 
@@ -532,8 +544,9 @@ func (d *driver) createVolumeCreateVolume(
 	for {
 		resp, err = d.ec2Instance.CreateVolume(options)
 		if err != nil {
-			if err.Error() ==
-				"Snapshot is in invalid state - pending (IncorrectState)" {
+			if awsErrMessage(err) ==
+				"Snapshot is in invalid state - pending" {
+				// Really, snapshot should be created already
 				time.Sleep(1 * time.Second)
 				continue
 			}
@@ -713,6 +726,9 @@ func (d *driver) waitSnapshotComplete(snapshotID string) error {
 		if *snapshot.State == ec2.SnapshotStateCompleted {
 			break
 		}
+		if *snapshot.State == ec2.SnapshotStateError {
+			return fmt.Errorf("%s", *snapshot.StateMessage)
+		}
 		time.Sleep(1 * time.Second)
 	}
 
@@ -1008,3 +1024,10 @@ func configRegistration() *gofig.Registration {
 	r.Key(gofig.String, "", "", "", "aws.region")
 	return r
 }
+
+func awsErrMessage(err error) string {
+	if awsErr, ok := err.(awserr.Error); ok {
+		return awsErr.Message()
+	}
+	return ""
+}