Merge branch 'main' into feat/poam-phase1

Author: AKAbdulHanif

cmd/dashboards/export.go

@@ -35,10 +35,7 @@ func exportDashboards(cmd *cobra.Command, args []string) {
 	}
 	sugar := zapLogger.Sugar()
 	defer func() {
-		err := zapLogger.Sync() // flushes buffer, if any
-		if err != nil {
-			sugar.Error("failed to flush sync buffer", "err", err)
-		}
+		_ = zapLogger.Sync() // Flushes buffer, if any. We ignore errors here (that are commonly-seen) as distracting and not of note.
 	}()
 
 	config := config.NewConfig(sugar)

cmd/dashboards/import.go

@@ -41,10 +41,7 @@ func importDashboards(cmd *cobra.Command, args []string) {
 	}
 	sugar := zapLogger.Sugar()
 	defer func() {
-		err := zapLogger.Sync()
-		if err != nil {
-			sugar.Error("failed to flush sync buffer", "err", err)
-		}
+		_ = zapLogger.Sync() // Flushes buffer, if any. We ignore errors here (that are commonly-seen) as distracting and not of note.
 	}()
 
 	cfg := config.NewConfig(sugar)

cmd/migrate.go

@@ -50,10 +50,7 @@ func migrateUp(cmd *cobra.Command, args []string) {
 	}
 	sugar := zapLogger.Sugar()
 	defer func() {
-		err := zapLogger.Sync()
-		if err != nil {
-			sugar.Error("failed to sync zap logger", "error", err)
-		}
+		_ = zapLogger.Sync() // Flushes buffer, if any. We ignore errors here (that are commonly-seen) as distracting and not of note.
 	}()
 
 	cfg := config.NewConfig(sugar)
@@ -76,10 +73,7 @@ func migrateDown(cmd *cobra.Command, args []string) {
 	}
 	sugar := zapLogger.Sugar()
 	defer func() {
-		err := zapLogger.Sync()
-		if err != nil {
-			sugar.Error("failed to sync zap logger", "error", err)
-		}
+		_ = zapLogger.Sync() // Flushes buffer, if any. We ignore errors here (that are commonly-seen) as distracting and not of note.
 	}()
 
 	cfg := config.NewConfig(sugar)

cmd/oscal/export.go

@@ -38,10 +38,7 @@ func exportOscal(cmd *cobra.Command, args []string) {
 	}
 	sugar := zapLogger.Sugar()
 	defer func() {
-		err := zapLogger.Sync()
-		if err != nil {
-			log.Println("failed to sync logger:", err)
-		}
+		_ = zapLogger.Sync() // Flushes buffer, if any. We ignore errors here (that are commonly-seen) as distracting and not of note.
 	}()
 
 	config := config.NewConfig(sugar)

cmd/oscal/import.go

@@ -46,10 +46,7 @@ func importOscal(cmd *cobra.Command, args []string) {
 	}
 	sugar := zapLogger.Sugar()
 	defer func() {
-		err := zapLogger.Sync()
-		if err != nil {
-			sugar.Error("failed to sync zap logger", "error", err)
-		}
+		_ = zapLogger.Sync() // Flushes buffer, if any. We ignore errors here (that are commonly-seen) as distracting and not of note.
 	}()
 
 	config := config.NewConfig(sugar)

cmd/seed/evidence.go

@@ -59,10 +59,7 @@ func generateEvidence(cmd *cobra.Command, args []string) {
 	}
 	sugar := zapLogger.Sugar()
 	defer func() {
-		err := zapLogger.Sync()
-		if err != nil {
-			log.Println("failed to sync logger:", err)
-		}
+		_ = zapLogger.Sync() // Flushes buffer, if any. We ignore errors here (that are commonly-seen) as distracting and not of note.
 	}()
 
 	cmdConfig := config.NewConfig(sugar)

cmd/seed/heartbeat.go

@@ -53,10 +53,7 @@ func generateHeartbeats(cmd *cobra.Command, args []string) {
 	}
 	sugar := zapLogger.Sugar()
 	defer func() {
-		err := zapLogger.Sync()
-		if err != nil {
-			log.Println("failed to sync logger:", err)
-		}
+		_ = zapLogger.Sync() // Flushes buffer, if any. We ignore errors here (that are commonly-seen) as distracting and not of note.
 	}()
 
 	cmdConfig := config.NewConfig(sugar)