Values without a backing env var should not be expanded

offen · Feb 19, 2024 · 60bde0b · 60bde0b
1 parent dd8ff5e
commit 60bde0b
Showing 1 changed file with 6 additions and 1 deletion.
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 s
+		}))
 		if err != nil {
 			return nil, errwrap.Wrap(err, fmt.Sprintf("error reading config file %s", p))
 		}