chore(backport): discard temp-file cleanup errors explicitly

A temporary file or directory that cannot be removed, or closed after
its write already failed, leaves nothing to act on: the run's result is
the same, and the primary error is the one returned. The test that
unsets an environment variable now fails if it cannot.

Assisted-by: LLM
Signed-off-by: Aleksei Sviridkin <f@lex.la>
This commit is contained in:
Aleksei Sviridkin committed 2026-11-13 12:35:02 +03:00
1 parent 7a481c4765
commit 50959ccca2
7 files changed
+16 -14

No files matched your search

+1 -1
View File
@@ -99,7 +99,7 @@ func apiSnapshot(commit string) (apigate.Snapshot, error) {
if err != nil {
return nil, err
}
defer os.RemoveAll(dir)
defer func() { _ = os.RemoveAll(dir) }()
for name, blob := range paths {
file := filepath.Join(dir, filepath.FromSlash(name))
if err := os.MkdirAll(filepath.Dir(file), 0o700); err != nil {
+2 -2
View File
@@ -727,7 +727,7 @@ func (a *app) publish(b *batch, p publication, rebuilt bool) error {
if err != nil {
return err
}
defer os.Remove(name)
defer func() { _ = os.Remove(name) }()
if b.pr == nil {
n, url, err := a.gh.createPull(b.line.branch(), p.branch, p.title, name)
if err != nil {
@@ -828,7 +828,7 @@ func (a *app) closeBatch(b *batch, p publication) error {
if err != nil {
return err
}
defer os.Remove(name)
defer func() { _ = os.Remove(name) }()
if err := a.stillOpen(c.PR); err != nil {
return err
}
+1 -1
View File
@@ -367,7 +367,7 @@ func (b *batch) alreadyApplied(pre, cur, post string) (applied, unsupported bool
if err != nil {
return false, false, err
}
defer os.RemoveAll(dir)
defer func() { _ = os.RemoveAll(dir) }()
names := map[string]string{}
for _, f := range []struct{ name, oid string }{{"cur", cur}, {"pre", pre}, {"post", post}} {
names[f.name] = filepath.Join(dir, f.name)
+3 -3
View File
@@ -229,7 +229,7 @@ func (a *app) announced(pr *pullRequest, rec *lineRecord, parks []parkedEntry) e
if err != nil {
return err
}
defer os.Remove(name)
defer func() { _ = os.Remove(name) }()
return a.gh.editBody(pr.Number, name)
}
@@ -309,9 +309,9 @@ func (a *app) comment(pr *pullRequest, mention string, today time.Time, text []s
if err != nil {
return a.fail(err)
}
defer os.Remove(f.Name())
defer func() { _ = os.Remove(f.Name()) }()
if _, err := f.WriteString(b.String()); err != nil {
f.Close()
_ = f.Close()
return a.fail(err)
}
if err := f.Close(); err != nil {
+4 -4
View File
@@ -850,7 +850,7 @@ func (a *app) postReport(n int, s storedReport) error {
if err != nil {
return err
}
defer os.Remove(name)
defer func() { _ = os.Remove(name) }()
return a.gh.createComment(n, name)
}
@@ -873,12 +873,12 @@ func writeTemp(pattern, content string) (string, error) {
return "", err
}
if _, err := f.WriteString(content); err != nil {
f.Close()
os.Remove(f.Name())
_ = f.Close()
_ = os.Remove(f.Name())
return "", err
}
if err := f.Close(); err != nil {
os.Remove(f.Name())
_ = os.Remove(f.Name())
return "", err
}
return f.Name(), nil
+3 -1
View File
@@ -224,7 +224,9 @@ func TestReportPartition(t *testing.T) {
}
t.Setenv("GIT_COMMITTER_DATE", "2026-01-01T00:00:00Z")
f.pr(4, "fix(app): four, before the start", "", map[string]string{"app/four.txt": "4\n"})
os.Unsetenv("GIT_COMMITTER_DATE")
if err := os.Unsetenv("GIT_COMMITTER_DATE"); err != nil {
t.Fatal(err)
}
f.setPolicy("release-1.0: 2026-06-01\n")
f.onLine("release-1.0", "fix(app): a line-only eleven", map[string]string{"app/eleven.txt": "line\n"})
pr(5, "fix(app): five", map[string]string{"app/five.txt": "5\n"}, true)
+2 -2
View File
@@ -121,9 +121,9 @@ func commitMerge(base, tip, message string) (string, error) {
if err != nil {
return "", err
}
defer os.Remove(f.Name())
defer func() { _ = os.Remove(f.Name()) }()
if _, err := f.WriteString(message); err != nil {
f.Close()
_ = f.Close()
return "", err
}
if err := f.Close(); err != nil {