Get module inputs for tfvars schema

hashicorp · Apr 23, 2024 · c154cfa · c154cfa
1 parent f09b92c
commit c154cfa
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 31 deletions.
diff --git a/internal/features/modules/modules_feature.go b/internal/features/modules/modules_feature.go
@@ -436,3 +436,12 @@ func (f *ModulesFeature) CoreRequirements(modPath string) (version.Constraints,
 
 	return mod.Meta.CoreRequirements, nil
 }
+
+func (f *ModulesFeature) ModuleInputs(modPath string) (map[string]tfmod.Variable, error) {
+	mod, err := f.store.ModuleRecordByPath(modPath)
+	if err != nil {
+		return nil, err
+	}
+
+	return mod.Meta.Variables, nil
+}
diff --git a/internal/features/variables/decoder/path_reader.go b/internal/features/variables/decoder/path_reader.go
@@ -10,15 +10,21 @@ import (
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/terraform-ls/internal/features/variables/state"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
+	tfmod "github.com/hashicorp/terraform-schema/module"
 )
 
 type StateReader interface {
 	List() ([]*state.VariableRecord, error)
 	VariableRecordByPath(path string) (*state.VariableRecord, error)
 }
 
+type ModuleReader interface {
+	ModuleInputs(modPath string) (map[string]tfmod.Variable, error)
+}
+
 type PathReader struct {
-	StateReader StateReader
+	StateReader  StateReader
+	ModuleReader ModuleReader
 }
 
 var _ decoder.PathReader = &PathReader{}
@@ -45,6 +51,5 @@ func (pr *PathReader) PathContext(path lang.Path) (*decoder.PathContext, error)
 	if err != nil {
 		return nil, err
 	}
-	return variablePathContext(mod, pr.StateReader)
-
+	return variablePathContext(mod, pr.ModuleReader)
 }
diff --git a/internal/features/variables/decoder/variable_context.go b/internal/features/variables/decoder/variable_context.go
@@ -9,18 +9,11 @@ import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/terraform-ls/internal/features/variables/ast"
 	"github.com/hashicorp/terraform-ls/internal/features/variables/state"
-	tfmod "github.com/hashicorp/terraform-schema/module"
 	tfschema "github.com/hashicorp/terraform-schema/schema"
 )
 
-func variablePathContext(mod *state.VariableRecord, stateReader StateReader) (*decoder.PathContext, error) {
-	variables := make(map[string]tfmod.Variable)
-	// TODO: GET SCHEMA FROM MODULE
-	// meta, err := stateReader.LocalModuleMeta(mod.Path())
-	// if err == nil {
-	// 	variables = meta.Variables
-	// }
-
+func variablePathContext(mod *state.VariableRecord, moduleReader ModuleReader) (*decoder.PathContext, error) {
+	variables, _ := moduleReader.ModuleInputs(mod.Path())
 	schema, err := tfschema.SchemaForVariables(variables, mod.Path())
 	if err != nil {
 		return nil, err

diff --git a/internal/features/variables/jobs/references.go b/internal/features/variables/jobs/references.go
@@ -24,7 +24,7 @@ import (
 //
 // This is useful in hovering over those variable names,
 // go-to-definition and go-to-references.
-func DecodeVarsReferences(ctx context.Context, varStore *state.VariableStore, modPath string) error {
+func DecodeVarsReferences(ctx context.Context, varStore *state.VariableStore, moduleFeature fdecoder.ModuleReader, modPath string) error {
 	mod, err := varStore.VariableRecordByPath(modPath)
 	if err != nil {
 		return err
@@ -43,7 +43,8 @@ func DecodeVarsReferences(ctx context.Context, varStore *state.VariableStore, mo
 	}
 
 	d := decoder.NewDecoder(&fdecoder.PathReader{
-		StateReader: varStore,
+		StateReader:  varStore,
+		ModuleReader: moduleFeature,
 	})
 	d.SetContext(idecoder.DecoderContext(ctx))
 

diff --git a/internal/features/variables/jobs/validation.go b/internal/features/variables/jobs/validation.go
@@ -28,7 +28,7 @@ import (
 //
 // It relies on previously parsed AST (via [ParseVariables])
 // and schema, as provided via [LoadModuleMetadata]).
-func SchemaVariablesValidation(ctx context.Context, varStore *state.VariableStore, modPath string) error {
+func SchemaVariablesValidation(ctx context.Context, varStore *state.VariableStore, moduleFeature fdecoder.ModuleReader, modPath string) error {
 	mod, err := varStore.VariableRecordByPath(modPath)
 	if err != nil {
 		return err
@@ -45,7 +45,8 @@ func SchemaVariablesValidation(ctx context.Context, varStore *state.VariableStor
 	}
 
 	d := decoder.NewDecoder(&fdecoder.PathReader{
-		StateReader: varStore,
+		StateReader:  varStore,
+		ModuleReader: moduleFeature,
 	})
 	d.SetContext(idecoder.DecoderContext(ctx))
 

diff --git a/internal/features/variables/variables_feature.go b/internal/features/variables/variables_feature.go
@@ -26,24 +26,26 @@ type VariablesFeature struct {
 	stopFunc context.CancelFunc
 	logger   *log.Logger
 
-	jobStore *globalState.JobStore
-	fs       jobs.ReadOnlyFS
+	moduleFeature fdecoder.ModuleReader
+	jobStore      *globalState.JobStore
+	fs            jobs.ReadOnlyFS
 }
 
-func NewVariablesFeature(eventbus *eventbus.EventBus, jobStore *globalState.JobStore, fs jobs.ReadOnlyFS) (*VariablesFeature, error) {
+func NewVariablesFeature(eventbus *eventbus.EventBus, jobStore *globalState.JobStore, fs jobs.ReadOnlyFS, moduleFeature fdecoder.ModuleReader) (*VariablesFeature, error) {
 	store, err := state.NewVariableStore()
 	if err != nil {
 		return nil, err
 	}
 	discardLogger := log.New(io.Discard, "", 0)
 
 	return &VariablesFeature{
-		store:    store,
-		eventbus: eventbus,
-		stopFunc: func() {},
-		logger:   discardLogger,
-		jobStore: jobStore,
-		fs:       fs,
+		store:         store,
+		eventbus:      eventbus,
+		stopFunc:      func() {},
+		logger:        discardLogger,
+		moduleFeature: moduleFeature,
+		jobStore:      jobStore,
+		fs:            fs,
 	}, nil
 }
 
@@ -113,7 +115,7 @@ func (f *VariablesFeature) DidOpen(ctx context.Context, dir document.DirHandle,
 	varsRefsId, err := f.jobStore.EnqueueJob(ctx, job.Job{
 		Dir: dir,
 		Func: func(ctx context.Context) error {
-			return jobs.DecodeVarsReferences(ctx, f.store, path)
+			return jobs.DecodeVarsReferences(ctx, f.store, f.moduleFeature, path)
 		},
 		Type:      op.OpTypeDecodeVarsReferences.String(),
 		DependsOn: job.IDs{parseVarsId},
@@ -128,7 +130,8 @@ func (f *VariablesFeature) DidOpen(ctx context.Context, dir document.DirHandle,
 
 func (f *VariablesFeature) PathContext(path lang.Path) (*decoder.PathContext, error) {
 	pathReader := &fdecoder.PathReader{
-		StateReader: f.store,
+		StateReader:  f.store,
+		ModuleReader: f.moduleFeature,
 	}
 
 	return pathReader.PathContext(path)

diff --git a/internal/langserver/handlers/service.go b/internal/langserver/handlers/service.go
@@ -556,16 +556,16 @@ func (svc *service) configureSessionDependencies(ctx context.Context, cfgOpts *s
 	rootModulesFeature.SetLogger(svc.logger)
 	rootModulesFeature.Start(svc.sessCtx)
 
-	modulesFeature, err := fmodules.NewModulesFeature(svc.eventBus,
-		svc.stateStore.JobStore, svc.stateStore.ProviderSchemas, svc.stateStore.RegistryModules,
-		svc.fs, rootModulesFeature)
+	modulesFeature, err := fmodules.NewModulesFeature(svc.eventBus, svc.stateStore.JobStore,
+		svc.stateStore.ProviderSchemas, svc.stateStore.RegistryModules, svc.fs, rootModulesFeature)
 	if err != nil {
 		return err
 	}
 	modulesFeature.SetLogger(svc.logger)
 	modulesFeature.Start(svc.sessCtx)
 
-	variablesFeature, err := fvariables.NewVariablesFeature(svc.eventBus, svc.stateStore.JobStore, svc.fs)
+	variablesFeature, err := fvariables.NewVariablesFeature(svc.eventBus, svc.stateStore.JobStore,
+		svc.fs, modulesFeature)
 	if err != nil {
 		return err
 	}