test: destroy snapshot on teardown

Author: mogrogan

builder/ebs/acceptance/aws.go

@@ -5,6 +5,7 @@ package amazon_acc
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -52,25 +53,45 @@ func (a *AMIHelper) CleanUpAmi() error {
 	if err != nil {
 		return fmt.Errorf("AWSAMICleanUp: Unable to find Image %s: %s", a.Name, err.Error())
 	}
+	if resp == nil {
+		return errors.New("AWSAMICleanUp: Response from describe images should not be nil")
+	}
+	if len(resp.Images) == 0 {
+		return errors.New("AWSAMICleanUp: No image was found by describes images")
+	}
 
-	if resp != nil && len(resp.Images) > 0 {
-		ctx = context.TODO()
-		err = retry.Config{
-			Tries: 11,
-			ShouldRetry: func(err error) bool {
-				return true // TODO make retry more specific to eventual consitencey
-			},
-			RetryDelay: (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
-		}.Run(ctx, func(ctx context.Context) error {
-			_, err = regionconn.DeregisterImage(&ec2.DeregisterImageInput{
-				ImageId: resp.Images[0].ImageId,
-			})
-			return err
+	image := resp.Images[0]
+	ctx = context.TODO()
+	err = retry.Config{
+		Tries: 11,
+		ShouldRetry: func(err error) bool {
+			return true // TODO make retry more specific to eventual consitencey
+		},
+		RetryDelay: (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
+	}.Run(ctx, func(ctx context.Context) error {
+		_, err = regionconn.DeregisterImage(&ec2.DeregisterImageInput{
+			ImageId: image.ImageId,
 		})
-
 		if err != nil {
-			return fmt.Errorf("AWSAMICleanUp: Unable to Deregister Image %s", err.Error())
+			return err
+		}
+		if len(image.BlockDeviceMappings) == 0 {
+			return fmt.Errorf("AWSAMICleanUp: Image should contain at least 1 BlockDeviceMapping, got %d", len(image.BlockDeviceMappings))
 		}
+		for _, bdm := range image.BlockDeviceMappings {
+			if bdm.Ebs != nil && bdm.Ebs.SnapshotId != nil {
+				_, err = regionconn.DeleteSnapshot(&ec2.DeleteSnapshotInput{
+					SnapshotId: bdm.Ebs.SnapshotId,
+				})
+				return err
+
+			}
+		}
+		return nil
+	})
+
+	if err != nil {
+		return fmt.Errorf("AWSAMICleanUp: Unable to Deregister Image %s", err.Error())
 	}
 
 	return nil