Merge pull request #1239 from BashtonLtd/gce_fix_false_bools

providers/google: Updates to GCE Instances and Instance Templates to allow for false bools.

builtin/providers/google/resource_compute_instance.go

@@ -72,6 +72,7 @@ func resourceComputeInstance() *schema.Resource {
 						"auto_delete": &schema.Schema{
 							Type:     schema.TypeBool,
 							Optional: true,
+							Default:  true,
 							ForceNew: true,
 						},
 
@@ -289,11 +290,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
 		disk.Type = "PERSISTENT"
 		disk.Mode = "READ_WRITE"
 		disk.Boot = i == 0
-		disk.AutoDelete = true
-
-		if v, ok := d.GetOk(prefix + ".auto_delete"); ok {
-			disk.AutoDelete = v.(bool)
-		}
+		disk.AutoDelete = d.Get(prefix + ".auto_delete").(bool)
 
 		// Load up the disk for this disk if specified
 		if v, ok := d.GetOk(prefix + ".disk"); ok {

builtin/providers/google/resource_compute_instance_template.go

@@ -58,6 +58,7 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 						"auto_delete": &schema.Schema{
 							Type:     schema.TypeBool,
 							Optional: true,
+							Default:  true,
 							ForceNew: true,
 						},
 
@@ -235,11 +236,7 @@ func buildDisks(d *schema.ResourceData, meta interface{}) []*compute.AttachedDis
 		disk.Mode = "READ_WRITE"
 		disk.Interface = "SCSI"
 		disk.Boot = i == 0
-		disk.AutoDelete = true
-
-		if v, ok := d.GetOk(prefix + ".auto_delete"); ok {
-			disk.AutoDelete = v.(bool)
-		}
+		disk.AutoDelete = d.Get(prefix + ".auto_delete").(bool)
 
 		if v, ok := d.GetOk(prefix + ".boot"); ok {
 			disk.Boot = v.(bool)