Fix encryption key issue. (#241)

Merged PR #241.
GoogleCloudPlatform · Jun 4, 2018 · 1db5c4d · 1db5c4d
1 parent e7fb3a9
commit 1db5c4d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/templates/terraform/constants/disk.erb b/templates/terraform/constants/disk.erb
@@ -206,10 +206,10 @@ func diskEncryptionKeyDiffSuppress(k, old, new string, d *schema.ResourceData) b
     }
   } else if strings.HasSuffix(k, "raw_key") {
     disk_key := d.Get("disk_encryption_key_raw").(string)
-    return disk_key == old
+    return disk_key == old && old != "" && new == ""
   } else if k == "disk_encryption_key_raw" {
     disk_key := d.Get("disk_encryption_key.0.raw_key").(string)
-    return disk_key == old
+    return disk_key == old && old != "" && new == ""
   }
   return false
 }
diff --git a/templates/terraform/custom_expand/encryption_key_expand.erb b/templates/terraform/custom_expand/encryption_key_expand.erb
@@ -9,7 +9,7 @@ func expand<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d *
   <% if property.name == "diskEncryptionKey" -%>
 	} else {
 		// Check alternative setting? 
-		if altV, ok := d.GetOk("disk_encryption_key_raw"); ok {
+		if altV, ok := d.GetOk("disk_encryption_key_raw"); ok && altV != "" {
 			outMap := make(map[string]interface{})
 			outMap["rawKey"] = altV
 			req = append(req, outMap)