tests fix

Author: inadenenko

mmv1/third_party/terraform/services/compute/resource_compute_instance_from_template.go.tmpl

@@ -192,6 +192,20 @@ func resourceComputeInstanceFromTemplateCreate(d *schema.ResourceData, meta inte
 		if err != nil {
 			return fmt.Errorf("Error expanding scheduling: %s", err)
 		}
+		for _, key := range []string{"localSsdRecoveryTimeout", "maxRunDuration", "preemptionNoticeDuration"} {
+			if dur, ok := schedulingMap[key].(map[string]interface{}); ok {
+				if sec, ok := dur["seconds"]; ok {
+					dur["seconds"] = fmt.Sprintf("%d", getInt(sec))
+				}
+			}
+		}
+		if gs, ok := schedulingMap["gracefulShutdown"].(map[string]interface{}); ok {
+			if md, ok := gs["maxDuration"].(map[string]interface{}); ok {
+				if sec, ok := md["seconds"]; ok {
+					md["seconds"] = fmt.Sprintf("%d", getInt(sec))
+				}
+			}
+		}
 		schedulingBytes, err := json.Marshal(schedulingMap)
 		if err != nil {
 			return fmt.Errorf("Error marshaling scheduling: %s", err)
@@ -203,6 +217,20 @@ func resourceComputeInstanceFromTemplateCreate(d *schema.ResourceData, meta inte
 		instance.Scheduling = schedulingTyped
 	}
 
+	{{- if ne $.TargetVersionName "ga" }}
+	if pm := d.Get("partner_metadata").(map[string]interface{}); len(pm) > 0 {
+		pmRaw, err := resourceInstancePartnerMetadata(d)
+		if err != nil {
+			return fmt.Errorf("Error expanding partner_metadata: %s", err)
+		}
+		partnerMetadataTyped, err := convertPartnerMetadataToComputeTyped(pmRaw)
+		if err != nil {
+			return fmt.Errorf("Error converting partner_metadata: %s", err)
+		}
+		instance.PartnerMetadata = partnerMetadataTyped
+	}
+	{{- end }}
+
 	// Force send all top-level fields that have been set in case they're overridden to zero values.
 	// Initialize ForceSendFields to empty so we don't get things that the instance resource
 	// always force-sends.

mmv1/third_party/terraform/services/compute/resource_compute_instance_template.go.tmpl

@@ -2443,6 +2443,21 @@ func expandResourceComputeInstanceTemplateScheduling(d *schema.ResourceData, met
 		expanded["onHostMaintenance"] = "TERMINATE"
 	}
 
+	for _, key := range []string{"localSsdRecoveryTimeout", "maxRunDuration", "preemptionNoticeDuration"} {
+		if dur, ok := expanded[key].(map[string]interface{}); ok {
+			if sec, ok := dur["seconds"]; ok {
+				dur["seconds"] = strconv.FormatInt(getInt(sec), 10)
+			}
+		}
+	}
+	if gs, ok := expanded["gracefulShutdown"].(map[string]interface{}); ok {
+		if md, ok := gs["maxDuration"].(map[string]interface{}); ok {
+			if sec, ok := md["seconds"]; ok {
+				md["seconds"] = strconv.FormatInt(getInt(sec), 10)
+			}
+		}
+	}
+
 	schedulingTyped := &compute.Scheduling{}
 	if err := tpgresource.Convert(expanded, schedulingTyped); err != nil {
 		return nil, fmt.Errorf("Error converting scheduling: %s", err)