defer closing the audit file

kubernetes · Jun 15, 2022 · 5333ec5 · 5333ec5
1 parent d561628
commit 5333ec5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go
@@ -76,6 +76,7 @@ func LogCommandEnd(id string) error {
 	if err := openAuditLog(); err != nil {
 		return err
 	}
+	defer closeAuditLog()
 	var logs []string
 	s := bufio.NewScanner(currentLogFile)
 	for s.Scan() {
@@ -84,9 +85,7 @@ func LogCommandEnd(id string) error {
 	if err := s.Err(); err != nil {
 		return fmt.Errorf("failed to read from audit file: %v", err)
 	}
-	if err := closeAuditLog(); err != nil {
-		return err
-	}
+	closeAuditLog()
 	rowSlice, err := logsToRows(logs)
 	if err != nil {
 		return fmt.Errorf("failed to convert logs to rows: %v", err)
@@ -118,7 +117,7 @@ func LogCommandEnd(id string) error {
 	if _, err = currentLogFile.Write([]byte(auditContents)); err != nil {
 		return fmt.Errorf("failed to write to audit log: %v", err)
 	}
-	return closeAuditLog()
+	return nil
 }
 
 // shouldLog returns if the command should be logged.

diff --git a/pkg/minikube/audit/logFile.go b/pkg/minikube/audit/logFile.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"os"
 
+	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/out/register"
 )
@@ -39,11 +40,10 @@ func openAuditLog() error {
 }
 
 // closeAuditLog closes the audit log file
-func closeAuditLog() error {
+func closeAuditLog() {
 	if err := currentLogFile.Close(); err != nil {
-		return fmt.Errorf("failed to close the audit log: %v", err)
+		klog.Errorf("failed to close the audit log: %v", err)
 	}
-	return nil
 }
 
 // appendToLog appends the row to the log file.
@@ -56,8 +56,9 @@ func appendToLog(row *row) error {
 	if err := openAuditLog(); err != nil {
 		return err
 	}
+	defer closeAuditLog()
 	if _, err := currentLogFile.WriteString(string(bs) + "\n"); err != nil {
 		return fmt.Errorf("unable to write to audit log: %v", err)
 	}
-	return closeAuditLog()
+	return nil
 }
diff --git a/pkg/minikube/audit/logFile_test.go b/pkg/minikube/audit/logFile_test.go
@@ -28,20 +28,18 @@ import (
 )
 
 func TestLogFile(t *testing.T) {
-	t.Run("OpenAndCloseAuditLog", func(t *testing.T) {
+	t.Run("OpenAuditLog", func(t *testing.T) {
 		// make sure logs directory exists
 		if err := os.MkdirAll(filepath.Dir(localpath.AuditLog()), 0755); err != nil {
 			t.Fatalf("Error creating logs directory: %v", err)
 		}
 		if err := openAuditLog(); err != nil {
 			t.Fatal(err)
 		}
-		if err := closeAuditLog(); err != nil {
-			t.Fatal(err)
-		}
 	})
 
 	t.Run("AppendToLog", func(t *testing.T) {
+		defer closeAuditLog()
 		f, err := os.CreateTemp("", "audit.json")
 		if err != nil {
 			t.Fatalf("Error creating temporary file: %v", err)

diff --git a/pkg/minikube/audit/report.go b/pkg/minikube/audit/report.go
@@ -35,6 +35,7 @@ func Report(lastNLines int) (*RawReport, error) {
 	if err := openAuditLog(); err != nil {
 		return nil, err
 	}
+	defer closeAuditLog()
 	var logs []string
 	s := bufio.NewScanner(currentLogFile)
 	for s.Scan() {
@@ -47,9 +48,6 @@ func Report(lastNLines int) (*RawReport, error) {
 	if err := s.Err(); err != nil {
 		return nil, fmt.Errorf("failed to read from audit file: %v", err)
 	}
-	if err := closeAuditLog(); err != nil {
-		return nil, err
-	}
 	rows, err := logsToRows(logs)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert logs to rows: %v", err)