golangci-lint update 1.56.2

Signed-off-by: Navid Yaghoobi <[email protected]>
containers · Mar 6, 2024 · 909ba46 · 909ba46
1 parent cf2dd6e
commit 909ba46
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -19,6 +19,7 @@ linters:
     - interfacer
     - scopelint
     - gomoddirectives
+    - depguard
     # deprecated
     - varcheck
     - deadcode

diff --git a/Makefile b/Makefile
@@ -101,7 +101,7 @@ install.tools: .install.pre-commit .install.codespell .install.golangci-lint .in
 
 .PHONY: .install.golangci-lint
 .install.golangci-lint:
-	VERSION=1.51.1 ./hack/install_golangci.sh
+	VERSION=1.56.2 ./hack/install_golangci.sh
 
 #=================================================
 # Linting/Formatting/Code Validation targets

diff --git a/cmd/root.go b/cmd/root.go
@@ -30,7 +30,7 @@ volumes and networks information.`,
 	Run:     run,
 }
 
-func preRun(cmd *cobra.Command, args []string) error {
+func preRun(cmd *cobra.Command, _ []string) error {
 	version.Version = buildVersion
 	version.Revision = buildRevision
 	version.Branch = buildBranch
@@ -51,7 +51,6 @@ func preRun(cmd *cobra.Command, args []string) error {
 func run(cmd *cobra.Command, args []string) {
 	if err := exporter.Start(cmd, args); err != nil {
 		log.Panic(err.Error())
-		os.Exit(1)
 	}
 }
 

diff --git a/collector/collector.go b/collector/collector.go
@@ -79,6 +79,7 @@ func NewPodmanCollector(logger log.Logger) (*PodmanCollector, error) {
 			if err != nil {
 				return nil, err
 			}
+
 			collectors[key] = collector
 			initiatedCollectors[key] = collector
 		}
@@ -136,6 +137,7 @@ func execute(name string, c Collector, ch chan<- prometheus.Metric, logger log.L
 			name,
 			"duration_seconds",
 			duration.Seconds())
+
 		success = 1
 	}
 

diff --git a/exporter/exporter.go b/exporter/exporter.go
@@ -14,7 +14,7 @@ import (
 )
 
 // Start starts prometheus exporter.
-func Start(cmd *cobra.Command, args []string) error {
+func Start(cmd *cobra.Command, _ []string) error {
 	// setup exporter
 	promlogConfig := &promlog.Config{Level: &promlog.AllowedLevel{}}
 
@@ -64,7 +64,7 @@ func Start(cmd *cobra.Command, args []string) error {
 
 	level.Info(logger).Log("msg", "Starting podman-prometheus-exporter", "version", version.Info())
 	http.Handle(webTelemetryPath, newHandler(webDisableExporterMetrics, webMaxRequests, logger))
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("/", func(w http.ResponseWriter, _ *http.Request) {
 		w.Write([]byte(`<html>
 			<head><title>Podman Exporter</title></head>
 			<body>

diff --git a/exporter/handler.go b/exporter/handler.go
@@ -67,12 +67,13 @@ func newHandler(disableExporterMetrics bool, maxRequests int, logger log.Logger)
 		)
 	}
 
-	if innerHandler, err := h.innerHandler(); err != nil {
+	innerHandler, err := h.innerHandler()
+	if err != nil {
 		panic(fmt.Sprintf("Couldn't create metrics handler: %s", err))
-	} else {
-		h.unfilteredHandler = innerHandler
 	}
 
+	h.unfilteredHandler = innerHandler
+
 	return h
 }