Fix module resolution when terraform init is invoked from another directory (#840)

Fixes #835

Author: mkielar

integration/init-cwd/modules/one/main.tf

@@ -0,0 +1,3 @@
+output "one" {
+  value = "foo"
+}

integration/init-cwd/modules/two/main.tf

@@ -0,0 +1,3 @@
+module "one" {
+  source = "../one"
+}

integration/init-cwd/root/.terraform/modules/modules.json

@@ -0,0 +1 @@
+{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"one","Source":"../modules/one","Dir":"../modules/one"}]}

integration/init-cwd/root/main.tf

@@ -0,0 +1,3 @@
+module "one" {
+  source = "../modules/one"
+}

integration/init-cwd/root/result.json

@@ -0,0 +1,4 @@
+{
+  "issues": [],
+  "errors": []
+}

integration/init-parent/.terraform/modules/modules.json

@@ -0,0 +1 @@
+{"Modules":[{"Key":"","Source":"","Dir":"root"},{"Key":"one","Source":"../modules/one","Dir":"modules/one"}]}

integration/init-parent/modules/one/main.tf

@@ -0,0 +1,3 @@
+output "one" {
+  value = "foo"
+}

integration/init-parent/modules/two/main.tf

@@ -0,0 +1,3 @@
+module "one" {
+  source = "../one"
+}

integration/init-parent/result.json

@@ -0,0 +1,4 @@
+{
+  "issues": [],
+  "errors": []
+}

integration/init-parent/root/main.tf

@@ -0,0 +1,3 @@
+module "one" {
+  source = "../modules/one"
+}

integration_test.go

@@ -77,13 +77,23 @@ func TestIntegration(t *testing.T) {
 			Command: "./tflint --format json --module",
 			Dir:     "path",
 		},
+		{
+			Name:    "init from parent",
+			Command: "./tflint --format json --module root",
+			Dir:     "init-parent",
+		},
+		{
+			Name:    "init from cwd",
+			Command: "./tflint --format json --module",
+			Dir:     "init-cwd/root",
+		},
 	}
 
 	dir, _ := os.Getwd()
-	defer os.Chdir(dir)
-
 	for _, tc := range cases {
 		testDir := dir + "/integration/" + tc.Dir
+
+		defer os.Chdir(dir)
 		os.Chdir(testDir)
 
 		if tc.Env != nil {
@@ -95,14 +105,15 @@ func TestIntegration(t *testing.T) {
 		outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
 		cli := cmd.NewCLI(outStream, errStream)
 		args := strings.Split(tc.Command, " ")
+
 		cli.Run(args)
 
 		var b []byte
 		var err error
 		if runtime.GOOS == "windows" && IsWindowsResultExist() {
-			b, err = ioutil.ReadFile("result_windows.json")
+			b, err = ioutil.ReadFile(filepath.Join(testDir, "result_windows.json"))
 		} else {
-			b, err = ioutil.ReadFile("result.json")
+			b, err = ioutil.ReadFile(filepath.Join(testDir, "result.json"))
 		}
 		if err != nil {
 			t.Fatal(err)

tflint/loader.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"path/filepath"
 	"sort"
 	"strings"
 
@@ -270,14 +269,9 @@ func (l *Loader) moduleWalker() configs.ModuleWalker {
 			}
 		}
 
-		dir := filepath.Join(l.currentDir, record.Dir)
-		if filepath.IsAbs(record.Dir) {
-			// If record.Dir is an absolute path, leave it
-			dir = record.Dir
-		}
-		log.Printf("[DEBUG] Trying to load the module: key=%s, version=%s, dir=%s", key, record.VersionStr, dir)
+		log.Printf("[DEBUG] Trying to load the module: key=%s, version=%s, dir=%s", key, record.VersionStr, record.Dir)
 
-		mod, diags := l.parser.LoadConfigDir(dir)
+		mod, diags := l.parser.LoadConfigDir(record.Dir)
 		return mod, record.Version, diags
 	})
 }