ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/template: template_dir: don't crash if source dir nonexistent 

When an error is passed, the FileInfo can be nil, which was previously
causing a crash on trying to evaluate f.IsDir(). By checking for an error
first we avoid this crash.
This commit is contained in:
Martin Atkins 2017-04-25 10:03:09 -07:00
parent f721608e4e
commit eda2550074
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/providers/template/resource_template_dir.go
View File

@ -89,12 +89,12 @@ func resourceTemplateDirCreate(d *schema.ResourceData, meta interface{}) error {
// Recursively crawl the input files/directories and generate the output ones. // Recursively crawl the input files/directories and generate the output ones.
err := filepath.Walk(sourceDir, func(p string, f os.FileInfo, err error) error { err := filepath.Walk(sourceDir, func(p string, f os.FileInfo, err error) error {
if f.IsDir() {
return nil
}
if err != nil { if err != nil {
return err return err
} }
if f.IsDir() {
return nil
}
relPath, _ := filepath.Rel(sourceDir, p) relPath, _ := filepath.Rel(sourceDir, p)
return generateDirFile(p, path.Join(destinationDir, relPath), f, vars) return generateDirFile(p, path.Join(destinationDir, relPath), f, vars)