Fixed issue preventing fallback and metadata files from being saved in DOPPER_CONFIG_DIR

Author: nmanoogian

pkg/cmd/run.go

@@ -38,8 +38,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var defaultFallbackDir string
-
 const defaultFallbackFileMaxAge = 14 * 24 * time.Hour // 14 days
 const defaultLivenessPingIntervalSeconds = 60 * 5 * time.Second
 
@@ -445,9 +443,9 @@ var runCleanCmd = &cobra.Command{
 		dryRun := utils.GetBoolFlag(cmd, "dry-run")
 		all := utils.GetBoolFlag(cmd, "all")
 
-		utils.LogDebug(fmt.Sprintf("Using fallback directory %s", defaultFallbackDir))
+		utils.LogDebug(fmt.Sprintf("Using fallback directory %s", configuration.UserFallbackDir))
 
-		if _, err := os.Stat(defaultFallbackDir); err != nil {
+		if _, err := os.Stat(configuration.UserFallbackDir); err != nil {
 			if os.IsNotExist(err) {
 				utils.LogDebug("Fallback directory does not exist")
 				utils.Print("Nothing to clean")
@@ -457,7 +455,7 @@ var runCleanCmd = &cobra.Command{
 			utils.HandleError(err, "Unable to read fallback directory")
 		}
 
-		entries, err := ioutil.ReadDir(defaultFallbackDir)
+		entries, err := ioutil.ReadDir(configuration.UserFallbackDir)
 		if err != nil {
 			utils.HandleError(err, "Unable to read fallback directory")
 		}
@@ -486,7 +484,7 @@ var runCleanCmd = &cobra.Command{
 			}
 
 			if delete {
-				file := filepath.Join(defaultFallbackDir, entry.Name())
+				file := filepath.Join(configuration.UserFallbackDir, entry.Name())
 				utils.LogDebug(fmt.Sprintf("%s %s", action, file))
 
 				if dryRun {
@@ -517,7 +515,7 @@ var runCleanCmd = &cobra.Command{
 func legacyFallbackFile(project string, config string) string {
 	name := fmt.Sprintf("%s:%s", project, config)
 	fileName := fmt.Sprintf(".run-%s.json", crypto.Hash(name))
-	return filepath.Join(defaultFallbackDir, fileName)
+	return filepath.Join(configuration.UserFallbackDir, fileName)
 }
 
 // generate the passphrase used for encrypting a secrets file
@@ -552,15 +550,15 @@ func initFallbackDir(cmd *cobra.Command, config models.ScopedOptions, format mod
 		}
 	} else {
 		fallbackFileName := fmt.Sprintf(".secrets-%s.json", controllers.GenerateFallbackFileHash(config.Token.Value, config.EnclaveProject.Value, config.EnclaveConfig.Value, format, nameTransformer, secretNames))
-		fallbackPath = filepath.Join(defaultFallbackDir, fallbackFileName)
+		fallbackPath = filepath.Join(configuration.UserFallbackDir, fallbackFileName)
 		// TODO remove this when releasing CLI v4 (DPLR-435)
 		if config.EnclaveProject.Value != "" && config.EnclaveConfig.Value != "" {
 			// save to old path to maintain backwards compatibility
 			legacyFallbackPath = legacyFallbackFile(config.EnclaveProject.Value, config.EnclaveConfig.Value)
 		}
 
-		if !utils.Exists(defaultFallbackDir) {
-			err := os.Mkdir(defaultFallbackDir, 0700)
+		if !utils.Exists(configuration.UserFallbackDir) {
+			err := os.Mkdir(configuration.UserFallbackDir, 0700)
 			if err != nil {
 				utils.LogDebug("Unable to create directory for fallback file")
 				if exitOnWriteFailure {
@@ -584,9 +582,6 @@ func initFallbackDir(cmd *cobra.Command, config models.ScopedOptions, format mod
 }
 
 func init() {
-	defaultFallbackDir = filepath.Join(configuration.UserConfigDir, "fallback")
-	controllers.DefaultMetadataDir = defaultFallbackDir
-
 	forwardSignals := !isatty.IsTerminal(os.Stdout.Fd())
 
 	runCmd.Flags().StringP("project", "p", "", "project (e.g. backend)")

pkg/configuration/config.go

@@ -37,6 +37,12 @@ var UserConfigDir string
 // UserConfigFile (e.g. /home/user/doppler/.doppler.yaml)
 var UserConfigFile string
 
+// UserFallbackDir (e.g. /home/user/doppler/.doppler.yaml)
+var UserFallbackDir string
+
+// UserMetadataDir the directory containing metadata files
+var UserMetadataDir string
+
 // Scope to use for config file
 var Scope = "."
 
@@ -54,6 +60,8 @@ func init() {
 
 func SetConfigDir(dir string) {
 	UserConfigDir = dir
+	UserFallbackDir = filepath.Join(dir, "fallback")
+	UserMetadataDir = UserFallbackDir
 	UserConfigFile = filepath.Join(UserConfigDir, configFileName)
 }
 

pkg/controllers/fallback.go

@@ -24,15 +24,13 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/DopplerHQ/cli/pkg/configuration"
 	"github.com/DopplerHQ/cli/pkg/crypto"
 	"github.com/DopplerHQ/cli/pkg/models"
 	"github.com/DopplerHQ/cli/pkg/utils"
 	"gopkg.in/yaml.v3"
 )
 
-// DefaultMetadataDir the directory containing metadata files
-var DefaultMetadataDir string
-
 func GenerateFallbackFileHash(token string, project string, config string, format models.SecretsFormat, nameTransformer *models.SecretsNameTransformer, secretNames []string) string {
 	parts := []string{token}
 	if project != "" && config != "" {
@@ -63,7 +61,7 @@ func GenerateFallbackFileHash(token string, project string, config string, forma
 // MetadataFilePath calculates the name of the metadata file
 func MetadataFilePath(token string, project string, config string, format models.SecretsFormat, nameTransformer *models.SecretsNameTransformer, secretNames []string) string {
 	fileName := fmt.Sprintf(".metadata-%s.json", GenerateFallbackFileHash(token, project, config, format, nameTransformer, secretNames))
-	path := filepath.Join(DefaultMetadataDir, fileName)
+	path := filepath.Join(configuration.UserMetadataDir, fileName)
 	if absPath, err := filepath.Abs(path); err == nil {
 		return absPath
 	}