rootmodule: find executor for unmatched root dir

hashicorp · Jun 24, 2020 · 7b26e8e · 7b26e8e
1 parent 6fc8b19
commit 7b26e8e
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/internal/terraform/rootmodule/errors.go b/internal/terraform/rootmodule/errors.go
@@ -14,3 +14,11 @@ func (e *RootModuleNotFoundErr) Error() string {
 	}
 	return "root module not found"
 }
+
+func IsRootModuleNotFound(err error) bool {
+	if err == nil {
+		return false
+	}
+	_, ok := err.(*RootModuleNotFoundErr)
+	return ok
+}
diff --git a/internal/terraform/rootmodule/root_module_manager.go b/internal/terraform/rootmodule/root_module_manager.go
@@ -127,15 +127,42 @@ func (rmm *rootModuleManager) ParserForDir(path string) (lang.Parser, error) {
 	return rm.Parser(), nil
 }
 
-func (rmm *rootModuleManager) TerraformExecutorForDir(path string) (*exec.Executor, error) {
+func (rmm *rootModuleManager) TerraformExecutorForDir(ctx context.Context, path string) (*exec.Executor, error) {
 	rm, err := rmm.RootModuleByPath(path)
-	if err != nil {
-		return nil, err
+	if err != nil && IsRootModuleNotFound(err) {
+		return rmm.terraformExecutorForDir(ctx, path)
 	}
 
 	return rm.TerraformExecutor(), nil
 }
 
+func (rmm *rootModuleManager) terraformExecutorForDir(ctx context.Context, dir string) (*exec.Executor, error) {
+	tfPath := rmm.tfExecPath
+	if tfPath == "" {
+		var err error
+		d := &discovery.Discovery{}
+		tfPath, err = d.LookPath()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	tf := exec.NewExecutor(ctx, tfPath)
+
+	tf.SetWorkdir(dir)
+	tf.SetLogger(rmm.logger)
+
+	if rmm.tfExecLogPath != "" {
+		tf.SetExecLogPath(rmm.tfExecLogPath)
+	}
+
+	if rmm.tfExecTimeout != 0 {
+		tf.SetTimeout(rmm.tfExecTimeout)
+	}
+
+	return tf, nil
+}
+
 // rootModuleDirFromPath strips known lock file paths and filenames
 // to get the directory path of the relevant rootModule
 func rootModuleDirFromFilePath(filePath string) string {

diff --git a/internal/terraform/rootmodule/types.go b/internal/terraform/rootmodule/types.go
@@ -18,7 +18,7 @@ type ParserFinder interface {
 }
 
 type TerraformExecFinder interface {
-	TerraformExecutorForDir(path string) (*exec.Executor, error)
+	TerraformExecutorForDir(ctx context.Context, path string) (*exec.Executor, error)
 }
 
 type RootModuleManager interface {
@@ -30,7 +30,7 @@ type RootModuleManager interface {
 	PathsToWatch() []string
 	RootModuleByPath(path string) (RootModule, error)
 	ParserForDir(path string) (lang.Parser, error)
-	TerraformExecutorForDir(path string) (*exec.Executor, error)
+	TerraformExecutorForDir(ctx context.Context, path string) (*exec.Executor, error)
 }
 
 type RootModule interface {

diff --git a/langserver/handlers/formatting.go b/langserver/handlers/formatting.go
@@ -28,7 +28,7 @@ func (h *logHandler) TextDocumentFormatting(ctx context.Context, params lsp.Docu
 		return edits, err
 	}
 
-	tf, err := tff.TerraformExecutorForDir(fh.Dir())
+	tf, err := tff.TerraformExecutorForDir(ctx, fh.Dir())
 	if err != nil {
 		return edits, err
 	}