teamcity/sweepers: replace flags to envvars to use teamcity-go-test command (#15783)

Author: BBBmau

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

@@ -77,9 +77,46 @@ fun BuildSteps.downloadTerraformBinary() {
 
 // RunSweepers runs sweepers, and relies on set build configuration parameters
 fun BuildSteps.runSweepers(sweeperStepName: String) {
-    step(ScriptBuildStep{
+    step(ScriptBuildStep {
+        name = "Compile Sweeper Test Binary"
+        workingDir = "%PACKAGE_PATH%"
+        scriptContent = """
+            #!/bin/bash
+            export TEST_FILE_COUNT=$(ls ./*_test.go | wc -l)
+            if test ${'$'}TEST_FILE_COUNT -gt "0"; then
+                echo "Compiling sweeper test binary"
+                go test -c -o test-binary
+            else
+                echo "Skipping compilation of test binary; no Go test files found"
+            fi
+        """.trimIndent()
+    })
+
+    step(ScriptBuildStep {
         name = sweeperStepName
-        scriptContent = "go test -v \"%PACKAGE_PATH%\" -run=\"%TEST_PREFIX%\" -sweep=\"%SWEEPER_REGIONS%\" -sweep-allow-failures -sweep-run=\"%SWEEP_RUN%\" -timeout 30m -json"
+        workingDir = "%PACKAGE_PATH%"
+        scriptContent = """
+            #!/bin/bash
+            if ! test -f "./test-binary"; then
+              echo "Skipping sweeper execution; file ./test-binary does not exist."
+              exit 0
+            fi
+            
+            # Set sweeper environment variables
+            export SWEEPER_REGIONS="%SWEEPER_REGIONS%"
+            export SWEEP_ALLOW_FAILURES="true"
+            export SWEEP_RUN="%SWEEP_RUN%"
+            
+            export TEST_COUNT=${'$'}(./test-binary -test.list="%TEST_PREFIX%" | wc -l)
+            echo "Found ${'$'}{TEST_COUNT} sweeper tests that match the given test prefix %TEST_PREFIX%"
+            if test ${'$'}TEST_COUNT -le "0"; then
+              echo "Skipping sweeper execution; no tests to run"
+              exit 0
+            fi
+            
+            echo "Starting sweeper tests"  
+            ./test-binary -test.list="%TEST_PREFIX%" | teamcity-go-test -test ./test-binary -parallelism "%PARALLELISM%" -timeout "%TIMEOUT%h"
+        """.trimIndent()
     })
 }
 

mmv1/third_party/terraform/sweeper/hashi_sweeper_fork.go

@@ -1,9 +1,9 @@
 package sweeper
 
 import (
-	"flag"
 	"fmt"
 	"log"
+	"os"
 	"strings"
 	"testing"
 
@@ -33,46 +33,21 @@ type SweeperListFunc func(ResourceAction) error
 type ResourceAction func(*transport_tpg.Config, *tpgresource.ResourceDataMock, map[string]interface{}) error
 
 var (
-	flagSweep              *string
-	flagSweepAllowFailures *bool
-	flagSweepRun           *string
-	sweeperInventory       map[string]*Sweeper
+	sweeperInventory map[string]*Sweeper
 )
 
 func init() {
 	sweeperInventory = make(map[string]*Sweeper)
 }
 
-// registerFlags checks for and gets existing flag definitions before trying to redefine them.
-func registerFlags() {
-	// Check for existing flags in global CommandLine
-	if f := flag.Lookup("sweep"); f != nil {
-		// Use the Value.Get() interface to get the values
-		if getter, ok := f.Value.(flag.Getter); ok {
-			vs := getter.Get().(string)
-			flagSweep = &vs
-		}
-		if f := flag.Lookup("sweep-allow-failures"); f != nil {
-			if getter, ok := f.Value.(flag.Getter); ok {
-				vb := getter.Get().(bool)
-				flagSweepAllowFailures = &vb
-			}
-		}
-		if f := flag.Lookup("sweep-run"); f != nil {
-			if getter, ok := f.Value.(flag.Getter); ok {
-				vs := getter.Get().(string)
-				flagSweepRun = &vs
-			}
-		}
-	} else {
-		// Define our flags if they don't exist
-		fsDefault := ""
-		fsafDefault := true
-		fsrDefault := ""
-		flagSweep = &fsDefault
-		flagSweepAllowFailures = &fsafDefault
-		flagSweepRun = &fsrDefault
-	}
+// getSweeperConfig reads sweeper configuration from environment variables.
+func getSweeperConfig() (string, bool, string) {
+	envSweepRegions := os.Getenv("SWEEPER_REGIONS")
+
+	envSweepAllowFailures := os.Getenv("SWEEP_ALLOW_FAILURES") == "true"
+
+	envSweepRun := os.Getenv("SWEEP_RUN")
+	return envSweepRegions, envSweepAllowFailures, envSweepRun
 }
 
 // AddTestSweepers function adds a sweeper configuration to the inventory
@@ -104,16 +79,16 @@ func GetSweeper(name string) (*Sweeper, bool) {
 
 // ExecuteSweepers runs registered sweepers for specified regions
 func ExecuteSweepers(t *testing.T) {
-	registerFlags()
-	flag.Parse()
-	if *flagSweep != "" {
-		// parse flagSweep contents for regions to run
-		regions := strings.Split(*flagSweep, ",")
+	sweepRegions, allowFailures, sweepRun := getSweeperConfig()
+
+	if sweepRegions != "" {
+		// parse sweepRegions contents for regions to run
+		regions := strings.Split(sweepRegions, ",")
 
-		// get filtered list of sweepers to run based on sweep-run flag
-		sweepers := filterSweepers(*flagSweepRun, sweeperInventory)
+		// get filtered list of sweepers to run based on sweep-run
+		sweepers := filterSweepers(sweepRun, sweeperInventory)
 
-		if err := runSweepers(t, regions, sweepers, *flagSweepAllowFailures); err != nil {
+		if err := runSweepers(t, regions, sweepers, allowFailures); err != nil {
 			t.Errorf("error running sweepers: %v", err)
 		}
 	} else {