Skip to content

Commit

Permalink
Fix do not expand envvars for empty config fields
Browse files Browse the repository at this point in the history
Signed-off-by: Ivo Gosemann <[email protected]>
  • Loading branch information
IvoGoman committed Mar 30, 2024
1 parent 733e5a1 commit 8992c92
Showing 1 changed file with 17 additions and 11 deletions.
28 changes: 17 additions & 11 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,26 @@ func LoadFile(paths []string, expandEnvVars bool) (*Config, error) {
if expandEnvVars {
var err error
for i, auth := range cfg.Auths {
cfg.Auths[i].Username, err = substituteEnvVariables(auth.Username)
if err != nil {
return nil, err
if auth.Username != "" {
cfg.Auths[i].Username, err = substituteEnvVariables(auth.Username)
if err != nil {
return nil, err
}
}
password, err := substituteEnvVariables(string(auth.Password))
if err != nil {
return nil, err
if auth.Password != "" {
password, err := substituteEnvVariables(string(auth.Password))
if err != nil {
return nil, err
}
cfg.Auths[i].Password.Set(password)
}
cfg.Auths[i].Password.Set(password)
privPassword, err := substituteEnvVariables(string(auth.PrivPassword))
if err != nil {
return nil, err
if auth.PrivPassword != "" {
privPassword, err := substituteEnvVariables(string(auth.PrivPassword))
if err != nil {
return nil, err
}
cfg.Auths[i].PrivPassword.Set(privPassword)
}
cfg.Auths[i].PrivPassword.Set(privPassword)
}
}

Expand Down

0 comments on commit 8992c92

Please sign in to comment.