Merge pull request #699 from hashicorp/b-fix-symlinks

Avoid duplicate state entries (by avoiding symlink evaluation)
hashicorp · Nov 18, 2021 · 7d46fc6 · 7d46fc6
2 parents 371d8fd + 248373c
commit 7d46fc6
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