vcr fixes

Author: inadenenko

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

@@ -224,6 +224,13 @@ func resourceComputeInstanceFromMachineImageCreate(d *schema.ResourceData, meta
 			return fmt.Errorf("Error expanding scheduling: %s", err)
 		}
 		if schedulingBody != nil {
+			// Strip nil Duration fields so the source machine image values are inherited
+			// instead of being overridden with null.
+			for _, k := range []string{"localSsdRecoveryTimeout", "maxRunDuration", "gracefulShutdown", "preemptionNoticeDuration"} {
+				if v, ok := schedulingBody[k]; ok && v == nil {
+					delete(schedulingBody, k)
+				}
+			}
 			instanceBody["scheduling"] = schedulingBody
 		}
 	} else if srcProps, ok := miRes["sourceInstanceProperties"].(map[string]interface{}); ok {
@@ -258,6 +265,16 @@ func resourceComputeInstanceFromMachineImageCreate(d *schema.ResourceData, meta
 		instanceBody["advancedMachineFeatures"] = amf
 	}
 
+	if partnerMetadataRaw, err := resourceInstancePartnerMetadata(d); err != nil {
+		return fmt.Errorf("Error expanding partner_metadata: %s", err)
+	} else if partnerMetadataBody, err := convertPartnerMetadataToCompute(partnerMetadataRaw); err != nil {
+		return fmt.Errorf("Error converting partner_metadata: %s", err)
+	} else if len(partnerMetadataBody) > 0 {
+		instanceBody["partnerMetadata"] = partnerMetadataBody
+	} else {
+		delete(instanceBody, "partnerMetadata")
+	}
+
 	log.Printf("[INFO] Requesting instance creation")
 	insertURL := fmt.Sprintf("%sprojects/%s/zones/%s/instances", transport_tpg.BaseUrl(Product, config), project, z)
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{

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

@@ -1556,6 +1556,12 @@ func resourceComputeRegionInstanceTemplateRead(d *schema.ResourceData, meta inte
 	}
 	delete(res, "id")
 
+	var schedulingMapFromResponse map[string]interface{}
+	if propsMap, ok := res["properties"].(map[string]interface{}); ok {
+		schedulingMapFromResponse, _ = propsMap["scheduling"].(map[string]interface{})
+		delete(propsMap, "scheduling")
+	}
+
 	resBytes, err := json.Marshal(res)
 	if err != nil {
 		return fmt.Errorf("Error marshaling instance template response: %s", err)
@@ -1697,12 +1703,8 @@ func resourceComputeRegionInstanceTemplateRead(d *schema.ResourceData, meta inte
 			}
 		}
 	}
-	if instanceTemplate.Properties.Scheduling != nil {
-		schedulingMap, err := tpgresource.ConvertToMap(instanceTemplate.Properties.Scheduling)
-		if err != nil {
-			return fmt.Errorf("Error converting scheduling: %s", err)
-		}
-		scheduling := flattenScheduling(schedulingMap)
+	if schedulingMapFromResponse != nil {
+		scheduling := flattenScheduling(schedulingMapFromResponse)
 {{ if ne $.TargetVersionName `ga` }}
 		// Workaroud: API doesn't update the scheduling.graceful_shutdown.max_duration.nanos field.
 		// To avoid diff, we need to set the value from the state not from API response.