From e9d5be983ff348c5e3ecfb8d6e9831b04f19e3c5 Mon Sep 17 00:00:00 2001 From: Takaaki Furukawa Date: Sun, 5 Apr 2020 22:08:29 +0900 Subject: [PATCH] fix: fix path handling error on windows --- template/resource_template_dir.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/template/resource_template_dir.go b/template/resource_template_dir.go index 63a2f18d..a1f7b535 100644 --- a/template/resource_template_dir.go +++ b/template/resource_template_dir.go @@ -9,7 +9,6 @@ import ( "io" "io/ioutil" "os" - "path" "path/filepath" "github.com/hashicorp/terraform/helper/pathorcontents" @@ -106,7 +105,7 @@ func resourceTemplateDirCreate(d *schema.ResourceData, meta interface{}) error { } relPath, _ := filepath.Rel(sourceDir, p) - return generateDirFile(p, path.Join(destinationDir, relPath), f, vars) + return generateDirFile(p, filepath.Join(destinationDir, relPath), f, vars) }) if err != nil { return err @@ -148,7 +147,7 @@ func generateDirFile(sourceDir, destinationDir string, f os.FileInfo, vars map[s return templateRenderError(fmt.Errorf("failed to render %v: %v", sourceDir, err)) } - outputDir := path.Dir(destinationDir) + outputDir := filepath.Dir(destinationDir) if _, err := os.Stat(outputDir); err != nil { if err := os.MkdirAll(outputDir, 0777); err != nil { return err