Skip to content

Commit 9752a2d

Browse files
committed
refactor: createTmpFileWithContent use named returns to catch file close errors from deferred function
1 parent 669b04c commit 9752a2d

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

internal/certinfo/main_test.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ func TestMain(m *testing.M) {
9999

100100
generateRSACertificateData()
101101

102-
m.Run()
103-
104102
// Cleanup
105103
defer func() {
106104
filesToDel := []string{
@@ -120,6 +118,8 @@ func TestMain(m *testing.M) {
120118
}
121119
}
122120
}()
121+
122+
m.Run()
123123
}
124124

125125
func (MockInputReader) ReadPassword(_ int) ([]byte, error) {
@@ -298,18 +298,23 @@ func GenerateCertificate(tpl certificateTemplate) ([]byte, *x509.Certificate, er
298298
return certPEM, certificate, nil
299299
}
300300

301-
func createTmpFileWithContent(tempDir string, filePattern string, fileContent []byte) (string, error) {
301+
func createTmpFileWithContent(
302+
tempDir string,
303+
filePattern string,
304+
fileContent []byte,
305+
) (filePath string, err error) {
302306
f, err := os.CreateTemp(tempDir, filePattern)
303307
if err != nil {
304308
return emptyString, err
305309
}
306310

307311
defer func() {
308-
err = errors.Join(err, f.Close())
312+
if closeErr := f.Close(); closeErr != nil {
313+
err = errors.Join(err, closeErr)
314+
}
309315
}()
310316

311-
err = os.WriteFile(f.Name(), fileContent, 0644)
312-
if err != nil {
317+
if err = os.WriteFile(f.Name(), fileContent, 0644); err != nil {
313318
return emptyString, err
314319
}
315320

0 commit comments

Comments
 (0)