tgc-revival: Modify the handwritten test file name (#15959)

Author: zli82016

mmv1/products/cloudtasks/Queue.yaml

@@ -186,6 +186,7 @@ properties:
           If zero, then the task age is unlimited.
         default_from_api: true
         diff_suppress_func: 'suppressOmittedMaxDuration'
+        custom_tgc_flatten: 'templates/tgc_next/custom_flatten/cloudtasks_queue_max_retry_duration.go.tmpl'
       - name: 'minBackoff'
         type: String
         description: |

mmv1/products/vpcaccess/Connector.yaml

@@ -65,6 +65,9 @@ examples:
       network_name: 'default'
     test_vars_overrides:
       'network_name': 'acctest.BootstrapSharedServiceNetworkingConnection(t, "vpc-access-connector")'
+tgc_tests:
+  - name: TestAccVPCAccessConnector_vpcAccessConnectorThroughput_usingThroughputOrInstancesLimits
+    skip: 'For instances vs throughput, prefer instances during cai2hcl conversion as throughput is discouraged.'
 parameters:
   - name: 'region'
     type: String

mmv1/provider/terraform_tgc_next.go

@@ -353,9 +353,8 @@ func (tgc TerraformGoogleConversionNext) addTestsFromHandwrittenTests(object *ap
 	if object.ProductMetadata == nil {
 		return nil
 	}
-	product := object.ProductMetadata
-	productName := google.Underscore(product.Name)
-	resourceFullName := fmt.Sprintf("%s_%s", productName, google.Underscore(object.Name))
+	productName := strings.ToLower(tgc.Product.Name)
+	resourceFullName := tgc.ResourceGoFilename(*object)
 	handwrittenTestFilePath := fmt.Sprintf("third_party/terraform/services/%s/resource_%s_test.go", productName, resourceFullName)
 	data, err := os.ReadFile(handwrittenTestFilePath)
 	for err != nil {
@@ -397,6 +396,42 @@ func (tgc TerraformGoogleConversionNext) addTestsFromHandwrittenTests(object *ap
 	return nil
 }
 
+// Similar to FullResourceName, but override-aware to prevent things like ending in _test.
+// Non-Go files should just use FullResourceName.
+func (tgc *TerraformGoogleConversionNext) ResourceGoFilename(object api.Resource) string {
+	// early exit if no override is set
+	if object.FilenameOverride == "" {
+		return tgc.FullResourceName(object)
+	}
+
+	resName := object.FilenameOverride
+
+	var productName string
+	if tgc.Product.LegacyName != "" {
+		productName = tgc.Product.LegacyName
+	} else {
+		productName = google.Underscore(tgc.Product.Name)
+	}
+
+	return fmt.Sprintf("%s_%s", productName, resName)
+}
+
+func (tgc *TerraformGoogleConversionNext) FullResourceName(object api.Resource) string {
+	// early exit- resource-level legacy names override the product too
+	if object.LegacyName != "" {
+		return strings.Replace(object.LegacyName, "google_", "", 1)
+	}
+
+	var productName string
+	if tgc.Product.LegacyName != "" {
+		productName = tgc.Product.LegacyName
+	} else {
+		productName = google.Underscore(tgc.Product.Name)
+	}
+
+	return fmt.Sprintf("%s_%s", productName, google.Underscore(object.Name))
+}
+
 // Generates the list of resources, and gets the count of resources.
 // The resource object has the format
 //

mmv1/templates/tgc_next/custom_flatten/cloudtasks_queue_max_retry_duration.go.tmpl

@@ -0,0 +1,6 @@
+func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil || v == "" {
+		return "0s"
+	}
+	return v
+}