fix: builder and sdk changes (#81)

## Description

<!-- **Please link some issue here describing what you are trying to achieve.**

In case there is no issue present for your PR, please consider creating one.
At least please give us some description what you are trying to achieve and why your change is needed. -->

relates to #1234

## Checklist

- [ ] Issue was linked above
- [ ] Code format was applied: `make fmt`
- [ ] Examples were added / adjusted (see `examples/` directory)
- [x] Docs are up-to-date: `make generate-docs` (will be checked by CI)
- [ ] Unit tests got implemented or updated
- [ ] Acceptance tests got implemented or updated (see e.g. [here](f5f99d1709/stackit/internal/services/dns/dns_acc_test.go))
- [x] Unit tests are passing: `make test` (will be checked by CI)
- [x] No linter issues: `make lint` (will be checked by CI)

Co-authored-by: Marcel S. Henselin <marcel.henselin@stackit.cloud>
Co-authored-by: marcel.henselin <marcel.henselin@stackit.cloud>
Reviewed-on: #81

internal/testutils/functions.go

@@ -53,9 +53,9 @@ func CreateTemporaryHome(createValidCredentialsFile bool, t *testing.T) string {
 
 	// Define content, default = invalid token
 	token := "foo_token"
-	if createValidCredentialsFile {
-		token = GetTestProjectServiceAccountJson("")
-	}
+	//if createValidCredentialsFile {
+	//	token = GetTestProjectServiceAccountJson("")
+	//}
 	if _, err = file.WriteString(token); err != nil {
 		t.Fatalf("Error writing to file: %v", err)
 	}

internal/testutils/helpers.go

@@ -293,25 +293,24 @@ func RedisProviderConfig() string {
 	)
 }
 
-func ResourceManagerProviderConfig() string {
-	key := GetTestProjectServiceAccountJson("")
+func ResourceManagerProviderConfig(saKeyPath string) string {
 	if ResourceManagerCustomEndpoint == "" || AuthorizationCustomEndpoint == "" {
 		return fmt.Sprintf(`
 		provider "stackitprivatepreview" {
-			service_account_key = "%s"
+			service_account_key_path = "%s"
 		}`,
-			key,
+			saKeyPath,
 		)
 	}
 	return fmt.Sprintf(`
 	provider "stackitprivatepreview" {
 		resourcemanager_custom_endpoint = "%s"
 		authorization_custom_endpoint = "%s"
-		service_account_token = "%s"
+		service_account_key_path = "%s"
 	}`,
 		ResourceManagerCustomEndpoint,
 		AuthorizationCustomEndpoint,
-		key,
+		saKeyPath,
 	)
 }
 

internal/testutils/testutils.go

@@ -6,7 +6,6 @@ import (
 	"log/slog"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -20,9 +19,8 @@ import (
 )
 
 const (
-	// Default location of credentials JSON
-	// credentialsFilePath = ".stackit/credentials.json" //nolint:gosec // linter false positive
-	serviceAccountFilePath = ".stackit/service_account.json"
+	// Default location of service account JSON
+	serviceAccountFilePath = "service_account.json"
 )
 
 var (
@@ -101,17 +99,17 @@ func ResourceNameWithDateTime(name string) string {
 	return fmt.Sprintf("tf-acc-%s-%s", name, dateTimeTrimmed)
 }
 
-func GetTestProjectServiceAccountJson(path string) string {
-	var err error
-	token, tokenSet := os.LookupEnv("TF_ACC_TEST_PROJECT_SERVICE_ACCOUNT_JSON")
-	if !tokenSet || token == "" {
-		token, err = readTestServiceAccountJsonFromFile(path)
-		if err != nil {
-			return ""
-		}
-	}
-	return token
-}
+//func GetTestProjectServiceAccountJson(path string) string {
+//	var err error
+//	json, ok := os.LookupEnv("TF_ACC_SERVICE_ACCOUNT_JSON_CONTENT")
+//	if !ok || json == "" {
+//		json, err = readTestServiceAccountJsonFromFile(path)
+//		if err != nil {
+//			return ""
+//		}
+//	}
+//	return json
+//}
 
 // func GetTestProjectServiceAccountToken(path string) string {
 //	var err error
@@ -155,27 +153,30 @@ func GetTestProjectServiceAccountJson(path string) string {
 //	return credentials.TF_ACC_TEST_PROJECT_SERVICE_ACCOUNT_TOKEN, nil
 //}
 
-func readTestServiceAccountJsonFromFile(path string) (string, error) {
-	if path == "" {
-		customPath, customPathSet := os.LookupEnv("STACKIT_SERVICE_ACCOUNT_PATH")
-		if !customPathSet || customPath == "" {
-			path = serviceAccountFilePath
-			home, err := os.UserHomeDir()
-			if err != nil {
-				return "", fmt.Errorf("getting home directory: %w", err)
-			}
-			path = filepath.Join(home, path)
-		} else {
-			path = customPath
-		}
-	}
-
-	credentialsRaw, err := os.ReadFile(path)
-	if err != nil {
-		return "", fmt.Errorf("opening file: %w", err)
-	}
-	return string(credentialsRaw), nil
-}
+//func readTestServiceAccountJsonFromFile(path string) (string, error) {
+//	if path == "" {
+//		customPath, ok := os.LookupEnv("TF_ACC_SERVICE_ACCOUNT_FILE")
+//		if !ok || customPath == "" {
+//			path = serviceAccountFilePath
+//			// TODO: check if we want to handle this with a home dir
+//			/*
+//				home, err := os.UserHomeDir()
+//				if err != nil {
+//					return "", fmt.Errorf("getting home directory: %w", err)
+//				}
+//				path = filepath.Join(home, path)
+//			*/
+//		} else {
+//			path = customPath
+//		}
+//	}
+//
+//	credentialsRaw, err := os.ReadFile(path)
+//	if err != nil {
+//		return "", fmt.Errorf("opening file: %w", err)
+//	}
+//	return string(credentialsRaw), nil
+//}
 
 func getenv(key, defaultValue string) string {
 	val := os.Getenv(key)