Use GA provider to generate TGC (#15345)

Author: zli82016

GNUmakefile

@@ -124,8 +124,8 @@ clean-tgc:
 tgc:
 	cd mmv1;\
 		go run . --version beta --provider tgc --output $(OUTPUT_PATH)/tfplan2cai $(mmv1_compile)\
-		&& go run . --version beta --provider tgc_cai2hcl --output $(OUTPUT_PATH)/cai2hcl $(mmv1_compile)\
-		&& go run . --version beta --provider tgc_next --output $(OUTPUT_PATH) $(mmv1_compile);\
+		&& go run . --version ga --provider tgc_cai2hcl --output $(OUTPUT_PATH)/cai2hcl $(mmv1_compile)\
+		&& go run . --version ga --provider tgc_next --output $(OUTPUT_PATH) $(mmv1_compile);\
 
 tf-oics:
 	cd mmv1;\

docs/content/convert/add-new-resource-tgc.md

@@ -62,7 +62,7 @@ const ProductResourceAssetType string = "whatever.googleapis.com/asset-type"
 // ProductResourceSchemaName is the TF resource schema name for the Resource resource within Product.
 const ProductResourceSchemaName string = "google_product_resource"
 
-// Copy the resource schema from [google-beta](https://github.com/hashicorp/terraform-provider-google-beta) Terraform provider
+// Copy the resource schema from [google](https://github.com/hashicorp/terraform-provider-google) Terraform provider
 func ResourceGoogleProject() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,

mmv1/products/networksecurity/AuthorizationPolicy.yaml

@@ -45,7 +45,6 @@ async:
 sweeper:
   url_substitutions:
     - region: "global"
-include_in_tgc_next_DO_NOT_USE: true
 examples:
   - name: 'network_security_authorization_policy_basic'
     primary_resource_id: 'default'

mmv1/third_party/tgc_next/pkg/services/compute/compute_instance.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
-	compute "google.golang.org/api/compute/v0.beta"
+	"google.golang.org/api/compute/v1"
 )
 
 // ComputeInstanceAssetType is the CAI asset type name for compute instance.
@@ -71,8 +71,6 @@ var (
 		"scheduling.0.max_run_duration",
 		"scheduling.0.on_instance_stop_action",
 		"scheduling.0.maintenance_interval",
-		"scheduling.0.host_error_timeout_seconds",
-		"scheduling.0.graceful_shutdown",
 		"scheduling.0.local_ssd_recovery_timeout",
 	}
 
@@ -463,15 +461,6 @@ func ResourceComputeInstance() *schema.Resource {
 							Description:      `The name or self_link of the subnetwork attached to this interface.`,
 						},
 
-						"network_attachment": {
-							Type:             schema.TypeString,
-							Optional:         true,
-							Computed:         true,
-							ForceNew:         true,
-							DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName,
-							Description:      `The URL of the network attachment that this interface should connect to in the following format: projects/{projectNumber}/regions/{region_name}/networkAttachments/{network_attachment_name}.`,
-						},
-
 						"subnetwork_project": {
 							Type:        schema.TypeString,
 							Optional:    true,
@@ -829,15 +818,6 @@ func ResourceComputeInstance() *schema.Resource {
 				Description: `Metadata key/value pairs made available within the instance.`,
 			},
 
-			"partner_metadata": {
-				Type:                  schema.TypeMap,
-				Optional:              true,
-				DiffSuppressFunc:      ComparePartnerMetadataDiff,
-				DiffSuppressOnRefresh: true,
-				Elem:                  &schema.Schema{Type: schema.TypeString},
-				Description:           `Partner Metadata Map made available within the instance.`,
-			},
-
 			"metadata_startup_script": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -986,11 +966,6 @@ be from 0 to 999,999,999 inclusive.`,
 								},
 							},
 						},
-						"host_error_timeout_seconds": {
-							Type:        schema.TypeInt,
-							Optional:    true,
-							Description: `Specify the time in seconds for host error detection, the value must be within the range of [90, 330] with the increment of 30, if unset, the default behavior of host error recovery will be used.`,
-						},
 
 						"maintenance_interval": {
 							Type:         schema.TypeString,
@@ -1441,8 +1416,6 @@ func flattenAliasIpRangeTgc(ranges []*compute.AliasIpRange) []map[string]interfa
 func flattenSchedulingTgc(resp *compute.Scheduling) []map[string]interface{} {
 	schedulingMap := make(map[string]interface{}, 0)
 
-	// gracefulShutdown is not in the cai asset, so graceful_shutdown is skipped.
-
 	if resp.InstanceTerminationAction != "" {
 		schedulingMap["instance_termination_action"] = resp.InstanceTerminationAction
 	}
@@ -1487,14 +1460,6 @@ func flattenSchedulingTgc(resp *compute.Scheduling) []map[string]interface{} {
 		schedulingMap["on_instance_stop_action"] = flattenOnInstanceStopAction(resp.OnInstanceStopAction)
 	}
 
-	if resp.HostErrorTimeoutSeconds != 0 {
-		schedulingMap["host_error_timeout_seconds"] = resp.HostErrorTimeoutSeconds
-	}
-
-	if resp.MaintenanceInterval != "" {
-		schedulingMap["maintenance_interval"] = resp.MaintenanceInterval
-	}
-
 	if resp.LocalSsdRecoveryTimeout != nil {
 		schedulingMap["local_ssd_recovery_timeout"] = flattenComputeLocalSsdRecoveryTimeout(resp.LocalSsdRecoveryTimeout)
 	}
@@ -1546,14 +1511,6 @@ func flattenNetworkInterfacesTgc(networkInterfaces []*compute.NetworkInterface,
 			internalIP = iface.NetworkIP
 		}
 
-		if iface.NetworkAttachment != "" {
-			networkAttachment, err := tpgresource.GetRelativePath(iface.NetworkAttachment)
-			if err != nil {
-				return nil, "", "", err
-			}
-			flattened[i]["network_attachment"] = networkAttachment
-		}
-
 		// the security_policy for a network_interface is found in one of its accessConfigs.
 		if len(iface.AccessConfigs) > 0 && iface.AccessConfigs[0].SecurityPolicy != "" {
 			flattened[i]["security_policy"] = iface.AccessConfigs[0].SecurityPolicy

mmv1/third_party/tgc_next/pkg/services/compute/compute_instance_cai2hcl.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/pkg/tpgresource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	compute "google.golang.org/api/compute/v0.beta"
+	"google.golang.org/api/compute/v1"
 )
 
 // ComputeInstanceCai2hclConverter for compute instance resource.
@@ -101,12 +101,6 @@ func (c *ComputeInstanceCai2hclConverter) convertResourceData(asset caiasset.Ass
 	hclData["key_revocation_action_type"] = strings.TrimSuffix(instance.KeyRevocationActionType, "_ON_KEY_REVOCATION")
 	hclData["instance_encryption_key"] = flattenComputeInstanceEncryptionKey(instance.InstanceEncryptionKey)
 
-	partnerMetadata, err := flattenPartnerMetadata(instance.PartnerMetadata)
-	if err != nil {
-		return nil, fmt.Errorf("Error parsing partner metadata: %s", err)
-	}
-	hclData["partner_metadata"] = partnerMetadata
-
 	// TODO: convert details from the boot disk assets (separate disk assets) into initialize_params in cai2hcl?
 	// It needs to integrate the disk assets into instance assets with the resolver.
 

mmv1/third_party/tgc_next/pkg/services/compute/compute_instance_tfplan2cai.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	compute "google.golang.org/api/compute/v0.beta"
+	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -132,11 +132,6 @@ func expandComputeInstance(project string, d tpgresource.TerraformResourceData,
 		return nil, fmt.Errorf("Error creating metadata: %s", err)
 	}
 
-	partnerMetadata, err := resourceInstancePartnerMetadata(d)
-	if err != nil {
-		return nil, fmt.Errorf("Error creating partner metadata: %s", err)
-	}
-
 	networkInterfaces, err := expandNetworkInterfacesTgc(d, config)
 	if err != nil {
 		return nil, fmt.Errorf("Error creating network interfaces: %s", err)
@@ -164,7 +159,6 @@ func expandComputeInstance(project string, d tpgresource.TerraformResourceData,
 		Disks:                      disks,
 		MachineType:                machineTypeUrl,
 		Metadata:                   metadata,
-		PartnerMetadata:            partnerMetadata,
 		Name:                       d.Get("name").(string),
 		Zone:                       d.Get("zone").(string),
 		NetworkInterfaces:          networkInterfaces,
@@ -504,21 +498,12 @@ func expandNetworkInterfacesTgc(d tpgresource.TerraformResourceData, config *tra
 	for i, raw := range configs {
 		data := raw.(map[string]interface{})
 
-		var networkAttachment = ""
 		network := data["network"].(string)
 		subnetwork := data["subnetwork"].(string)
-		if networkAttachmentObj, ok := data["network_attachment"]; ok {
-			networkAttachment = networkAttachmentObj.(string)
-		}
-		// Checks if networkAttachment is not specified in resource, network or subnetwork have to be specified.
-		if networkAttachment == "" && network == "" && subnetwork == "" {
-			return nil, fmt.Errorf("exactly one of network, subnetwork, or network_attachment must be provided")
-		}
 
 		ifaces[i] = &compute.NetworkInterface{
 			NetworkIP:                data["network_ip"].(string),
 			Network:                  network,
-			NetworkAttachment:        networkAttachment,
 			Subnetwork:               subnetwork,
 			AccessConfigs:            expandAccessConfigs(data["access_config"].([]interface{})),
 			AliasIpRanges:            expandAliasIpRanges(data["alias_ip_range"].([]interface{})),
@@ -621,24 +606,7 @@ func expandSchedulingTgc(v interface{}) (*compute.Scheduling, error) {
 		scheduling.OnInstanceStopAction = transformedOnInstanceStopAction
 		scheduling.ForceSendFields = append(scheduling.ForceSendFields, "OnInstanceStopAction")
 	}
-	if v, ok := original["host_error_timeout_seconds"]; ok {
-		if v != nil && v != 0 {
-			scheduling.HostErrorTimeoutSeconds = int64(v.(int))
-		}
-	}
 
-	if v, ok := original["maintenance_interval"]; ok {
-		scheduling.MaintenanceInterval = v.(string)
-	}
-
-	if v, ok := original["graceful_shutdown"]; ok {
-		transformedGracefulShutdown, err := expandGracefulShutdown(v)
-		if err != nil {
-			return nil, err
-		}
-		scheduling.GracefulShutdown = transformedGracefulShutdown
-		scheduling.ForceSendFields = append(scheduling.ForceSendFields, "GracefulShutdown")
-	}
 	if v, ok := original["local_ssd_recovery_timeout"]; ok {
 		transformedLocalSsdRecoveryTimeout, err := expandComputeLocalSsdRecoveryTimeout(v)
 		if err != nil {