Merge branch 'main' into remove_reflect

This commit is contained in:
2022-04-21 20:22:26 -04:00
committed by GitHub
39 changed files with 890 additions and 247 deletions

View File

@@ -414,8 +414,10 @@ func flagFromEnvOrFile(envVars []string, filePath string) (val string, ok bool)
}
}
for _, fileVar := range strings.Split(filePath, ",") {
if data, err := ioutil.ReadFile(fileVar); err == nil {
return string(data), true
if fileVar != "" {
if data, err := ioutil.ReadFile(fileVar); err == nil {
return string(data), true
}
}
}
return "", false