simply flatten[Beta]Scheduling method

hashicorp · Aug 17, 2017 · 9c603d9 · 9c603d9
1 parent 96c4c73
commit 9c603d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/google/resource_compute_instance.go b/google/resource_compute_instance.go
@@ -1587,12 +1587,13 @@ func flattenBetaMetadata(metadata *computeBeta.Metadata) map[string]string {
 
 func flattenBetaScheduling(scheduling *computeBeta.Scheduling) []map[string]interface{} {
 	result := make([]map[string]interface{}, 0, 1)
-	schedulingMap := make(map[string]interface{})
+	schedulingMap := map[string]interface{}{
+		"on_host_maintenance": scheduling.OnHostMaintenance,
+		"preemptible":         scheduling.Preemptible,
+	}
 	if scheduling.AutomaticRestart != nil {
 		schedulingMap["automatic_restart"] = *scheduling.AutomaticRestart
 	}
-	schedulingMap["on_host_maintenance"] = scheduling.OnHostMaintenance
-	schedulingMap["preemptible"] = scheduling.Preemptible
 	result = append(result, schedulingMap)
 	return result
 }

diff --git a/google/resource_compute_instance_template.go b/google/resource_compute_instance_template.go
@@ -667,12 +667,13 @@ func flattenNetworkInterfaces(networkInterfaces []*compute.NetworkInterface) ([]
 
 func flattenScheduling(scheduling *compute.Scheduling) []map[string]interface{} {
 	result := make([]map[string]interface{}, 0, 1)
-	schedulingMap := make(map[string]interface{})
+	schedulingMap := map[string]interface{}{
+		"on_host_maintenance": scheduling.OnHostMaintenance,
+		"preemptible":         scheduling.Preemptible,
+	}
 	if scheduling.AutomaticRestart != nil {
 		schedulingMap["automatic_restart"] = *scheduling.AutomaticRestart
 	}
-	schedulingMap["on_host_maintenance"] = scheduling.OnHostMaintenance
-	schedulingMap["preemptible"] = scheduling.Preemptible
 	result = append(result, schedulingMap)
 	return result
 }