feat: (Blueprint) Allow customization of setup sa key

infra/blueprint-test/pkg/discovery/discover.go

@@ -105,7 +105,7 @@ func GetKnownDirInParents(dir string, max int) (string, error) {
 	if !os.IsNotExist(err) {
 		return dirInParent, err
 	}
-	return GetKnownDirInParents(path.Join("..", dir), max-1)
+	return GetKnownDirInParents(dirInParent, max-1)
 }
 
 // findDirs returns a map of directories in path

infra/blueprint-test/pkg/gcloud/gcloud.go

@@ -18,7 +18,6 @@
 package gcloud
 
 import (
-	"os"
 	"strings"
 
 	"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/utils"
@@ -116,18 +115,9 @@ func ActivateCredsAndEnvVars(t testing.TB, creds string) {
 	RunCmd(t, "auth activate-service-account", WithCommonArgs([]string{"--key-file", credsPath}))
 	// set auth related env vars
 	// TF provider auth
-	err = os.Setenv("GOOGLE_CREDENTIALS", creds)
-	if err != nil {
-		t.Fatal(err)
-	}
+	utils.SetEnv(t, "GOOGLE_CREDENTIALS", creds)
 	// gcloud SDK override
-	err = os.Setenv("CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE", credsPath)
-	if err != nil {
-		t.Fatal(err)
-	}
+	utils.SetEnv(t, "CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE", credsPath)
 	// ADC
-	err = os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", credsPath)
-	if err != nil {
-		t.Fatal(err)
-	}
+	utils.SetEnv(t, "GOOGLE_APPLICATION_CREDENTIALS", credsPath)
 }

infra/blueprint-test/pkg/tft/terraform.go

@@ -40,6 +40,7 @@ const setupKeyOutputName = "sa_key"
 type TFBlueprintTest struct {
 	discovery.BlueprintTestConfig                          // additional blueprint test configs
 	name                          string                   // descriptive name for the test
+	saKey                         string                   // optional setup sa key
 	tfDir                         string                   // directory containing Terraform configs
 	tfEnvVars                     map[string]string        // variables to pass to Terraform as environment variables prefixed with TF_VAR_
 	setupDir                      string                   // optional directory containing applied TF configs to import outputs as variables for the test
@@ -60,6 +61,12 @@ func WithName(name string) tftOption {
 	}
 }
 
+func WithSetupSaKey(saKey string) tftOption {
+	return func(f *TFBlueprintTest) {
+		f.saKey = saKey
+	}
+}
+
 func WithFixtureName(fixtureName string) tftOption {
 	return func(f *TFBlueprintTest) {
 		// when a test is invoked for an explicit blueprint fixture
@@ -153,20 +160,22 @@ func NewTFBlueprintTest(t testing.TB, opts ...tftOption) *TFBlueprintTest {
 			tft.setupDir = setupDir
 		}
 	}
-	//load TFEnvVars from setup outputs
+	// load setup sa Key
+	if tft.saKey != "" {
+		gcloud.ActivateCredsAndEnvVars(tft.t, tft.saKey)
+	}
+	// load TFEnvVars from setup outputs
 	if tft.setupDir != "" {
 		tft.logger.Logf(tft.t, "Loading env vars from setup %s", tft.setupDir)
 		loadTFEnvVar(tft.tfEnvVars, tft.getTFOutputsAsInputs(terraform.OutputAll(tft.t, &terraform.Options{TerraformDir: tft.setupDir, Logger: tft.logger})))
-		// setup credentials if explicit sa_key output from setup
-		credsEnc, exists := tft.tfEnvVars[fmt.Sprintf("TF_VAR_%s", setupKeyOutputName)]
-		if !exists {
-			tft.logger.Logf(tft.t, "Unable to find %s output from setup, skipping credential activation", setupKeyOutputName)
-		} else {
-			credDec, err := b64.StdEncoding.DecodeString(credsEnc)
-			if err != nil {
-				t.Fatalf("Unable to decode %s output from setup: %v", setupKeyOutputName, err)
+		if credsEnc, exists := tft.tfEnvVars[fmt.Sprintf("TF_VAR_%s", setupKeyOutputName)]; tft.saKey == "" && exists {
+			if credDec, err := b64.StdEncoding.DecodeString(credsEnc); err == nil {
+				gcloud.ActivateCredsAndEnvVars(tft.t, string(credDec))
+			} else {
+				tft.t.Fatalf("Unable to decode setup sa key: %v", err)
 			}
-			gcloud.ActivateCredsAndEnvVars(tft.t, string(credDec))
+		} else {
+			tft.logger.Logf(tft.t, "Skipping credential activation %s output from setup", setupKeyOutputName)
 		}
 	}
 

infra/blueprint-test/pkg/utils/env.go

@@ -31,3 +31,11 @@ func ValFromEnv(t testing.TB, k string) string {
 	}
 	return v
 }
+
+// SetEnv set a environment variable.
+func SetEnv(t testing.TB, key string, value string) {
+	err := os.Setenv(key, value)
+	if err != nil {
+		t.Fatal("Unable to put environment variable %s: %v", key, err)
+	}
+}

infra/blueprint-test/pkg/utils/files.go

@@ -10,10 +10,10 @@ func WriteTmpFile(data string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer f.Close()
 	_, err = f.Write([]byte(data))
 	if err != nil {
 		return "", err
 	}
-	f.Close()
 	return f.Name(), nil
 }