Merge pull request #342 from pjsharath28/enable-revive-linter

Enable revive linter

Author: k8s-ci-robot

.github/workflows/test.yml

@@ -66,7 +66,7 @@ jobs:
         uses: golangci/golangci-lint-action@v6
         with:
           version: v1.60.1
-          args: --disable-all -v -E govet -E misspell -E gofmt -E ineffassign
+          args: --disable-all -v -E govet -E misspell -E gofmt -E ineffassign -E revive
   apidiff:
     runs-on: ubuntu-latest
     if: github.base_ref

clock/testing/fake_clock.go

@@ -268,36 +268,36 @@ func (i *IntervalClock) Since(ts time.Time) time.Duration {
 
 // After is unimplemented, will panic.
 // TODO: make interval clock use FakeClock so this can be implemented.
-func (*IntervalClock) After(d time.Duration) <-chan time.Time {
+func (*IntervalClock) After(_ time.Duration) <-chan time.Time {
 	panic("IntervalClock doesn't implement After")
 }
 
 // NewTimer is unimplemented, will panic.
 // TODO: make interval clock use FakeClock so this can be implemented.
-func (*IntervalClock) NewTimer(d time.Duration) clock.Timer {
+func (*IntervalClock) NewTimer(_ time.Duration) clock.Timer {
 	panic("IntervalClock doesn't implement NewTimer")
 }
 
 // AfterFunc is unimplemented, will panic.
 // TODO: make interval clock use FakeClock so this can be implemented.
-func (*IntervalClock) AfterFunc(d time.Duration, f func()) clock.Timer {
+func (*IntervalClock) AfterFunc(_ time.Duration, _ func()) clock.Timer {
 	panic("IntervalClock doesn't implement AfterFunc")
 }
 
 // Tick is unimplemented, will panic.
 // TODO: make interval clock use FakeClock so this can be implemented.
-func (*IntervalClock) Tick(d time.Duration) <-chan time.Time {
+func (*IntervalClock) Tick(_ time.Duration) <-chan time.Time {
 	panic("IntervalClock doesn't implement Tick")
 }
 
 // NewTicker has no implementation yet and is omitted.
 // TODO: make interval clock use FakeClock so this can be implemented.
-func (*IntervalClock) NewTicker(d time.Duration) clock.Ticker {
+func (*IntervalClock) NewTicker(_ time.Duration) clock.Ticker {
 	panic("IntervalClock doesn't implement NewTicker")
 }
 
 // Sleep is unimplemented, will panic.
-func (*IntervalClock) Sleep(d time.Duration) {
+func (*IntervalClock) Sleep(_ time.Duration) {
 	panic("IntervalClock doesn't implement Sleep")
 }
 

exec/exec_test.go

@@ -120,7 +120,7 @@ func TestExecutableNotFound(t *testing.T) {
 	}
 }
 
-func TestStopBeforeStart(t *testing.T) {
+func TestStopBeforeStart(_ *testing.T) {
 	cmd := New().Command("echo", "hello")
 
 	// no panic calling Stop before calling Run

exec/testing/fake_exec.go

@@ -86,7 +86,7 @@ func (fake *FakeExec) nextCommand(cmd string, args []string) exec.Cmd {
 }
 
 // CommandContext wraps arguments into exec.Cmd
-func (fake *FakeExec) CommandContext(ctx context.Context, cmd string, args ...string) exec.Cmd {
+func (fake *FakeExec) CommandContext(_ context.Context, cmd string, args ...string) exec.Cmd {
 	return fake.Command(cmd, args...)
 }
 

exec/testing/fake_exec_test.go

@@ -130,7 +130,7 @@ func getFakeExecWithScripts(exactOrder bool, disableScripts bool) *FakeExec {
 func makeFakeCmd(fakeCmd *FakeCmd, cmd string, args ...string) FakeCommandAction {
 	c := cmd
 	a := args
-	return func(cmd string, args ...string) exec.Cmd {
+	return func(_ string, _ ...string) exec.Cmd {
 		command := InitFakeCmd(fakeCmd, c, a...)
 		return command
 	}

field/path.go

@@ -40,8 +40,8 @@ func NewPath(name string, moreNames ...string) *Path {
 
 // Root returns the root element of this Path.
 func (p *Path) Root() *Path {
-	for ; p.parent != nil; p = p.parent {
-		// Do nothing.
+	for p.parent != nil {
+		p = p.parent
 	}
 	return p
 }

lru/lru_test.go

@@ -88,7 +88,7 @@ func TestRemove(t *testing.T) {
 	}
 }
 
-func TestGetRace(t *testing.T) {
+func TestGetRace(_ *testing.T) {
 	// size to force eviction and exercise next,curr,prev list behavior
 	lru := New(25)
 
@@ -153,7 +153,7 @@ func TestSetEviction(t *testing.T) {
 		t.Errorf("unexpected eviction data: key=%v val=%v", seenKey, seenVal)
 	}
 
-	err = lru.SetEvictionFunc(func(key Key, value interface{}) {})
+	err = lru.SetEvictionFunc(func(_ Key, _ interface{}) {})
 	if err == nil {
 		t.Errorf("expected error but got none")
 	}

mount/mount.go

@@ -77,7 +77,7 @@ type Interface interface {
 var _ Interface = &Mounter{}
 
 // MountPoint represents a single line in /proc/mounts or /etc/fstab.
-type MountPoint struct { // nolint: golint
+type MountPoint struct { // nolint: revive
 	Device string
 	Path   string
 	Type   string
@@ -86,7 +86,7 @@ type MountPoint struct { // nolint: golint
 	Pass   int
 }
 
-type MountErrorType string // nolint: golint
+type MountErrorType string // nolint: revive
 
 const (
 	FilesystemMismatch  MountErrorType = "FilesystemMismatch"
@@ -97,7 +97,7 @@ const (
 	UnknownMountError   MountErrorType = "UnknownMountError"
 )
 
-type MountError struct { // nolint: golint
+type MountError struct { // nolint: revive
 	Type    MountErrorType
 	Message string
 }

mount/mount_helper_unix.go

@@ -57,7 +57,7 @@ func IsCorruptedMnt(err error) bool {
 }
 
 // MountInfo represents a single line in /proc/<pid>/mountinfo.
-type MountInfo struct { // nolint: golint
+type MountInfo struct { // nolint: revive
 	// Unique ID for the mount (maybe reused after umount).
 	ID int
 	// The ID of the parent mount (or of self for the root of this mount namespace's mount tree).

mount/mount_linux.go

@@ -29,6 +29,7 @@ import (
 	"syscall"
 
 	"k8s.io/klog/v2"
+
 	utilexec "k8s.io/utils/exec"
 	utilio "k8s.io/utils/io"
 )
@@ -113,6 +114,9 @@ func (mounter *Mounter) doMount(mounterPath string, mountCmd string, source stri
 		mountCmd = mounterPath
 	}
 
+	// If systemd-run is available, run mount in a transient scope.
+	// Otherwise, assume kubelet is not running as a systemd service and
+	// use the pre-populated mount command and arguments.
 	if mounter.withSystemd {
 		// Try to run mount via systemd-run --scope. This will escape the
 		// service where kubelet runs and any fuse daemons will be started in a
@@ -137,10 +141,6 @@ func (mounter *Mounter) doMount(mounterPath string, mountCmd string, source stri
 		// systemd-mount is not used because it's too new for older distros
 		// (CentOS 7, Debian Jessie).
 		mountCmd, mountArgs, mountArgsLogStr = AddSystemdScopeSensitive("systemd-run", target, mountCmd, mountArgs, mountArgsLogStr)
-	} else {
-		// No systemd-run on the host (or we failed to check it), assume kubelet
-		// does not run as a systemd service.
-		// No code here, mountCmd and mountArgs are already populated.
 	}
 
 	// Logging with sensitive mount options removed.