Values without a backing env var should not be expanded

offen · Feb 19, 2024 · c2a9ed8 · c2a9ed8
1 parent dd8ff5e
commit c2a9ed8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/cmd/backup/config_provider.go b/cmd/backup/config_provider.go
@@ -103,7 +103,12 @@ func loadConfigsFromEnvFiles(directory string) ([]*Config, error) {
 		if err != nil {
 			return nil, errwrap.Wrap(err, fmt.Sprintf("error reading %s", item.Name()))
 		}
-		envFile, err := godotenv.Unmarshal(os.ExpandEnv(string(f)))
+		envFile, err := godotenv.Unmarshal(os.Expand(string(f), func(s string) string {
+			if val, ok := os.LookupEnv(s); ok {
+				return val
+			}
+			return fmt.Sprintf("$%s", s)
+		}))
 		if err != nil {
 			return nil, errwrap.Wrap(err, fmt.Sprintf("error reading config file %s", p))
 		}

diff --git a/test/confd/02backup.env b/test/confd/02backup.env
@@ -1,2 +1,3 @@
 NAME="other"
 BACKUP_CRON_EXPRESSION="*/1 * * * *"
+BACKUP_FILENAME="override-$NAME.tar.gz"
diff --git a/test/confd/run.sh b/test/confd/run.sh
@@ -20,7 +20,7 @@ if [ ! -f "$LOCAL_DIR/conf.tar.gz" ]; then
 fi
 pass "Config from file was used."
 
-if [ ! -f "$LOCAL_DIR/other.tar.gz" ]; then
+if [ ! -f "$LOCAL_DIR/override-other.tar.gz" ]; then
   fail "Run on same schedule did not succeed."
 fi
 pass "Run on same schedule succeeded."