avoid evaluating symlinks for now

We use module paths in many different places and we this ensure we will compare the same paths consistently and avoid duplicate entries in memdb.
hashicorp · Nov 17, 2021 · 248373c · 248373c
1 parent 371d8fd
commit 248373c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/langserver/handlers/initialize.go b/internal/langserver/handlers/initialize.go
@@ -266,7 +266,7 @@ func resolvePath(rootDir, rawPath string) (string, error) {
 }
 
 func cleanupPath(path string) (string, error) {
- absPath, err := filepath.EvalSymlinks(path)
+ absPath, err := filepath.Abs(path)
  return toLowerVolumePath(absPath), err
 }
 

diff --git a/internal/terraform/module/module_manager.go b/internal/terraform/module/module_manager.go
@@ -68,7 +68,9 @@ func (mm *moduleManager) AddModule(modPath string) (Module, error) {
 
  err := mm.moduleStore.Add(modPath)
  if err != nil {
- return nil, err
+ if _, ok := err.(*state.AlreadyExistsError); !ok {
+ return nil, err
+ }
  }
 
  // TODO: Avoid returning new module, just the error from adding