Skip np cache in VCR and revert VCR CI change (#15494)

Author: shuyama1

.ci/magician/cmd/test_terraform_vcr.go

@@ -450,65 +450,16 @@ func modifiedPackages(changedFiles []string, version provider.Version) (map[stri
 	return services, runFullVCR
 }
 
-func allSubFolders(root string) (map[string]struct{}, error) {
-	subfolders := make(map[string]struct{})
-	entries, err := os.ReadDir(root)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read directory '%s': %w", root, err)
-	}
-
-	for _, entry := range entries {
-		if entry.IsDir() {
-			subfolders[entry.Name()] = struct{}{}
-		}
-	}
-	return subfolders, nil
-}
-
 func runReplaying(runFullVCR bool, version provider.Version, services map[string]struct{}, vt *vcr.Tester) (vcr.Result, []string, error) {
 	result := vcr.Result{}
 	var testDirs []string
 	var replayingErr error
 	if runFullVCR {
 		fmt.Println("runReplaying: full VCR tests")
-		// result, replayingErr = vt.Run(vcr.RunOptions{
-		// 	Mode:    vcr.Replaying,
-		// 	Version: version,
-		// })
-
-		// temporary workaround
-		serviceRoot := filepath.Join(vt.GetRepoPath(version), version.ProviderName(), "services")
-		allServies, err := allSubFolders(serviceRoot)
-		if err != nil {
-			return result, testDirs, err
-		}
-
-		var gkePath string
-		var otherPaths []string
-		for service := range allServies {
-			servicePath := "./" + filepath.Join(version.ProviderName(), "services", service)
-			if service == "container" {
-				gkePath = servicePath
-				continue
-			}
-			otherPaths = append(otherPaths, servicePath)
-		}
 		result, replayingErr = vt.Run(vcr.RunOptions{
-			Mode:     vcr.Replaying,
-			Version:  version,
-			TestDirs: otherPaths,
-		})
-		// run gke replaying tests separately
-		gkeResult, gkeReplayingErr := vt.Run(vcr.RunOptions{
-			Mode:     vcr.Replaying,
-			Version:  version,
-			TestDirs: []string{gkePath},
+			Mode:    vcr.Replaying,
+			Version: version,
 		})
-		replayingErr = errors.Join(replayingErr, gkeReplayingErr)
-		result.PassedTests = append(result.PassedTests, gkeResult.PassedTests...)
-		result.SkippedTests = append(result.SkippedTests, gkeResult.SkippedTests...)
-		result.FailedTests = append(result.FailedTests, gkeResult.FailedTests...)
-		result.Panics = append(result.Panics, gkeResult.Panics...)
 	} else if len(services) > 0 {
 		fmt.Printf("runReplaying: %d specific services: %v\n", len(services), services)
 		for service := range services {

.ci/magician/vcr/tester.go

@@ -140,10 +140,6 @@ func (vt *Tester) SetRepoPath(version provider.Version, repoPath string) {
 	vt.repoPaths[version] = repoPath
 }
 
-func (vt *Tester) GetRepoPath(version provider.Version) string {
-	return vt.repoPaths[version]
-}
-
 // Fetch the cassettes for the current version if not already fetched.
 // Should be run from the base dir.
 func (vt *Tester) FetchCassettes(version provider.Version, baseBranch, head string) error {

mmv1/third_party/terraform/services/container/resource_container_node_pool.go.tmpl

@@ -2,7 +2,8 @@ package container
 
 import (
 {{- if ne $.TargetVersionName `ga` }}
-    "context"
+	"context"
+	"os"
 {{- end }}
 	"fmt"
 	"log"
@@ -159,14 +160,24 @@ func (instanceGroupManagerCache *instanceGroupManagerCache) needsRefresh(fullyQu
 	return time.Since(igm.updateTime) > instanceGroupManagerCache.ttl
 }
 
+// We need to set ttl to 0 to disable caching in VCR testing.
+// This ensure all NP/MIG LIST requests are made consistently,
+// preventing non-deterministic behavior that would break VCR.
+func getCacheTTL() time.Duration {
+	if os.Getenv("VCR_PATH") != "" && os.Getenv("VCR_MODE") != "" {
+		return 0 * time.Second
+	}
+	return 30 * time.Second
+}
+
 var (
 	npCache = &nodePoolCache{
 		nodePools: make(map[string]*nodePoolWithUpdateTime),
-		ttl:       30 * time.Second,
+		ttl:       getCacheTTL(),
 	}
 	igmCache = &instanceGroupManagerCache{
 		instanceGroupManagers: make(map[string]*instanceGroupManagerWithUpdateTime),
-		ttl:                   30 * time.Second,
+		ttl:                   getCacheTTL(),
 	}
 )
 {{- end }}