fix(app): assign the temp-file close result on the error path
Each atomic-write helper returned the write error while silently dropping the close result. The success path already checks it.
This commit is contained in:
4 files changed
+9
-9
No files matched your search
@@ -32,11 +32,11 @@ func writeEmbeddedNATSEndpoint(stateDir, url, token string) error {
|
|||||||
tmpName := tmp.Name()
|
tmpName := tmp.Name()
|
||||||
defer os.Remove(tmpName)
|
defer os.Remove(tmpName)
|
||||||
if err := tmp.Chmod(0o600); err != nil {
|
if err := tmp.Chmod(0o600); err != nil {
|
||||||
tmp.Close()
|
_ = tmp.Close()
|
||||||
return fmt.Errorf("protect embedded NATS endpoint: %w", err)
|
return fmt.Errorf("protect embedded NATS endpoint: %w", err)
|
||||||
}
|
}
|
||||||
if _, err := tmp.Write(data); err != nil {
|
if _, err := tmp.Write(data); err != nil {
|
||||||
tmp.Close()
|
_ = tmp.Close()
|
||||||
return fmt.Errorf("write embedded NATS endpoint: %w", err)
|
return fmt.Errorf("write embedded NATS endpoint: %w", err)
|
||||||
}
|
}
|
||||||
if err := tmp.Close(); err != nil {
|
if err := tmp.Close(); err != nil {
|
||||||
|
|||||||
@@ -296,15 +296,15 @@ func writeFileAtomicMode(path string, data []byte, mode os.FileMode) error {
|
|||||||
name := tmp.Name()
|
name := tmp.Name()
|
||||||
defer os.Remove(name) // no-op after a successful rename
|
defer os.Remove(name) // no-op after a successful rename
|
||||||
if err := tmp.Chmod(mode); err != nil {
|
if err := tmp.Chmod(mode); err != nil {
|
||||||
tmp.Close()
|
_ = tmp.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if _, err := tmp.Write(data); err != nil {
|
if _, err := tmp.Write(data); err != nil {
|
||||||
tmp.Close()
|
_ = tmp.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := tmp.Sync(); err != nil {
|
if err := tmp.Sync(); err != nil {
|
||||||
tmp.Close()
|
_ = tmp.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := tmp.Close(); err != nil {
|
if err := tmp.Close(); err != nil {
|
||||||
|
|||||||
@@ -227,7 +227,7 @@ func writeJSON(path string, v any) error {
|
|||||||
}
|
}
|
||||||
defer os.Remove(f.Name())
|
defer os.Remove(f.Name())
|
||||||
if _, err := f.Write(append(data, '\n')); err != nil {
|
if _, err := f.Write(append(data, '\n')); err != nil {
|
||||||
f.Close()
|
_ = f.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := f.Close(); err != nil {
|
if err := f.Close(); err != nil {
|
||||||
|
|||||||
@@ -124,15 +124,15 @@ func writeEnvFileAtomic(path string, data []byte) error {
|
|||||||
name := tmp.Name()
|
name := tmp.Name()
|
||||||
defer os.Remove(name) // no-op after a successful rename
|
defer os.Remove(name) // no-op after a successful rename
|
||||||
if err := tmp.Chmod(0o600); err != nil {
|
if err := tmp.Chmod(0o600); err != nil {
|
||||||
tmp.Close()
|
_ = tmp.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if _, err := tmp.Write(data); err != nil {
|
if _, err := tmp.Write(data); err != nil {
|
||||||
tmp.Close()
|
_ = tmp.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := tmp.Sync(); err != nil {
|
if err := tmp.Sync(); err != nil {
|
||||||
tmp.Close()
|
_ = tmp.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := tmp.Close(); err != nil {
|
if err := tmp.Close(); err != nil {
|
||||||
|
|||||||
Reference in new issue
Block a user