amazon: Step Region Copy crashing on device mapping

Closes #4635
2017-03-08 18:12:37 +01:00 · 2017-03-08 18:12:37 +01:00 · 2300b102b7
parent 0bd04f7bab
commit 2300b102b7
1 changed files with 1 additions and 2 deletions
--- a/builder/amazon/common/step_ami_region_copy.go
+++ b/builder/amazon/common/step_ami_region_copy.go
@ -2,7 +2,6 @@ package common

 import (
 	"fmt"
-
 	"sync"

 	"github.com/aws/aws-sdk-go/aws"
@ -128,7 +127,7 @@ func amiRegionCopy(state multistep.StateBag, config *AccessConfig, name string,
 	}

 	for _, blockDeviceMapping := range describeImageResp.Images[0].BlockDeviceMappings {
-		if blockDeviceMapping.Ebs != nil {
+		if blockDeviceMapping.Ebs != nil && blockDeviceMapping.Ebs.SnapshotId != nil {
 			snapshotIds = append(snapshotIds, *blockDeviceMapping.Ebs.SnapshotId)
 		}
 	}