fetch other branch changes

Author: inadenenko

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

@@ -783,6 +783,22 @@ func getInterfaceSlice(v interface{}) []interface{} {
 	return s
 }
 
+func getInt(v interface{}) int64 {
+	switch t := v.(type) {
+	case int:
+		return int64(t)
+	case int64:
+		return t
+	case float64:
+		return int64(t)
+	case string:
+		i, _ := strconv.ParseInt(t, 10, 64)
+		return i
+	default:
+		return 0
+	}
+}
+
 {{ if ne $.TargetVersionName `ga` -}}
 // firstAccessConfigSecurityPolicy returns the securityPolicy of the first
 // access config in the list, or "" if absent.
@@ -1103,7 +1119,6 @@ func flattenAdvancedMachineFeatures(v map[string]interface{}) []map[string]inter
 	return []map[string]interface{}{result}
 }
 
-
 func flattenShieldedVmConfig(shieldedVmConfig map[string]interface{}) []map[string]bool {
 	if shieldedVmConfig == nil {
 		return nil

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

@@ -2564,6 +2564,18 @@ func guestAcceleratorsToInterface(accelerators []*compute.AcceleratorConfig) []i
 	return result
 }
 
+func expandAdvancedMachineFeaturesTyped(d tpgresource.TerraformResourceData) *compute.AdvancedMachineFeatures {
+	amfMap := expandAdvancedMachineFeatures(d)
+	if amfMap == nil {
+		return nil
+	}
+	typed := &compute.AdvancedMachineFeatures{}
+	if err := tpgresource.Convert(amfMap, typed); err != nil {
+		return nil
+	}
+	return typed
+}
+
 func resourceComputeInstanceTemplateImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{"projects/(?P<project>[^/]+)/global/instanceTemplates/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {