Add env var SKIP_FOLDER_SWEEPER

Author: zli82016

mmv1/third_party/terraform/.teamcity/components/builds/build_parameters.kt

@@ -225,27 +225,33 @@ fun ParametrizedWithType.sweeperParameters(sweeperRegions: String, sweepRun: Str
     text("SWEEP_RUN", sweepRun)
 }
 
-// ParametrizedWithType.terraformSkipProjectSweeper sets an environment variable to skip the sweeper for project resources
-fun ParametrizedWithType.terraformSkipProjectSweeper() {
-    text("env.SKIP_PROJECT_SWEEPER", "1")
+// ParametrizedWithType.terraformSkipSweeper sets an environment variable used to skip the sweeper for resources
+fun ParametrizedWithType.terraformSkipSweeper(resourceType: String) {
+    // Converts "PROJECT" into "env.SKIP_PROJECT_SWEEPER"
+    // Converts "FOLDER" into "env.SKIP_FOLDER_SWEEPER"
+    text("env.SKIP_${resourceType.uppercase()}_SWEEPER", "1")
 }
 
 // BuildType.disableProjectSweep disabled sweeping project resources after a build configuration has been initialised
 fun BuildType.disableProjectSweep(){
     params {
-        terraformSkipProjectSweeper()
+        terraformSkipSweeper("PROJECT")
+        terraformSkipSweeper("FOLDER")
     }
 }
 
-// ParametrizedWithType.terraformEnableProjectSweeper unsets an environment variable used to skip the sweeper for project resources
-fun ParametrizedWithType.terraformEnableProjectSweeper() {
-    text("env.SKIP_PROJECT_SWEEPER", "")
+// ParametrizedWithType.terraformEnableSweeper unsets an environment variable used to skip the sweeper for resources
+fun ParametrizedWithType.terraformEnableSweeper(resourceType: String) {
+    // Converts "PROJECT" into "env.SKIP_PROJECT_SWEEPER"
+    // Converts "FOLDER" into "env.SKIP_FOLDER_SWEEPER"
+    text("env.SKIP_${resourceType.uppercase()}_SWEEPER", "")
 }
 
 // BuildType.enableProjectSweep enables sweeping project resources after a build configuration has been initialised
 fun BuildType.enableProjectSweep(){
     params {
-        terraformEnableProjectSweeper()
+        terraformEnableSweeper("PROJECT")
+        terraformEnableSweeper("FOLDER")
     }
 }
 

mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_sweeper.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"os"
 	"strings"
 	"time"
 
@@ -16,6 +17,15 @@ import (
 )
 
 func init() {
+	// SKIP_FOLDER_SWEEPER can be set for a sweeper run to prevent it from
+	// sweeping folders. This can be useful when running sweepers in
+	// organizations where acceptance tests intiated by another folder may
+	// already be in-progress.
+	// Example: SKIP_FOLDER_SWEEPER=1 go test ./google -v -sweep=us-central1 -sweep-run=
+	if os.Getenv("SKIP_FOLDER_SWEEPER") != "" {
+		return
+	}
+
 	sweeper.AddTestSweepersLegacy("GoogleFolder", testSweepFolder)
 }