Skip to content

Fix temp state dir leak and unchecked Close in terraform bind #5521

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

Open
simonfaltum wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −2
Open

Fix temp state dir leak and unchecked Close in terraform bind #5521

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05f178f
Fix temp state dir leak and unchecked Close in terraform bind
simonfaltum Jun 9, 2026
cc230ab
Remove redundant comments
simonfaltum Jun 10, 2026
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
9 changes: 7 additions & 2 deletions bundle/deploy/terraform/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func (m *importResource) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn
if err != nil {
return diag.Errorf("terraform init: %v", err)
}
defer os.RemoveAll(tmpDir)
relPath, _ := b.StateFilenameTerraform(ctx)
tmpState := filepath.Join(tmpDir, filepath.Base(relPath))

Expand All @@ -62,8 +63,6 @@ func (m *importResource) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn
return diag.Errorf("terraform plan: %v", err)
}

defer os.RemoveAll(tmpDir)

if changed && !m.opts.AutoApprove {
output := buf.String()
// Remove output starting from Warning until end of output, if present.
Expand Down Expand Up @@ -103,6 +102,12 @@ func (m *importResource) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn
return diag.FromErr(err)
}

// A failed Close can mean a truncated state file; the deferred Close above covers error paths.
err = f.Close()
if err != nil {
return diag.FromErr(err)
}

return diags
}

Expand Down
Loading