Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid duplicate state entries (by avoiding symlink evaluation) #699

Merged
merged 1 commit into from
Nov 18, 2021
Merged

Avoid duplicate state entries (by avoiding symlink evaluation) #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/langserver/handlers/initialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 3 additions & 1 deletion internal/terraform/module/module_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down