From 108ef0e4f71c215ebfab8a7b5e26cd3373320602 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Mon, 20 Feb 2017 09:28:32 -0800 Subject: [PATCH] provider/google: Write the raw disk encryption key in the state file to avoid diffs on plan (#12068) --- resource_compute_instance.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/resource_compute_instance.go b/resource_compute_instance.go index 1c7bd021..46daaf31 100644 --- a/resource_compute_instance.go +++ b/resource_compute_instance.go @@ -794,13 +794,14 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error disks := make([]map[string]interface{}, 0, 1) for i, disk := range instance.Disks { di := map[string]interface{}{ - "disk": d.Get(fmt.Sprintf("disk.%d.disk", i)), - "image": d.Get(fmt.Sprintf("disk.%d.image", i)), - "type": d.Get(fmt.Sprintf("disk.%d.type", i)), - "scratch": d.Get(fmt.Sprintf("disk.%d.scratch", i)), - "auto_delete": d.Get(fmt.Sprintf("disk.%d.auto_delete", i)), - "size": d.Get(fmt.Sprintf("disk.%d.size", i)), - "device_name": d.Get(fmt.Sprintf("disk.%d.device_name", i)), + "disk": d.Get(fmt.Sprintf("disk.%d.disk", i)), + "image": d.Get(fmt.Sprintf("disk.%d.image", i)), + "type": d.Get(fmt.Sprintf("disk.%d.type", i)), + "scratch": d.Get(fmt.Sprintf("disk.%d.scratch", i)), + "auto_delete": d.Get(fmt.Sprintf("disk.%d.auto_delete", i)), + "size": d.Get(fmt.Sprintf("disk.%d.size", i)), + "device_name": d.Get(fmt.Sprintf("disk.%d.device_name", i)), + "disk_encryption_key_raw": d.Get(fmt.Sprintf("disk.%d.disk_encryption_key_raw", i)), } if disk.DiskEncryptionKey != nil && disk.DiskEncryptionKey.Sha256 != "" { di["disk_encryption_key_sha256"] = disk.DiskEncryptionKey.Sha256