Fix windows TFCloud creds path

Elie · Elie · commit 937eeb45cad5 · 2021-09-08T10:31:24.000+02:00
diff --git a/pkg/iac/terraform/state/backend/tfcloud_config_reader.go b/pkg/iac/terraform/state/backend/tfcloud_config_reader.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"io"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"runtime"
 
@@ -48,9 +49,9 @@ func getTerraformConfigFile() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	tfConfigDir := ".terraform.d"
+	basePath := filepath.Join(homeDir, ".terraform.d")
 	if runtime.GOOS == "windows" {
-		tfConfigDir = "terraform.d"
+		basePath = filepath.Join(os.Getenv("APPDATA"), "terraform.d")
 	}
-	return filepath.Join(homeDir, tfConfigDir, "credentials.tfrc.json"), nil
+	return filepath.Join(basePath, "credentials.tfrc.json"), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"errors"`
`6`	`6`	`"io"`
`7`	`7`	`"io/ioutil"`
	`8`	`+ "os"`
`8`	`9`	`"path/filepath"`
`9`	`10`	`"runtime"`
`10`	`11`
`@@ -48,9 +49,9 @@ func getTerraformConfigFile() (string, error) {`
`48`	`49`	`if err != nil {`
`49`	`50`	`return "", err`
`50`	`51`	`}`
`51`		`- tfConfigDir := ".terraform.d"`
	`52`	`+ basePath := filepath.Join(homeDir, ".terraform.d")`
`52`	`53`	`if runtime.GOOS == "windows" {`
`53`		`- tfConfigDir = "terraform.d"`
	`54`	`+ basePath = filepath.Join(os.Getenv("APPDATA"), "terraform.d")`
`54`	`55`	`}`
`55`		`- return filepath.Join(homeDir, tfConfigDir, "credentials.tfrc.json"), nil`
	`56`	`+ return filepath.Join(basePath, "credentials.tfrc.json"), nil`
`56`	`57`	`}`