From 8cd5e263b894a65a05e7f1e2f19f405184d6e2b9 Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Wed, 24 Aug 2016 10:05:07 +0200
Subject: [PATCH] Fix AWS reporting "The parameter KmsKeyId requires the
 parameter Encrypted to be set."

- use aws.String/Int/Bool functions
- don't set the key to empty string, use nil instead
---
 pkg/cloudprovider/providers/aws/aws.go | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go
index 698596eef34..621eaff1384 100644
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -1567,18 +1567,16 @@ func (c *Cloud) CreateDisk(volumeOptions *VolumeOptions) (string, error) {
 
 	// TODO: Should we tag this with the cluster id (so it gets deleted when the cluster does?)
 	request := &ec2.CreateVolumeInput{}
-	request.AvailabilityZone = &createAZ
-	volSize := int64(volumeOptions.CapacityGB)
-	request.Size = &volSize
-	request.VolumeType = &createType
-	request.Encrypted = &volumeOptions.Encrypted
-	request.KmsKeyId = &volumeOptions.KmsKeyId
-	if len(*request.KmsKeyId) > 0 {
-		b := true
-		request.Encrypted = &b
+	request.AvailabilityZone = aws.String(createAZ)
+	request.Size = aws.Int64(int64(volumeOptions.CapacityGB))
+	request.VolumeType = aws.String(createType)
+	request.Encrypted = aws.Bool(volumeOptions.Encrypted)
+	if len(volumeOptions.KmsKeyId) > 0 {
+		request.KmsKeyId = aws.String(volumeOptions.KmsKeyId)
+		request.Encrypted = aws.Bool(true)
 	}
 	if iops > 0 {
-		request.Iops = &iops
+		request.Iops = aws.Int64(iops)
 	}
 	response, err := c.ec2.CreateVolume(request)
 	if err != nil {