ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/google: Write the raw disk encryption key in the state file to avoid diffs on plan (#12068)

This commit is contained in:
Dana Hoffman 2017-02-20 09:28:32 -08:00 committed by Paul Stack
parent 8e41f57694
commit 069467edc1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/providers/google/resource_compute_instance.go
View File

@ -794,13 +794,14 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
disks := make([]map[string]interface{}, 0, 1) disks := make([]map[string]interface{}, 0, 1)
for i, disk := range instance.Disks { for i, disk := range instance.Disks {
di := map[string]interface{}{ di := map[string]interface{}{
"disk": d.Get(fmt.Sprintf("disk.%d.disk", i)), "disk": d.Get(fmt.Sprintf("disk.%d.disk", i)),
"image": d.Get(fmt.Sprintf("disk.%d.image", i)), "image": d.Get(fmt.Sprintf("disk.%d.image", i)),
"type": d.Get(fmt.Sprintf("disk.%d.type", i)), "type": d.Get(fmt.Sprintf("disk.%d.type", i)),
"scratch": d.Get(fmt.Sprintf("disk.%d.scratch", i)), "scratch": d.Get(fmt.Sprintf("disk.%d.scratch", i)),
"auto_delete": d.Get(fmt.Sprintf("disk.%d.auto_delete", i)), "auto_delete": d.Get(fmt.Sprintf("disk.%d.auto_delete", i)),
"size": d.Get(fmt.Sprintf("disk.%d.size", i)), "size": d.Get(fmt.Sprintf("disk.%d.size", i)),
"device_name": d.Get(fmt.Sprintf("disk.%d.device_name", 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 != "" { if disk.DiskEncryptionKey != nil && disk.DiskEncryptionKey.Sha256 != "" {
di["disk_encryption_key_sha256"] = disk.DiskEncryptionKey.Sha256 di["disk_encryption_key_sha256"] = disk.DiskEncryptionKey.Sha256