lint: fix nilaway warnings (part 10) (#3875)

Author: mmetc

cmd/crowdsec-cli/climetrics/list.go

@@ -1,16 +1,16 @@
 package climetrics
 
 import (
+	"cmp"
 	"encoding/json"
 	"fmt"
+	"slices"
 
 	"github.com/fatih/color"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/jedib0t/go-pretty/v6/text"
 	"github.com/spf13/cobra"
 
-	"github.com/crowdsecurity/go-cs-lib/maptools"
-
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/args"
 	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/cstable"
 )
@@ -25,15 +25,23 @@ func (cli *cliMetrics) list() error {
 	var allMetrics []metricType
 
 	ms := NewMetricStore()
-	for _, section := range maptools.SortedKeys(ms) {
-		title, description := ms[section].Description()
+	for sectionName, section := range ms {
+		if section == nil {
+			continue
+		}
+		title, description := section.Description()
 		allMetrics = append(allMetrics, metricType{
-			Type:        section,
+			Type:        sectionName,
 			Title:       title,
 			Description: description,
 		})
 	}
 
+	// consistent output order
+	slices.SortFunc(allMetrics, func(a, b metricType) int {
+		return cmp.Compare(a.Type, b.Type)
+	})
+
 	outputFormat := cli.cfg().Cscli.Output
 
 	switch outputFormat {

cmd/crowdsec-cli/climetrics/store.go

@@ -256,7 +256,10 @@ func (ms metricStore) Format(out io.Writer, wantColor string, sections []string,
 	switch outputFormat {
 	case "human":
 		for _, section := range maptools.SortedKeys(want) {
-			want[section].Table(out, wantColor, noUnit, showEmpty)
+			// always ok, but keep nilaway happy
+			if sec, ok := want[section]; ok && sec != nil {
+				sec.Table(out, wantColor, noUnit, showEmpty)
+			}
 		}
 	case "json":
 		x, err := json.MarshalIndent(want, "", " ")

cmd/notification-file/main.go

@@ -64,24 +64,26 @@ var logger hclog.Logger = hclog.New(&hclog.LoggerOptions{
 	JSONFormat: true,
 })
 
-func (r *LogRotate) rotateLogs(cfg PluginConfig) {
+func (r *LogRotate) rotateLogs(cfg PluginConfig) error {
 	// Rotate the log file
 	err := r.rotateLogFile(cfg.LogPath, r.MaxFiles)
 	if err != nil {
-		logger.Error("Failed to rotate log file", "error", err)
+		return err
 	}
 	// Reopen the FileWriter
 	FileWriter.Close()
 	FileWriter, err = os.OpenFile(cfg.LogPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
-		logger.Error("Failed to reopen log file", "error", err)
+		return err
 	}
 	// Reset the file size
 	FileInfo, err := FileWriter.Stat()
 	if err != nil {
-		logger.Error("Failed to get file info", "error", err)
+		return err
 	}
 	FileSize = FileInfo.Size()
+
+	return nil
 }
 
 func (r *LogRotate) rotateLogFile(logPath string, maxBackups int) error {
@@ -193,7 +195,9 @@ func WriteToFileWithCtx(ctx context.Context, cfg PluginConfig, log string) error
 		if FileSize > int64(cfg.LogRotate.MaxSize)*1024*1024 && cfg.LogRotate.Enabled {
 			logger.Debug("Rotating log file", "file", cfg.LogPath)
 			// Rotate the log file
-			cfg.LogRotate.rotateLogs(cfg)
+			if err = cfg.LogRotate.rotateLogs(cfg); err != nil {
+				logger.Error("Failed to rotate log file", "error", err)
+			}
 		}
 	}
 	return err