iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

copy and convert to pointer

This commit is contained in:
Tommy Ulfsparre 2015-06-25 20:07:45 +02:00
parent dd1fdc722a
commit 8ae0cfc759
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builder/amazon/common/block_device.go
View File

@ -29,27 +29,27 @@ func buildBlockDevices(b []BlockDevice) []*ec2.BlockDeviceMapping {
for _, blockDevice := range b { for _, blockDevice := range b {
ebsBlockDevice := &ec2.EBSBlockDevice{ ebsBlockDevice := &ec2.EBSBlockDevice{
VolumeType: &blockDevice.VolumeType, VolumeType: aws.String(blockDevice.VolumeType),
VolumeSize: &blockDevice.VolumeSize, VolumeSize: aws.Long(blockDevice.VolumeSize),
DeleteOnTermination: &blockDevice.DeleteOnTermination, DeleteOnTermination: aws.Boolean(blockDevice.DeleteOnTermination),
} }
// IOPS is only valid for SSD Volumes // IOPS is only valid for SSD Volumes
if blockDevice.VolumeType != "" && blockDevice.VolumeType != "standard" && blockDevice.VolumeType != "gp2" { if blockDevice.VolumeType != "" && blockDevice.VolumeType != "standard" && blockDevice.VolumeType != "gp2" {
ebsBlockDevice.IOPS = &blockDevice.IOPS ebsBlockDevice.IOPS = aws.Long(blockDevice.IOPS)
} }
// You cannot specify Encrypted if you specify a Snapshot ID // You cannot specify Encrypted if you specify a Snapshot ID
if blockDevice.SnapshotId != "" { if blockDevice.SnapshotId != "" {
ebsBlockDevice.SnapshotID = &blockDevice.SnapshotId ebsBlockDevice.SnapshotID = aws.String(blockDevice.SnapshotId)
} else if blockDevice.Encrypted { } else if blockDevice.Encrypted {
ebsBlockDevice.Encrypted = &blockDevice.Encrypted ebsBlockDevice.Encrypted = aws.Boolean(blockDevice.Encrypted)
} }
mapping := &ec2.BlockDeviceMapping{ mapping := &ec2.BlockDeviceMapping{
EBS: ebsBlockDevice, EBS: ebsBlockDevice,
DeviceName: &blockDevice.DeviceName, DeviceName: aws.String(blockDevice.DeviceName),
VirtualName: &blockDevice.VirtualName, VirtualName: aws.String(blockDevice.VirtualName),
} }
if blockDevice.NoDevice { if blockDevice.NoDevice {