add cleanup functions

hashicorp · Jan 11, 2022 · 3941b46 · 3941b46
1 parent cb8cb6b
commit 3941b46
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/internal/langserver/handlers/complete_test.go b/internal/langserver/handlers/complete_test.go
@@ -854,6 +854,11 @@ func tfExecutor(t *testing.T, workdir, tfVersion string) exec.TerraformExecutor
  if err := os.MkdirAll(installDir, 0o755); err != nil {
  t.Fatal(err)
  }
+ t.Cleanup(func() {
+ if err := os.Remove(installDir); err != nil {
+ t.Fatal(err)
+ }
+ })
 
  i := hcinstall.NewInstaller()
  v := version.Must(version.NewVersion(tfVersion))
@@ -873,6 +878,12 @@ func tfExecutor(t *testing.T, workdir, tfVersion string) exec.TerraformExecutor
  t.Fatal(err)
  }
 
+ t.Cleanup(func() {
+ if err := i.Remove(ctx); err != nil {
+ t.Fatal(err)
+ }
+ })
+
  tfExec, err := exec.NewExecutor(workdir, execPath)
  if err != nil {
  t.Fatal(err)

diff --git a/internal/schemas/gen/gen.go b/internal/schemas/gen/gen.go
@@ -106,6 +106,8 @@ func gen() error {
  return err
  }
 
+ defer i.Remove(ctx)
+
  log.Println("running terraform init")
 
  cwd, err := os.Getwd()

diff --git a/internal/terraform/exec/exec_test.go b/internal/terraform/exec/exec_test.go
@@ -64,10 +64,14 @@ func newExecutor(t *testing.T) TerraformExecutor {
  ctx := context.Background()
  workDir := TempDir(t)
  installDir := filepath.Join(workDir, "hcinstall")
- err := os.MkdirAll(installDir, 0755)
- if err != nil {
+ if err := os.MkdirAll(installDir, 0755); err != nil {
  t.Fatal(err)
  }
+ t.Cleanup(func() {
+ if err := os.Remove(installDir); err != nil {
+ t.Fatal(err)
+ }
+ })
 
  i := hcinstall.NewInstaller()
 
@@ -81,6 +85,12 @@ func newExecutor(t *testing.T) TerraformExecutor {
  t.Fatal(err)
  }
 
+ t.Cleanup(func() {
+ if err := i.Remove(ctx); err != nil {
+ t.Fatal(err)
+ }
+ })
+
  e, err := NewExecutor(workDir, execPath)
  if err != nil {
  t.Fatal(err)