diff --git a/cmd/backup/config_provider.go b/cmd/backup/config_provider.go index 306b759..6c6a32a 100644 --- a/cmd/backup/config_provider.go +++ b/cmd/backup/config_provider.go @@ -69,7 +69,11 @@ func loadEnvFiles(directory string) ([]configFile, error) { continue } p := filepath.Join(directory, item.Name()) - envFile, err := godotenv.Read(p) + f, err := os.ReadFile(p) + if err != nil { + return nil, fmt.Errorf("loadEnvFiles: error reading %s: %w", item.Name(), err) + } + envFile, err := godotenv.Unmarshal(os.ExpandEnv(string(f))) if err != nil { return nil, fmt.Errorf("loadEnvFiles: error reading config file %s: %w", p, err) } diff --git a/test/confd/01backup.env b/test/confd/01backup.env index 1d9d2b5..d55f172 100644 --- a/test/confd/01backup.env +++ b/test/confd/01backup.env @@ -1,2 +1,2 @@ -NAME="conf" +NAME="$EXPANSION_VALUE" BACKUP_CRON_EXPRESSION="*/1 * * * *" diff --git a/test/confd/docker-compose.yml b/test/confd/docker-compose.yml index 86c21f5..cb8584e 100644 --- a/test/confd/docker-compose.yml +++ b/test/confd/docker-compose.yml @@ -7,6 +7,7 @@ services: environment: BACKUP_FILENAME: $$NAME.tar.gz BACKUP_FILENAME_EXPAND: 'true' + EXPANSION_VALUE: conf volumes: - ${LOCAL_DIR:-./local}:/archive - app_data:/backup/app_data:ro