Resolve symlinks in config directory

Docker/Openshift/Kubernetes mount the config file as a symbolic link and
IsDir returns true if the file is a symlink. Before calling IsDir, the
symlink should be resolved to determine if it points at a file or
directory.

Fixes #3753
This commit is contained in:
James Hartig 2018-01-12 14:11:59 -05:00
parent fad2531967
commit 81d0ffc959
1 changed files with 14 additions and 1 deletions

View File

@ -165,12 +165,25 @@ func (b *Builder) ReadPath(path string) ([]Source, error) {
var sources []Source
for _, fi := range fis {
fp := filepath.Join(path, fi.Name())
// check for a symlink and resolve the path
if fi.Mode()&os.ModeSymlink > 0 {
var err error
fp, err = filepath.EvalSymlinks(fp)
if err != nil {
return nil, err
}
fi, err = os.Stat(fp)
if err != nil {
return nil, err
}
}
// do not recurse into sub dirs
if fi.IsDir() {
continue
}
src, err := b.ReadFile(filepath.Join(path, fi.Name()))
src, err := b.ReadFile(fp)
if err != nil {
return nil, err
}