amazon: Step Region Copy crashing on device mapping

Closes #4635
This commit is contained in:
Rickard von Essen 2017-03-08 18:12:37 +01:00
parent 0bd04f7bab
commit 2300b102b7

View File

@ -2,7 +2,6 @@ package common
import ( import (
"fmt" "fmt"
"sync" "sync"
"github.com/aws/aws-sdk-go/aws" "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 { 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) snapshotIds = append(snapshotIds, *blockDeviceMapping.Ebs.SnapshotId)
} }
} }