Merge pull request #4642 from rickard-von-essen/issue-4635

amazon: Step Region Copy crashing on device mapping
This commit is contained in:
Matthew Hooker 2017-03-08 11:21:49 -08:00 committed by GitHub
commit e2f083b21c
1 changed files with 1 additions and 2 deletions

View File

@ -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)
}
}