send scheduling block with automaticrestart if there is none in cfg

hashicorp · Dec 11, 2018 · 4983bef · 4983bef
1 parent f6a5d69
commit 4983bef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/.gometalinter.json b/.gometalinter.json
diff --git a/google/resource_compute_instance.go b/google/resource_compute_instance.go
@@ -625,12 +625,22 @@ func expandComputeInstance(project string, zone *compute.Zone, d *schema.Resourc
 		disks = append(disks, disk)
 	}
 
-	prefix := "scheduling.0"
-	scheduling := &computeBeta.Scheduling{
-		AutomaticRestart:  googleapi.Bool(d.Get(prefix + ".automatic_restart").(bool)),
-		Preemptible:       d.Get(prefix + ".preemptible").(bool),
-		OnHostMaintenance: d.Get(prefix + ".on_host_maintenance").(string),
-		ForceSendFields:   []string{"AutomaticRestart", "Preemptible"},
+	sch := d.Get("scheduling").([]interface{})
+	var scheduling *computeBeta.Scheduling
+	if len(sch) == 0 {
+		// TF doesn't do anything about defaults inside of nested objects, so if
+		// scheduling hasn't been set, then send it with its default values.
+		scheduling = &computeBeta.Scheduling{
+			AutomaticRestart: googleapi.Bool(true),
+		}
+	} else {
+		prefix := "scheduling.0"
+		scheduling = &computeBeta.Scheduling{
+			AutomaticRestart:  googleapi.Bool(d.Get(prefix + ".automatic_restart").(bool)),
+			Preemptible:       d.Get(prefix + ".preemptible").(bool),
+			OnHostMaintenance: d.Get(prefix + ".on_host_maintenance").(string),
+			ForceSendFields:   []string{"AutomaticRestart", "Preemptible"},
+		}
 	}
 
 	metadata, err := resourceInstanceMetadata(d)

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -461,6 +461,10 @@ exported:
     be different than the `min_master_version` set in the config if the master
     has been updated by GKE.
 
+* `tpu_ipv4_cidr_block` - The IP address range of the Cloud TPUs in this cluster, in
+    [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
+    notation (e.g. `1.2.3.4/29`).
+
 <a id="timeouts"></a>
 ## Timeouts