Attempt fix on the test (#15714)

hao-nan-li · web-flow · commit f5690e590e4c · 2025-11-14T20:40:43.000Z
diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_node_types_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_node_types_test.go
@@ -62,7 +62,10 @@ func testAccCheckGoogleComputeNodeTypes(n string) resource.TestCheckFunc {
 			}
 
 			if !regexp.MustCompile(`-[0-9]+-[0-9]+$`).MatchString(v) {
-				return fmt.Errorf("unexpected type format for %q, value is %v", idx, v)
+				// Added this condition to cover https://github.com/hashicorp/terraform-provider-google/issues/24697
+				if !regexp.MustCompile(`-[0-9]+-[0-9]+-[a-z]+$`).MatchString(v) {
+					return fmt.Errorf("unexpected type format for %q, value is %v", idx, v)
+				}
 			}
 		}
 		return nil

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,10 @@ func testAccCheckGoogleComputeNodeTypes(n string) resource.TestCheckFunc {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	if !regexp.MustCompile(`-[0-9]+-[0-9]+$`).MatchString(v) {
`65`		`- return fmt.Errorf("unexpected type format for %q, value is %v", idx, v)`
	`65`	`+ // Added this condition to cover https://github.com/hashicorp/terraform-provider-google/issues/24697`
	`66`	+ if !regexp.MustCompile(`-[0-9]+-[0-9]+-[a-z]+$`).MatchString(v) {
	`67`	`+ return fmt.Errorf("unexpected type format for %q, value is %v", idx, v)`
	`68`	`+ }`
`66`	`69`	`}`
`67`	`70`	`}`
`68`	`71`	`return nil`