Merge pull request #459 from bpot/fix_amazon_chroot

builder/amazon-chroot: fix builder-amazon-chroot find states

builder/amazon/chroot/step_attach_volume.go

@@ -60,7 +60,8 @@ func (s *StepAttachVolume) Run(state multistep.StateBag) multistep.StepAction {
 				return nil, "", errors.New("No attachments on volume.")
 			}
 
-			return nil, resp.Volumes[0].Attachments[0].Status, nil
+			a := resp.Volumes[0].Attachments[0]
+			return a, a.Status, nil
 		},
 	}
 
@@ -111,12 +112,12 @@ func (s *StepAttachVolume) CleanupFunc(state multistep.StateBag) error {
 				return nil, "", err
 			}
 
-			state := "detached"
+			v := resp.Volumes[0]
-			if len(resp.Volumes[0].Attachments) > 0 {
+			if len(v.Attachments) > 0 {
-				state = resp.Volumes[0].Attachments[0].Status
+				return v, v.Attachments[0].Status, nil
+			} else {
+				return v, "detached", nil
 			}
-
-			return nil, state, nil
 		},
 	}
 

builder/amazon/chroot/step_create_volume.go

@@ -75,7 +75,8 @@ func (s *StepCreateVolume) Run(state multistep.StateBag) multistep.StepAction {
 				return nil, "", err
 			}
 
-			return nil, resp.Volumes[0].Status, nil
+			v := resp.Volumes[0]
+			return v, v.Status, nil
 		},
 	}
 

builder/amazon/chroot/step_snapshot.go

@@ -51,7 +51,8 @@ func (s *StepSnapshot) Run(state multistep.StateBag) multistep.StepAction {
 				return nil, "", errors.New("No snapshots found.")
 			}
 
-			return nil, resp.Snapshots[0].Status, nil
+			s := resp.Snapshots[0]
+			return s, s.Status, nil
 		},
 	}