Remove tgc_test_ignore_extra from all examples (#15434)

trodge · web-flow · commit 859eea0382a2 · 2025-10-21T23:12:02.000Z
diff --git a/mmv1/products/apphub/ServiceProjectAttachment.yaml b/mmv1/products/apphub/ServiceProjectAttachment.yaml
@@ -58,10 +58,6 @@ examples:
       org_id: 'ORG_ID'
       host_project: 'PROJECT_NAME'
     external_providers: ["random", "time"]
-    tgc_test_ignore_extra:
-      # This field is not converted from cai2hcl, as this field is not useful.
-      # The diff_suppress_func suppresses the diff for this field for all of cases, then this field is not in terraform plan
-      - 'service_project'
 parameters:
   - name: 'serviceProjectAttachmentId'
     type: String
@@ -86,6 +82,7 @@ properties:
     immutable: true
     diff_suppress_func: 'ServiceProjectDiffSuppress'
     custom_flatten: 'templates/terraform/custom_flatten/apphub_service_project.go.tmpl'
+    tgc_ignore_terraform_custom_flatten: true
     custom_expand: 'templates/terraform/custom_expand/apphub_service_project.go.tmpl'
   - name: 'createTime'
     type: String
diff --git a/mmv1/products/artifactregistry/Repository.yaml b/mmv1/products/artifactregistry/Repository.yaml
@@ -110,8 +110,6 @@ examples:
     vars:
       repository_id: 'my-repository'
       desc: 'example docker repository with cleanup policies'
-    tgc_test_ignore_extra:
-      - cleanup_policy_dry_run
   - name: 'artifact_registry_repository_remote_dockerhub_auth'
     primary_resource_id: 'my-repo'
     vars:
diff --git a/mmv1/products/cloudbuildv2/Connection.yaml b/mmv1/products/cloudbuildv2/Connection.yaml
@@ -59,8 +59,6 @@ examples:
     primary_resource_name: 'fmt.Sprintf("tf-test-connection%s", context["random_suffix"])'
     vars:
       connection_name: 'tf-test-connection'
-    tgc_test_ignore_extra:
-      - github_config.app_installation_id # It has 0 in Terraform configuration
   - name: 'cloudbuildv2_connection_ghe'
     exclude_test: true
   - name: 'cloudbuildv2_connection_github'
diff --git a/mmv1/products/cloudbuildv2/Repository.yaml b/mmv1/products/cloudbuildv2/Repository.yaml
@@ -49,24 +49,18 @@ examples:
       connection_name: 'connection'
       repository_name: 'repository'
     exclude_docs: true
-    tgc_test_ignore_extra:
-      - annotations # It has empty object in Terraform configuration
   - name: 'cloudbuildv2_repository_github'
     primary_resource_id: 'primary'
     vars:
       connection_name: 'connection'
       repository_name: 'repository'
     exclude_docs: true
-    tgc_test_ignore_extra:
-      - annotations # It has empty object in Terraform configuration
   - name: 'cloudbuildv2_repository_gle'
     primary_resource_id: 'primary'
     vars:
       connection_name: 'connection'
       repository_name: 'repository'
     exclude_docs: true
-    tgc_test_ignore_extra:
-      - annotations # It has empty object in Terraform configuration
   - name: 'cloudbuildv2_repository_ghe_doc'
     exclude_test: true
   - name: 'cloudbuildv2_repository_github_doc'
diff --git a/mmv1/products/clouddeploy/DeployPolicy.yaml b/mmv1/products/clouddeploy/DeployPolicy.yaml
@@ -48,26 +48,11 @@ examples:
     vars:
       policy: "cd-policy"
       delivery_pipeline: "cd-pipeline"
-    tgc_test_ignore_extra: # These values have 0 value in TF config
-      - rules.rollout_restriction.time_windows.weekly_windows.end_time.minutes
-      - rules.rollout_restriction.time_windows.weekly_windows.start_time.hours
-      - rules.rollout_restriction.time_windows.weekly_windows.start_time.minutes
   - name: "clouddeploy_deploy_policy_full"
     primary_resource_id: "f-deploy-policy"
     vars:
       policy: "cd-policy"
       delivery_pipeline: "cd-pipeline"
-    tgc_test_ignore_extra: # These values have 0 value in TF config
-      - rules.0.rollout_restriction.time_windows.one_time_windows.end_time.minutes
-      - rules.0.rollout_restriction.time_windows.one_time_windows.start_time.hours
-      - rules.0.rollout_restriction.time_windows.one_time_windows.start_time.minutes
-      - rules.0.rollout_restriction.time_windows.weekly_windows.end_time.minutes
-      - rules.0.rollout_restriction.time_windows.weekly_windows.end_time.nanos
-      - rules.0.rollout_restriction.time_windows.weekly_windows.end_time.seconds
-      - rules.0.rollout_restriction.time_windows.weekly_windows.start_time.minutes
-      - rules.1.rollout_restriction.time_windows.weekly_windows.end_time.minutes
-      - rules.1.rollout_restriction.time_windows.weekly_windows.start_time.hours
-      - rules.1.rollout_restriction.time_windows.weekly_windows.start_time.minutes
 parameters:
   - name: "location"
     type: String
diff --git a/mmv1/products/compute/BackendService.yaml b/mmv1/products/compute/BackendService.yaml
@@ -103,8 +103,6 @@ examples:
     vars:
       backend_service_name: 'backend-service'
       health_check_name: 'health-check'
-    tgc_test_ignore_extra:
-      - outlier_detection.enforcing_consecutive_gateway_failure # Ignore the 0 value in config
   - name: 'backend_service_stateful_session_affinity'
     primary_resource_id: 'default'
     min_version: 'beta'
diff --git a/mmv1/products/compute/UrlMap.yaml b/mmv1/products/compute/UrlMap.yaml
@@ -53,8 +53,6 @@ examples:
       url_map_name: 'urlmap'
       home_backend_service_name: 'home'
       health_check_name: 'health-check'
-    tgc_test_ignore_extra:
-      - 'path_matcher.route_rules.url_redirect.https_redirect'
   - name: 'url_map_traffic_director_route_partial'
     primary_resource_id: 'urlmap'
     vars:
diff --git a/mmv1/products/networksecurity/GatewaySecurityPolicyRule.yaml b/mmv1/products/networksecurity/GatewaySecurityPolicyRule.yaml
@@ -56,8 +56,6 @@ examples:
     vars:
       gateway_security_policy_id: 'my-gateway-security-policy'
       resource_name: 'my-gateway-security-policy-rule'
-    tgc_test_ignore_extra:
-      - 'tls_inspection_enabled' # Ignore its false value in Terraform configuration
 parameters:
   - name: 'name'
     type: String
diff --git a/mmv1/products/networksecurity/ServerTlsPolicy.yaml b/mmv1/products/networksecurity/ServerTlsPolicy.yaml
@@ -54,27 +54,19 @@ examples:
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-server-tls-policy'
-    tgc_test_ignore_extra:
-      - 'allow_open' # Ignore its false value in Terraform configuration
   - name: 'network_security_server_tls_policy_advanced'
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-server-tls-policy'
-    tgc_test_ignore_extra:
-      - 'allow_open' # Ignore its false value in Terraform configuration
   - name: 'network_security_server_tls_policy_server_cert'
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-server-tls-policy'
-    tgc_test_ignore_extra:
-      - 'allow_open' # Ignore its false value in Terraform configuration
   - name: 'network_security_server_tls_policy_mtls'
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-server-tls-policy'
       trust_config_name: 'my-trust-config'
-    tgc_test_ignore_extra:
-      - 'allow_open' # Ignore its false value in Terraform configuration
 parameters:
   - name: 'name'
     type: String
diff --git a/mmv1/products/pubsub/Subscription.yaml b/mmv1/products/pubsub/Subscription.yaml
@@ -57,8 +57,6 @@ examples:
     vars:
       topic_name: 'example-topic'
       subscription_name: 'example-subscription'
-    tgc_test_ignore_extra:
-      - enable_message_ordering  # ignore its false value in configuration
   - name: 'pubsub_subscription_pull_filter'
     primary_resource_id: 'example'
     vars:
diff --git a/mmv1/third_party/tgc_next/test/assert_test_files.go b/mmv1/third_party/tgc_next/test/assert_test_files.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"reflect"
 	"sort"
 	"strconv"
 	"strings"
@@ -344,27 +345,27 @@ func compareHCLFields(map1, map2, ignoredFields map[string]any) []string {
 			continue
 		}
 
-		if _, ok := map2[key]; !ok {
-			// If a field is an empty map in map1, it is possible that its children are in map2.
-			// In this case, the field is not missing in map2.
-			// map1 = {a: {}}, map2 = {a.b: {}}
-			if vMap, ok := val.(map[string]interface{}); ok {
-				childrenFound := false
-				if len(vMap) == 0 {
-					for key := range map2 {
-						if strings.HasPrefix(key, key) {
-							childrenFound = true
-							break
-						}
-					}
-				}
-				if !childrenFound {
-					missingKeys = append(missingKeys, key)
-				}
-			} else {
-				missingKeys = append(missingKeys, key)
+		if rVal := reflect.ValueOf(val); !rVal.IsValid() || rVal.IsZero() {
+			continue
+		}
+
+		if sVal, ok := val.(string); ok {
+			// TODO: convert to correct type when parsing HCL to fix the edge case where the field type is String and the only values are "false", "00", etc.
+			if bVal, err := strconv.ParseBool(sVal); err == nil && !bVal {
+				continue
+			}
+			if iVal, err := strconv.Atoi(sVal); err == nil && iVal == 0 {
+				continue
 			}
 		}
+
+		if vMap, ok := val.(map[string]any); ok && len(vMap) == 0 {
+			continue
+		}
+
+		if _, ok := map2[key]; !ok {
+			missingKeys = append(missingKeys, key)
+		}
 	}
 	sort.Strings(missingKeys)
 	return missingKeys
