Merge pull request #5222 from twz123/nolintlint

Enable nolintlint linter
k0sproject · Nov 18, 2024 · 89fb17e · 89fb17e
2 parents b61b44c + 9267e87
commit 89fb17e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -18,6 +18,7 @@ linters:
     - goheader      # Checks is file headers matche a given pattern
     - intrange      # Checking for loops that could use an integer range
     - perfsprint    # Checks for faster fmt.Sprintf alternatives
+    - nolintlint    # Find ill-formed or insufficiently explained nolint directives
     - revive        # Stricter drop-in replacement for golint
     - testifylint   # Checks usage of github.com/stretchr/testify
     - unconvert     # Checks for unnecessary type conversions

diff --git a/internal/pkg/sysinfo/probes/linux/linux.go b/internal/pkg/sysinfo/probes/linux/linux.go
@@ -133,7 +133,7 @@ func newUnameProber() unameProber {
 }
 
 func parseUname(utsname *syscall.Utsname) *uname {
-	convert := func(chars utsStringPtr) unameField {
+	convert := func(chars *[65]utsChar) unameField {
 		var buf [65]byte
 		var i int
 		for pos, ch := range *chars {

diff --git a/internal/pkg/sysinfo/probes/linux/types.go b/internal/pkg/sysinfo/probes/linux/types.go
@@ -18,6 +18,4 @@ limitations under the License.
 
 package linux
 
-func utsChar(ch rune) int8 { return int8(ch) } //nolint:deadcode,unused // just for tests 🙄
-
-type utsStringPtr *[65]int8
+type utsChar = int8
diff --git a/internal/pkg/sysinfo/probes/linux/types_arm.go b/internal/pkg/sysinfo/probes/linux/types_arm.go
@@ -18,6 +18,4 @@ limitations under the License.
 
 package linux
 
-func utsChar(ch rune) uint8 { return uint8(ch) } //nolint:deadcode,unused // just for tests 🙄
-
-type utsStringPtr *[65]uint8
+type utsChar = uint8
diff --git a/pkg/autopilot/controller/root/root.go b/pkg/autopilot/controller/root/root.go
@@ -19,7 +19,6 @@ import (
 )
 
 // TODO: decide on renaming root.RootConfig -> root.Config
-// nolint:revive
 type RootConfig struct {
 	InvocationID        string
 	KubeConfig          string

diff --git a/pkg/component/controller/workerconfig/reconciler_test.go b/pkg/component/controller/workerconfig/reconciler_test.go
@@ -584,7 +584,7 @@ func TestReconciler_runReconcileLoop(t *testing.T) {
 
 	underTest.runReconcileLoop(ctx, updates, nil)
 
-	switch ctx.Err() { //nolint:errorlint // as per context contract
+	switch ctx.Err() {
 	case context.Canceled:
 		break // this is the good case
 	case context.DeadlineExceeded: