Merge pull request #1101 from SergeyKanzhelev/format-imports

k8s-ci-robot · web-flow · commit 8b4595d9cb44 · 2025-08-13T12:59:08.000-07:00
format imports
diff --git a/.golangci.yml b/.golangci.yml
@@ -19,6 +19,20 @@ issues:
   max-issues-per-linter: 0
   max-same-issues: 0
 formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - localmodule
+    goimports:
+      local-prefixes:
+        - k8s.io/node-problem-detector
   exclusions:
     generated: lax
     paths:
diff --git a/Makefile b/Makefile
@@ -130,8 +130,9 @@ vet:
 		grep -v "./vendor/*" | \
 		xargs go vet -tags "$(HOST_PLATFORM_BUILD_TAGS)"
 
-fmt:
+fmt: $(GOLANGCI_LINT)
 	find . -type f -name "*.go" | grep -v "./vendor/*" | xargs gofmt -s -w -l
+	$(GOLANGCI_LINT) run --config .golangci.yml --fix ./...
 
 version:
 	@echo $(VERSION)
diff --git a/cmd/healthchecker/health_checker.go b/cmd/healthchecker/health_checker.go
@@ -22,8 +22,8 @@ import (
 	"os"
 
 	"github.com/spf13/pflag"
-
 	"k8s.io/klog/v2"
+
 	"k8s.io/node-problem-detector/cmd/healthchecker/options"
 	"k8s.io/node-problem-detector/pkg/custompluginmonitor/types"
 	"k8s.io/node-problem-detector/pkg/healthchecker"
diff --git a/cmd/nodeproblemdetector/node_problem_detector_test.go b/cmd/nodeproblemdetector/node_problem_detector_test.go
@@ -71,8 +71,7 @@ func init() {
 	})
 }
 
-type nullExporter struct {
-}
+type nullExporter struct{}
 
 func (ne *nullExporter) ExportProblems(*types.Status) {
 }
@@ -96,7 +95,7 @@ func writeTempFile(t *testing.T, ext string, contents string) (string, error) {
 
 	fileName := f.Name()
 
-	if err := os.WriteFile(fileName, []byte(contents), 0644); err != nil {
+	if err := os.WriteFile(fileName, []byte(contents), 0o644); err != nil {
 		os.Remove(fileName)
 		return "", fmt.Errorf("cannot write config to temp file %s, %v", fileName, err)
 	}
diff --git a/cmd/nodeproblemdetector/node_problem_detector_unix.go b/cmd/nodeproblemdetector/node_problem_detector_unix.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/spf13/pflag"
 	"k8s.io/klog/v2"
+
 	"k8s.io/node-problem-detector/cmd/options"
 )
 
diff --git a/cmd/options/options.go b/cmd/options/options.go
@@ -19,11 +19,10 @@ package options
 import (
 	"flag"
 	"fmt"
+	"net/url"
 	"os"
 	"time"
 
-	"net/url"
-
 	"github.com/spf13/pflag"
 
 	"k8s.io/node-problem-detector/pkg/exporters"
diff --git a/pkg/custompluginmonitor/custom_plugin_monitor.go b/pkg/custompluginmonitor/custom_plugin_monitor.go
@@ -39,7 +39,8 @@ func init() {
 		CustomPluginMonitorName,
 		types.ProblemDaemonHandler{
 			CreateProblemDaemonOrDie: NewCustomPluginMonitorOrDie,
-			CmdOptionDescription:     "Set to config file paths."})
+			CmdOptionDescription:     "Set to config file paths.",
+		})
 }
 
 type customPluginMonitor struct {
diff --git a/pkg/custompluginmonitor/plugin/plugin.go b/pkg/custompluginmonitor/plugin/plugin.go
@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"k8s.io/klog/v2"
+
 	cpmtypes "k8s.io/node-problem-detector/pkg/custompluginmonitor/types"
 	"k8s.io/node-problem-detector/pkg/util"
 	"k8s.io/node-problem-detector/pkg/util/tomb"
diff --git a/pkg/custompluginmonitor/types/config_test.go b/pkg/custompluginmonitor/types/config_test.go
@@ -197,9 +197,10 @@ func TestCustomPluginConfigApplyConfiguration(t *testing.T) {
 			},
 		},
 		"disable status update during initialization": {
-			Orig: CustomPluginConfig{PluginGlobalConfig: pluginGlobalConfig{
-				SkipInitialStatus: &disableInitialStatusUpdate,
-			},
+			Orig: CustomPluginConfig{
+				PluginGlobalConfig: pluginGlobalConfig{
+					SkipInitialStatus: &disableInitialStatusUpdate,
+				},
 			},
 			Wanted: CustomPluginConfig{
 				PluginGlobalConfig: pluginGlobalConfig{
diff --git a/pkg/exporters/k8sexporter/condition/manager.go b/pkg/exporters/k8sexporter/condition/manager.go
@@ -22,14 +22,13 @@ import (
 	"sync"
 	"time"
 
-	"k8s.io/node-problem-detector/pkg/exporters/k8sexporter/problemclient"
-	"k8s.io/node-problem-detector/pkg/types"
-	problemutil "k8s.io/node-problem-detector/pkg/util"
-
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/clock"
 
-	"k8s.io/klog/v2"
+	"k8s.io/node-problem-detector/pkg/exporters/k8sexporter/problemclient"
+	"k8s.io/node-problem-detector/pkg/types"
+	problemutil "k8s.io/node-problem-detector/pkg/util"
 )
 
 const (
diff --git a/pkg/exporters/k8sexporter/condition/manager_test.go b/pkg/exporters/k8sexporter/condition/manager_test.go
@@ -23,13 +23,12 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	v1 "k8s.io/api/core/v1"
+	testclock "k8s.io/utils/clock/testing"
 
 	"k8s.io/node-problem-detector/pkg/exporters/k8sexporter/problemclient"
 	"k8s.io/node-problem-detector/pkg/types"
 	problemutil "k8s.io/node-problem-detector/pkg/util"
-
-	v1 "k8s.io/api/core/v1"
-	testclock "k8s.io/utils/clock/testing"
 )
 
 const heartbeatPeriod = 1 * time.Minute
diff --git a/pkg/exporters/k8sexporter/k8s_exporter.go b/pkg/exporters/k8sexporter/k8s_exporter.go
@@ -23,9 +23,8 @@ import (
 	"net/http/pprof"
 	"strconv"
 
-	"k8s.io/klog/v2"
-
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/clock"
 
 	"k8s.io/node-problem-detector/cmd/options"
diff --git a/pkg/exporters/k8sexporter/problemclient/problem_client_test.go b/pkg/exporters/k8sexporter/problemclient/problem_client_test.go
@@ -22,12 +22,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/record"
 	testclock "k8s.io/utils/clock/testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 const (
diff --git a/pkg/exporters/register.go b/pkg/exporters/register.go
@@ -22,9 +22,7 @@ import (
 	"k8s.io/node-problem-detector/pkg/types"
 )
 
-var (
-	handlers = make(map[types.ExporterType]types.ExporterHandler)
-)
+var handlers = make(map[types.ExporterType]types.ExporterHandler)
 
 // Register registers a exporter factory method, which will be used to create the exporter.
 func Register(exporterType types.ExporterType, handler types.ExporterHandler) {
diff --git a/pkg/exporters/stackdriver/stackdriver_exporter.go b/pkg/exporters/stackdriver/stackdriver_exporter.go
@@ -25,12 +25,12 @@ import (
 
 	"contrib.go.opencensus.io/exporter/stackdriver"
 	monitoredres "contrib.go.opencensus.io/exporter/stackdriver/monitoredresource"
+	"github.com/avast/retry-go/v4"
 	"github.com/spf13/pflag"
 	"go.opencensus.io/stats/view"
 	"google.golang.org/api/option"
 	"k8s.io/klog/v2"
 
-	"github.com/avast/retry-go/v4"
 	"k8s.io/node-problem-detector/pkg/exporters"
 	seconfig "k8s.io/node-problem-detector/pkg/exporters/stackdriver/config"
 	"k8s.io/node-problem-detector/pkg/types"
@@ -41,7 +41,8 @@ func init() {
 	clo := commandLineOptions{}
 	exporters.Register(exporterName, types.ExporterHandler{
 		CreateExporterOrDie: NewExporterOrDie,
-		Options:             &clo})
+		Options:             &clo,
+	})
 }
 
 const exporterName = "stackdriver"
@@ -95,7 +96,6 @@ var NPDMetricToSDMetric = map[metrics.MetricID]string{
 }
 
 func getMetricTypeConversionFunction(customMetricPrefix string) func(*view.View) string {
-
 	return func(view *view.View) string {
 		viewName := view.Measure.Name()
 
diff --git a/pkg/healthchecker/health_checker.go b/pkg/healthchecker/health_checker.go
@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"k8s.io/klog/v2"
+
 	"k8s.io/node-problem-detector/cmd/healthchecker/options"
 	"k8s.io/node-problem-detector/pkg/healthchecker/types"
 )
diff --git a/pkg/healthchecker/health_checker_linux.go b/pkg/healthchecker/health_checker_linux.go
@@ -38,7 +38,6 @@ func getUptimeFunc(service string) func() (time.Duration, error) {
 		// RestartSec of systemd and invoke interval of plugin got in sync. The service was repeatedly killed in
 		// activating state and hence ActiveEnterTimestamp was never updated.
 		out, err := execCommand(types.CmdTimeout, "systemctl", "show", service, "--property=InactiveExitTimestamp")
-
 		if err != nil {
 			return time.Duration(0), err
 		}
diff --git a/pkg/healthchecker/health_checker_test.go b/pkg/healthchecker/health_checker_test.go
@@ -150,8 +150,6 @@ func TestComponentsSupported(t *testing.T) {
 			if checkFunc == nil {
 				t.Errorf("component %v should be supported", tc.component)
 			}
-
 		})
 	}
-
 }
diff --git a/pkg/healthchecker/types/types.go b/pkg/healthchecker/types/types.go
@@ -81,12 +81,12 @@ func setKubeEndpoints() {
 
 	kubeletHealthCheckEndpoint = fmt.Sprintf("http://%s/healthz", net.JoinHostPort(hostAddress, kubeletPort))
 	kubeProxyHealthCheckEndpoint = fmt.Sprintf("http://%s/healthz", net.JoinHostPort(hostAddress, kubeProxyPort))
-
 }
 
 func KubeProxyHealthCheckEndpoint() string {
 	return kubeProxyHealthCheckEndpoint
 }
+
 func KubeletHealthCheckEndpoint() string {
 	return kubeletHealthCheckEndpoint
 }
diff --git a/pkg/problemdaemon/problem_daemon.go b/pkg/problemdaemon/problem_daemon.go
@@ -24,9 +24,7 @@ import (
 	"k8s.io/node-problem-detector/pkg/types"
 )
 
-var (
-	handlers = make(map[types.ProblemDaemonType]types.ProblemDaemonHandler)
-)
+var handlers = make(map[types.ProblemDaemonType]types.ProblemDaemonHandler)
 
 // Register registers a problem daemon factory method, which will be used to create the problem daemon.
 func Register(problemDaemonType types.ProblemDaemonType, handler types.ProblemDaemonHandler) {
diff --git a/pkg/systemlogmonitor/log_monitor.go b/pkg/systemlogmonitor/log_monitor.go
@@ -41,7 +41,8 @@ func init() {
 		SystemLogMonitorName,
 		types.ProblemDaemonHandler{
 			CreateProblemDaemonOrDie: NewLogMonitorOrDie,
-			CmdOptionDescription:     "Set to config file paths."})
+			CmdOptionDescription:     "Set to config file paths.",
+		})
 }
 
 type logMonitor struct {
diff --git a/pkg/systemlogmonitor/logwatchers/filelog/log_watcher.go b/pkg/systemlogmonitor/logwatchers/filelog/log_watcher.go
@@ -134,7 +134,7 @@ func (s *filelogWatcher) watchLoop() {
 }
 
 func (s *filelogWatcher) filterSkipList(line string) bool {
-	for _ , skipItem := range s.cfg.SkipList {
+	for _, skipItem := range s.cfg.SkipList {
 		if strings.Contains(line, skipItem) {
 			return true
 		}
diff --git a/pkg/systemlogmonitor/logwatchers/filelog/log_watcher_linux.go b/pkg/systemlogmonitor/logwatchers/filelog/log_watcher_linux.go
@@ -19,8 +19,9 @@ package filelog
 import (
 	"fmt"
 	"io"
-	"k8s.io/node-problem-detector/third_party/forked/cadvisor/tail"
 	"os"
+
+	"k8s.io/node-problem-detector/third_party/forked/cadvisor/tail"
 )
 
 // getLogReader returns log reader for filelog log. Note that getLogReader doesn't look back
diff --git a/pkg/systemlogmonitor/logwatchers/filelog/log_watcher_test.go b/pkg/systemlogmonitor/logwatchers/filelog/log_watcher_test.go
@@ -21,12 +21,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	testclock "k8s.io/utils/clock/testing"
+
 	"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"
 	logtypes "k8s.io/node-problem-detector/pkg/systemlogmonitor/types"
 	"k8s.io/node-problem-detector/pkg/util"
-
-	"github.com/stretchr/testify/assert"
-	testclock "k8s.io/utils/clock/testing"
 )
 
 // getTestPluginConfig returns a plugin config for test. Use configuration for
@@ -185,22 +185,21 @@ func TestFilterSkipList(t *testing.T) {
 			},
 		},
 	}
-	testcase := []struct{
-		log string
+	testcase := []struct {
+		log    string
 		expect bool
 	}{
 		{
-			log: `Jan  2 03:04:03 kernel: [0.000000] 1`,
+			log:    `Jan  2 03:04:03 kernel: [0.000000] 1`,
 			expect: false,
 		},
 		{
-			log: `Jan  2 03:04:04 audit: [1.000000] 2`,
+			log:    `Jan  2 03:04:04 audit: [1.000000] 2`,
 			expect: true,
 		},
 		{
-			log: `Jan  2 03:04:05 kubelet: [2.000000] 3`,
+			log:    `Jan  2 03:04:05 kubelet: [2.000000] 3`,
 			expect: true,
-
 		},
 	}
 	for i, test := range testcase {
diff --git a/pkg/systemlogmonitor/logwatchers/filelog/translator.go b/pkg/systemlogmonitor/logwatchers/filelog/translator.go
@@ -20,9 +20,9 @@ import (
 	"regexp"
 	"time"
 
-	logtypes "k8s.io/node-problem-detector/pkg/systemlogmonitor/types"
-
 	"k8s.io/klog/v2"
+
+	logtypes "k8s.io/node-problem-detector/pkg/systemlogmonitor/types"
 )
 
 // translator translates log line into internal log type based on user defined
diff --git a/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux_test.go b/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux_test.go
@@ -17,12 +17,12 @@ limitations under the License.
 package kmsg
 
 import (
-	testclock "k8s.io/utils/clock/testing"
 	"testing"
+	"time"
 
 	"github.com/euank/go-kmsg-parser/kmsgparser"
 	"github.com/stretchr/testify/assert"
-	"time"
+	testclock "k8s.io/utils/clock/testing"
 
 	"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"
 	logtypes "k8s.io/node-problem-detector/pkg/systemlogmonitor/types"
diff --git a/pkg/systemlogmonitor/logwatchers/log_watchers.go b/pkg/systemlogmonitor/logwatchers/log_watchers.go
@@ -17,9 +17,9 @@ limitations under the License.
 package logwatchers
 
 import (
-	"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"
-
 	"k8s.io/klog/v2"
+
+	"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"
 )
 
 // createFuncs is a table of createFuncs for all supported log watchers.
diff --git a/pkg/systemstatsmonitor/disk_collector.go b/pkg/systemstatsmonitor/disk_collector.go
@@ -307,7 +307,6 @@ func (dc *diskCollector) collect() {
 			dc.mPercentUsed.Record(map[string]string{deviceNameLabel: deviceName, fsTypeLabel: fstype, mountOptionLabel: opttypes, stateLabel: "used"}, float64(usageStat.UsedPercent))
 		}
 	}
-
 }
 
 // listRootBlockDevices lists all block devices that's not a slave or holder.
diff --git a/pkg/systemstatsmonitor/net_collector.go b/pkg/systemstatsmonitor/net_collector.go
diff --git a/pkg/systemstatsmonitor/net_collector_test.go b/pkg/systemstatsmonitor/net_collector_test.go
diff --git a/pkg/systemstatsmonitor/osfeature_collector.go b/pkg/systemstatsmonitor/osfeature_collector.go
diff --git a/pkg/systemstatsmonitor/system_stats_monitor.go b/pkg/systemstatsmonitor/system_stats_monitor.go
diff --git a/pkg/util/convert_test.go b/pkg/util/convert_test.go
diff --git a/pkg/util/metrics/helpers.go b/pkg/util/metrics/helpers.go
diff --git a/pkg/util/metrics/system/cmdline_args.go b/pkg/util/metrics/system/cmdline_args.go
diff --git a/pkg/util/metrics/system/cmdline_args_test.go b/pkg/util/metrics/system/cmdline_args_test.go
diff --git a/pkg/util/metrics/system/module_stats.go b/pkg/util/metrics/system/module_stats.go
diff --git a/pkg/util/metrics/system/module_stats_test.go b/pkg/util/metrics/system/module_stats_test.go

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ func init() {`
`71`	`71`	`})`
`72`	`72`	`}`
`73`	`73`
`74`		`-type nullExporter struct {`
`75`		`-}`
	`74`	`+type nullExporter struct{}`
`76`	`75`
`77`	`76`	`func (ne nullExporter) ExportProblems(types.Status) {`
`78`	`77`	`}`
`@@ -96,7 +95,7 @@ func writeTempFile(t *testing.T, ext string, contents string) (string, error) {`
`96`	`95`
`97`	`96`	`fileName := f.Name()`
`98`	`97`
`99`		`- if err := os.WriteFile(fileName, []byte(contents), 0644); err != nil {`
	`98`	`+ if err := os.WriteFile(fileName, []byte(contents), 0o644); err != nil {`
`100`	`99`	`os.Remove(fileName)`
`101`	`100`	`return "", fmt.Errorf("cannot write config to temp file %s, %v", fileName, err)`
`102`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`"github.com/spf13/pflag"`
`26`	`26`	`"k8s.io/klog/v2"`
	`27`	`+`
`27`	`28`	`"k8s.io/node-problem-detector/cmd/options"`
`28`	`29`	`)`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ func init() {`
`39`	`39`	`CustomPluginMonitorName,`
`40`	`40`	`types.ProblemDaemonHandler{`
`41`	`41`	`CreateProblemDaemonOrDie: NewCustomPluginMonitorOrDie,`
`42`		`- CmdOptionDescription: "Set to config file paths."})`
	`42`	`+ CmdOptionDescription: "Set to config file paths.",`
	`43`	`+ })`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`type customPluginMonitor struct {`