fix tests

internal/terraform/module/module_ops.go

@@ -11,6 +11,7 @@ import (
  "io"
  "io/fs"
  "log"
+ "path/filepath"
  "time"
 
  "github.com/hashicorp/go-multierror"
@@ -373,9 +374,13 @@ func ParseModuleConfiguration(ctx context.Context, fs ReadOnlyFS, modStore *stat
  // Only parse the file that's being changed/opened, unless this is 1st-time parsing
  if mod.ModuleParsingState == op.OpStateLoaded && rpcContext.IsDidChangeRequest() {
  // the file has already been parsed, so only examine this file and not the whole module
- fileName, _ := uri.PathFromURI(rpcContext.URI)
+ filePath, err := uri.PathFromURI(rpcContext.URI)
+ if err != nil {
+ return err
+ }
+ fileName := filepath.Base(filePath)
 
- f, fDiags, err := parser.ParseModuleFile(fs, fileName)
+ f, fDiags, err := parser.ParseModuleFile(fs, filePath)
  if err != nil {
  return err
  }

internal/terraform/module/module_ops_test.go

@@ -13,7 +13,6 @@ import (
  "log"
  "net/http"
  "net/http/httptest"
- "os"
  "path/filepath"
  "sync"
  "testing"
@@ -973,21 +972,6 @@ func TestParseModuleConfiguration(t *testing.T) {
  t.Fatal(err)
  }
 
- fmt.Println("--------before---------")
- fmt.Println(string(before.ParsedModuleFiles["foo.tf"].Bytes))
- fmt.Println("--------before---------")
-
-
- f, err := os.OpenFile(filepath.Join(singleFileModulePath, "foo.tf"),
- os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
- if err != nil {
- t.Fatal(err)
- }
- if _, err := f.WriteString("\n\nvariable \"awesome\" {\n\n}\n"); err != nil {
- t.Fatal(err)
- }
- f.Close()
-
  // ignore job state
  ctx = job.WithIgnoreState(ctx, true)
 
@@ -1007,30 +991,25 @@ func TestParseModuleConfiguration(t *testing.T) {
  if err != nil {
  t.Fatal(err)
  }
- fmt.Println("--------after---------")
- fmt.Println(string(after.ParsedModuleFiles["foo.tf"].Bytes))
- fmt.Println("--------after---------")
-
 
  // test if foo.tf is not the same as first seen
  if before.ParsedModuleFiles["foo.tf"] == after.ParsedModuleFiles["foo.tf"] {
  t.Fatal("file should mismatch")
  }
 
  // test if main.tf is the same as first seen
- if before.ParsedModuleFiles["main.tf"] == after.ParsedModuleFiles["main.tf"] {
+ if before.ParsedModuleFiles["main.tf"] != after.ParsedModuleFiles["main.tf"] {
  t.Fatal("file mismatch")
  }
 
- // examine diags should change for foo.tf
- diagsBefore := before.ModuleDiagnostics["foo.tf"]
- diagsAfter := after.ModuleDiagnostics["foo.tf"]
- // if before.ModuleDiagnostics["foo.tf"] == after.ModuleDiagnostics["foo.tf"] {
- // t.Fatal("diags should mismatch")
- // }
+ // examine diags should change for foo.tf
+ if before.ModuleDiagnostics["foo.tf"][0] == after.ModuleDiagnostics["foo.tf"][0] {
+ t.Fatal("diags should mismatch")
+ }
 
- if diff := cmp.Diff(diagsBefore, diagsAfter, ctydebug.CmpOptions); diff != "" {
- t.Fatalf("diags should mismatch: %s", diff)
+ // examine diags should change for main.tf
+ if before.ModuleDiagnostics["main.tf"][0] != after.ModuleDiagnostics["main.tf"][0] {
+ t.Fatal("diags should match")
  }
 }
 

internal/terraform/module/testdata/single-file-change-module/foo.tf

@@ -5,4 +5,4 @@ variable "gogo" {
 
 variable "awesome" {
 
-}
+

internal/terraform/module/testdata/single-file-change-module/main.tf

@@ -1,3 +1,3 @@
 variable "wakka" {
 
-}
+

internal/terraform/parser/module.go

@@ -54,14 +54,14 @@ func ParseModuleFiles(fs FS, modPath string) (ast.ModFiles, ast.ModDiags, error)
  return files, diags, nil
 }
 
-func ParseModuleFile(fs FS, fileName string) (*hcl.File, hcl.Diagnostics, error) {
- src, err := fs.ReadFile(fileName)
+func ParseModuleFile(fs FS, filePath string) (*hcl.File, hcl.Diagnostics, error) {
+ src, err := fs.ReadFile(filePath)
  if err != nil {
  // If a file isn't accessible, return
  return nil, nil, err
  }
 
- name := filepath.Base((fileName))
+ name := filepath.Base(filePath)
  filename := ast.ModFilename(name)
 
  f, pDiags := parseFile(src, filename)