Merge pull request #4308 from rickard-von-essen/issue-4303

builder/amazon: Crashes when multiple EBS vols are used
10 years ago · 133af90774
parent 308a01795c 4b1e014be8
commit 133af90774
1 changed files with 2 additions and 1 deletions
--- a/builder/amazon/ebs/step_create_ami.go
+++ b/builder/amazon/ebs/step_create_ami.go
@ -68,7 +68,8 @@ func (s *stepCreateAMI) Run(state multistep.StateBag) multistep.StepAction {

 	snapshots := make(map[string][]string)
 	for _, blockDeviceMapping := range imagesResp.Images[0].BlockDeviceMappings {
-		if blockDeviceMapping.Ebs != nil {
+		if blockDeviceMapping.Ebs != nil && blockDeviceMapping.Ebs.SnapshotId != nil {
+
 			snapshots[*ec2conn.Config.Region] = append(snapshots[*ec2conn.Config.Region], *blockDeviceMapping.Ebs.SnapshotId)
 		}
 	}