From 8ae0cfc75932bc8dc3e410fcc04de9742d29884c Mon Sep 17 00:00:00 2001 From: Tommy Ulfsparre Date: Thu, 25 Jun 2015 20:07:45 +0200 Subject: [PATCH] copy and convert to pointer --- builder/amazon/common/block_device.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index a01dfc83d..482b876f6 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -29,27 +29,27 @@ func buildBlockDevices(b []BlockDevice) []*ec2.BlockDeviceMapping { for _, blockDevice := range b { ebsBlockDevice := &ec2.EBSBlockDevice{ - VolumeType: &blockDevice.VolumeType, - VolumeSize: &blockDevice.VolumeSize, - DeleteOnTermination: &blockDevice.DeleteOnTermination, + VolumeType: aws.String(blockDevice.VolumeType), + VolumeSize: aws.Long(blockDevice.VolumeSize), + DeleteOnTermination: aws.Boolean(blockDevice.DeleteOnTermination), } // IOPS is only valid for SSD Volumes 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 if blockDevice.SnapshotId != "" { - ebsBlockDevice.SnapshotID = &blockDevice.SnapshotId + ebsBlockDevice.SnapshotID = aws.String(blockDevice.SnapshotId) } else if blockDevice.Encrypted { - ebsBlockDevice.Encrypted = &blockDevice.Encrypted + ebsBlockDevice.Encrypted = aws.Boolean(blockDevice.Encrypted) } mapping := &ec2.BlockDeviceMapping{ EBS: ebsBlockDevice, - DeviceName: &blockDevice.DeviceName, - VirtualName: &blockDevice.VirtualName, + DeviceName: aws.String(blockDevice.DeviceName), + VirtualName: aws.String(blockDevice.VirtualName), } if blockDevice.NoDevice {