diff --git a/internal/testutils/testutils.go b/internal/testutils/testutils.go index e2447675..675a9b5b 100644 --- a/internal/testutils/testutils.go +++ b/internal/testutils/testutils.go @@ -103,14 +103,14 @@ func ResourceNameWithDateTime(name string) string { func GetTestProjectServiceAccountJson(path string) string { var err error - token, tokenSet := os.LookupEnv("TF_ACC_SERVICE_ACCOUNT_FILE") - if !tokenSet || token == "" { - token, err = readTestServiceAccountJsonFromFile(path) + json, ok := os.LookupEnv("TF_ACC_SERVICE_ACCOUNT_JSON_CONTENT") + if !ok || json == "" { + json, err = readTestServiceAccountJsonFromFile(path) if err != nil { return "" } } - return token + return json } // func GetTestProjectServiceAccountToken(path string) string { @@ -157,8 +157,8 @@ func GetTestProjectServiceAccountJson(path string) string { func readTestServiceAccountJsonFromFile(path string) (string, error) { if path == "" { - customPath, customPathSet := os.LookupEnv("STACKIT_SERVICE_ACCOUNT_PATH") - if !customPathSet || customPath == "" { + customPath, ok := os.LookupEnv("TF_ACC_SERVICE_ACCOUNT_FILE") + if !ok || customPath == "" { path = serviceAccountFilePath home, err := os.UserHomeDir() if err != nil {