medium priority gemini-code-assist fixes

Author: daniel-cit

helpers/foundation-deployer/gcp/gcp.go

@@ -221,7 +221,7 @@ func (g GCP) WaitBuildSuccess(t testing.TB, project, region, repo, commitSha, fa
 		// Trigger a new build
 		build, err = g.TriggerNewBuild(t, ctx, fmt.Sprintf("projects/%s/locations/%s/builds/%s", project, region, build))
 		if err != nil {
-			return fmt.Errorf("failed to trigger new build after %d retries: %w", maxErrorRetries, err)
+			return fmt.Errorf("failed to trigger new build (attempt %d/%d): %w", i+1, maxErrorRetries, err)
 		}
 		fmt.Printf("triggered new build with ID: %s (attempt %d/%d)\n", build, i+1, maxErrorRetries)
 		if i < maxErrorRetries-1 {

helpers/foundation-deployer/stages/apply.go

@@ -628,7 +628,7 @@ func applyEnv(t testing.TB, conf utils.GitRepo, project, region, repo, environme
 	return gcp.NewGCP().WaitBuildSuccess(t, project, region, repo, commitSha, fmt.Sprintf("Terraform %s apply %s build Failed.", repo, environment), MaxBuildRetries, MaxErrorRetries, TimeBetweenErrorRetries)
 }
 
-func applyLocal(t testing.TB, options *terraform.Options, serviceAccount, policyPath, ValidatorProjectID string) error {
+func applyLocal(t testing.TB, options *terraform.Options, serviceAccount, policyPath, validatorProjectID string) error {
 	var err error
 
 	if serviceAccount != "" {
@@ -648,8 +648,8 @@ func applyLocal(t testing.TB, options *terraform.Options, serviceAccount, policy
 	}
 
 	// Runs gcloud terraform vet
-	if ValidatorProjectID != "" {
-		err = TerraformVet(t, options.TerraformDir, policyPath, ValidatorProjectID)
+	if validatorProjectID != "" {
+		err = TerraformVet(t, options.TerraformDir, policyPath, validatorProjectID)
 		if err != nil {
 			return err
 		}

helpers/foundation-deployer/stages/data.go

@@ -45,6 +45,7 @@ const (
 	AppInfraStep            = "5-app-infra"
 	MaxErrorRetries         = 2
 	TimeBetweenErrorRetries = 2 * time.Minute
+	MaxBuildRetries         = 40
 )
 
 type CommonConf struct {

helpers/foundation-deployer/stages/destroy.go

@@ -27,10 +27,6 @@ import (
 	"github.com/terraform-google-modules/terraform-example-foundation/test/integration/testutils"
 )
 
-const (
-	MaxBuildRetries = 40
-)
-
 func DestroyBootstrapStage(t testing.TB, s steps.Steps, c CommonConf) error {
 
 	if err := forceBackendMigration(t, BootstrapRepo, "envs", "shared", c); err != nil {