tgc-revival: fix the compute subnetwork tests (#15751)

Author: zli82016

mmv1/products/compute/Subnetwork.yaml

@@ -111,7 +111,6 @@ examples:
     vars:
       subnetwork_name: 'internal-ipv6-test-subnetwork'
       network_name: 'internal-ipv6-test-network'
-    tgc_skip_test: 'internalIpv6Prefix is changed to C + O, but TGC uses latest provider version to run tests and does not have this change.'
   - name: 'subnetwork_purpose_private_nat'
     primary_resource_id: 'subnetwork-purpose-private-nat'
     min_version: 'beta'
@@ -150,7 +149,6 @@ examples:
     vars:
       subnetwork_name: 'subnet-ipv6-only'
       network_name: 'network-ipv6-only'
-    tgc_skip_test: 'internalIpv6Prefix is changed to C + O, but TGC uses latest provider version to run tests and does not have this change.'
   - name: 'subnetwork_with_subnet_mode_pdp'
     primary_resource_id: 'subnetwork-with-subnet-mode-pdp'
     exclude_docs: true
@@ -169,7 +167,6 @@ examples:
       ip_collection_url: '"projects/tf-static-byoip/regions/us-central1/publicDelegatedPrefixes/internal-ipv6-subnet-mode-test-sub-pdp"'
     test_vars_overrides:
       ip_collection_url: '"projects/tf-static-byoip/regions/us-central1/publicDelegatedPrefixes/internal-ipv6-subnet-mode-test-sub-pdp"'
-    tgc_skip_test: 'internalIpv6Prefix is changed to C + O, but TGC uses latest provider version to run tests and does not have this change.'
   - name: 'subnetwork_with_internal_subnet_mode_pdp_explicit_ip_prefix'
     primary_resource_id: 'subnetwork-with-internal-subnet-mode-pdp-explicit-ip-prefix'
     exclude_docs: true
@@ -181,7 +178,6 @@ examples:
     test_vars_overrides:
       internal_ipv6_prefix: 'fmt.Sprintf("2001:db8:1:%d::/64", acctest.RandIntRange(t, 0, 9999))'
       ip_collection_url: '"projects/tf-static-byoip/regions/us-central1/publicDelegatedPrefixes/internal-ipv6-subnet-mode-test-sub-pdp-explicit-prefix"'
-    tgc_skip_test: 'internalIpv6Prefix is changed to C + O, but TGC uses latest provider version to run tests and does not have this change.'
   - name: 'subnetwork_ipv6_only_external'
     primary_resource_id: 'subnetwork-ipv6-only'
     exclude_docs: true

mmv1/templates/tgc_next/test/test_file.go.tmpl

@@ -20,20 +20,34 @@ import (
 	"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/test"
 )
 
-{{ range $t := $.TGCTests }}
-func {{ $t.Name }}(t *testing.T) {
-	{{- if $t.Skip }}
-	t.Skip("{{$t.Skip}}")
-	{{- end }}
-	t.Parallel()
-
-	test.BidirectionalConversion(
-		t,
-		[]string{
-{{- range $field := $.TGCTestIgnorePropertiesToStrings }}
-	"{{ $field }}",
-{{- end }}
+func TestAcc{{$.ResourceName}}(t *testing.T) {
+	tests := []test.TestCase{
+{{- range $t := $.TGCTests }}
+		{
+			Name:  "{{ $t.Name }}",
+			Skip:  "{{ $t.Skip }}",
 		},
-	)
-}
 {{- end }}
+	}
+
+	for _, tt := range tests {
+		tt := tt
+
+		t.Run(tt.Name, func(t *testing.T) {
+			t.Parallel()
+
+			if tt.Skip != "" {
+				t.Skipf("Skipping %s test case: This case is currently disabled due to Issue.", tt.Name)
+			}
+
+			test.BidirectionalConversion(
+				t,
+				[]string{
+		{{- range $field := $.TGCTestIgnorePropertiesToStrings }}
+			"{{ $field }}",
+		{{- end }}
+				},
+			)
+		})
+	}
+}

mmv1/third_party/tgc_next/test/assert_test_files.go

@@ -36,7 +36,12 @@ var (
 
 func BidirectionalConversion(t *testing.T, ignoredFields []string) {
 	testName := t.Name()
-	stepNumbers, err := getStepNumbers(testName)
+	subTestName := GetSubTestName(testName)
+	if subTestName == "" {
+		t.Skipf("The subtest is unavailable")
+	}
+
+	stepNumbers, err := getStepNumbers(subTestName)
 	if err != nil {
 		t.Fatalf("error preparing the input data: %v", err)
 	}
@@ -45,21 +50,21 @@ func BidirectionalConversion(t *testing.T, ignoredFields []string) {
 		t.Skipf("test steps are unavailable")
 	}
 
+	// Create a temporary directory for running terraform.
+	tfDir, err := os.MkdirTemp(tmpDir, "terraform")
+	if err != nil {
+		t.Fatalf("error creating a temporary directory for running terraform: %v", err)
+	}
+	defer os.RemoveAll(tfDir)
+
 	logger := zaptest.NewLogger(t)
 
 	for _, stepN := range stepNumbers {
-		// Create a temporary directory for running terraform.
-		tfDir, err := os.MkdirTemp(tmpDir, fmt.Sprintf("terraform%d", stepN))
-		if err != nil {
-			t.Fatalf("error creating a temporary directory for running terraform: %v", err)
-		}
-		defer os.RemoveAll(tfDir)
-
-		subtestName := fmt.Sprintf("step%d", stepN)
-		t.Run(subtestName, func(t *testing.T) {
+		stepName := fmt.Sprintf("step%d", stepN)
+		t.Run(stepName, func(t *testing.T) {
 			retries := 0
 			flakyAction := func(ctx context.Context) error {
-				testData, err := prepareTestData(testName, stepN, retries)
+				testData, err := prepareTestData(subTestName, stepN, retries)
 				retries++
 				log.Printf("Starting the attempt %d", retries)
 				if err != nil {
@@ -74,7 +79,7 @@ func BidirectionalConversion(t *testing.T, ignoredFields []string) {
 				// Otherwise, test all of the resources in the test.
 				primaryResource := testData.PrimaryResource
 				resourceTestData := testData.ResourceTestData
-				tName := fmt.Sprintf("%s_%s", testName, subtestName)
+				tName := fmt.Sprintf("%s_%s", subTestName, stepName)
 				if primaryResource != "" {
 					t.Logf("Test for the primary resource %s begins.", primaryResource)
 					err = testSingleResource(t, tName, resourceTestData[primaryResource], tfDir, ignoredFields, logger, true)

mmv1/third_party/tgc_next/test/utils.go

@@ -123,3 +123,22 @@ func DeepCopyMap(source interface{}, destination interface{}) error {
 
 	return nil
 }
+
+type TestCase struct {
+	Name string
+	Skip string
+}
+
+func GetSubTestName(fullTestName string) string {
+	parts := strings.Split(fullTestName, "/")
+
+	// Get the index of the last element
+	lastIndex := len(parts) - 1
+
+	// Check for an empty or malformed string
+	if lastIndex < 0 {
+		return ""
+	}
+
+	return parts[lastIndex]
+}