Enable more golangci-lint

* Enable additional formatters.
* Enable modernize linter.
* Apply fixes.

Signed-off-by: SuperQ <[email protected]>

Author: SuperQ

.golangci.yml

@@ -2,7 +2,20 @@ version: "2"
 
 formatters:
   enable:
+    - gci
     - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/opencontainers/selinux)
+    gofumpt:
+      extra-rules: true
+    goimports:
+      local-prefixes:
+        - github.com/opencontainers/selinux
 
 linters:
   enable:
@@ -12,6 +25,7 @@ linters:
     - gocritic      # Metalinter; detects bugs, performance, and styling issues.
     - gosec         # Detects security problems.
     - misspell      # Detects commonly misspelled English words in comments.
+    - modernize     # Suggest simplifications to Go code.
     - nilerr        # Detects code that returns nil even if it checks that the error is not nil.
     - nolintlint    # Detects ill-formed or insufficient nolint directives.
     - prealloc      # Detects slice declarations that could potentially be pre-allocated.

go-selinux/label/label_linux.go

@@ -26,7 +26,7 @@ var ErrIncompatibleLabel = errors.New("bad SELinux option: z and Z can not be us
 // guaranteed to be unique.
 // If the disabled flag is passed in, the process label will not be set, but the mount label will be set
 // to the container_file label with the maximum category. This label is not usable by any confined label.
-func InitLabels(options []string) (plabel string, mlabel string, retErr error) {
+func InitLabels(options []string) (plabel, mlabel string, retErr error) {
 	if !selinux.GetEnabled() {
 		return "", "", nil
 	}
@@ -80,7 +80,7 @@ func InitLabels(options []string) (plabel string, mlabel string, retErr error) {
 }
 
 // SetFileLabel modifies the "path" label to the specified file label
-func SetFileLabel(path string, fileLabel string) error {
+func SetFileLabel(path, fileLabel string) error {
 	if !selinux.GetEnabled() || fileLabel == "" {
 		return nil
 	}
@@ -100,7 +100,7 @@ func SetFileCreateLabel(fileLabel string) error {
 // This will allow all containers to share the content.
 //
 // The path itself is guaranteed to be relabeled last.
-func Relabel(path string, fileLabel string, shared bool) error {
+func Relabel(path, fileLabel string, shared bool) error {
 	if !selinux.GetEnabled() || fileLabel == "" {
 		return nil
 	}

go-selinux/selinux.go

@@ -72,13 +72,13 @@ func ClassIndex(class string) (int, error) {
 
 // SetFileLabel sets the SELinux label for this path, following symlinks,
 // or returns an error.
-func SetFileLabel(fpath string, label string) error {
+func SetFileLabel(fpath, label string) error {
 	return setFileLabel(fpath, label)
 }
 
 // LsetFileLabel sets the SELinux label for this path, not following symlinks,
 // or returns an error.
-func LsetFileLabel(fpath string, label string) error {
+func LsetFileLabel(fpath, label string) error {
 	return lSetFileLabel(fpath, label)
 }
 
@@ -135,7 +135,7 @@ func CanonicalizeContext(val string) (string, error) {
 
 // ComputeCreateContext requests the type transition from source to target for
 // class from the kernel.
-func ComputeCreateContext(source string, target string, class string) (string, error) {
+func ComputeCreateContext(source, target, class string) (string, error) {
 	return computeCreateContext(source, target, class)
 }
 
@@ -269,7 +269,7 @@ func InitContainerLabels() (string, string) {
 
 // ContainerLabels returns an allocated processLabel and fileLabel to be used for
 // container labeling by the calling process.
-func ContainerLabels() (processLabel string, fileLabel string) {
+func ContainerLabels() (processLabel, fileLabel string) {
 	return containerLabels()
 }
 
@@ -289,7 +289,7 @@ func CopyLevel(src, dest string) (string, error) {
 // directory tree setting the label.
 //
 // The fpath itself is guaranteed to be relabeled last.
-func Chcon(fpath string, label string, recurse bool) error {
+func Chcon(fpath, label string, recurse bool) error {
 	return chcon(fpath, label, recurse)
 }
 

go-selinux/selinux_linux.go

@@ -454,7 +454,7 @@ func classIndex(class string) (int, error) {
 
 // lSetFileLabel sets the SELinux label for this path, not following symlinks,
 // or returns an error.
-func lSetFileLabel(fpath string, label string) error {
+func lSetFileLabel(fpath, label string) error {
 	if fpath == "" {
 		return ErrEmptyPath
 	}
@@ -473,7 +473,7 @@ func lSetFileLabel(fpath string, label string) error {
 
 // setFileLabel sets the SELinux label for this path, following symlinks,
 // or returns an error.
-func setFileLabel(fpath string, label string) error {
+func setFileLabel(fpath, label string) error {
 	if fpath == "" {
 		return ErrEmptyPath
 	}
@@ -566,7 +566,7 @@ func canonicalizeContext(val string) (string, error) {
 
 // computeCreateContext requests the type transition from source to target for
 // class from the kernel.
-func computeCreateContext(source string, target string, class string) (string, error) {
+func computeCreateContext(source, target, class string) (string, error) {
 	classidx, err := classIndex(class)
 	if err != nil {
 		return "", err
@@ -579,8 +579,7 @@ func computeCreateContext(source string, target string, class string) (string, e
 func catsToBitset(cats string) (*big.Int, error) {
 	bitset := new(big.Int)
 
-	catlist := strings.Split(cats, ",")
-	for _, r := range catlist {
+	for r := range strings.SplitSeq(cats, ",") {
 		ranges := strings.SplitN(r, ".", 2)
 		if len(ranges) > 1 {
 			catstart, err := parseLevelItem(ranges[0], category)
@@ -788,7 +787,7 @@ func calculateGlbLub(sourceRange, targetRange string) (string, error) {
 	return outrange.String(), nil
 }
 
-func readWriteCon(fpath string, val string) (string, error) {
+func readWriteCon(fpath, val string) (string, error) {
 	if fpath == "" {
 		return "", ErrEmptyPath
 	}
@@ -1088,7 +1087,7 @@ func initContainerLabels() (string, string) {
 
 // containerLabels returns an allocated processLabel and fileLabel to be used for
 // container labeling by the calling process.
-func containerLabels() (processLabel string, fileLabel string) {
+func containerLabels() (processLabel, fileLabel string) {
 	if !getEnabled() {
 		return "", ""
 	}
@@ -1155,7 +1154,7 @@ func copyLevel(src, dest string) (string, error) {
 // chcon changes the fpath file object to the SELinux label.
 // If fpath is a directory and recurse is true, then chcon walks the
 // directory tree setting the label.
-func chcon(fpath string, label string, recurse bool) error {
+func chcon(fpath, label string, recurse bool) error {
 	if fpath == "" {
 		return ErrEmptyPath
 	}

go-selinux/selinux_linux_test.go

@@ -243,7 +243,7 @@ func BenchmarkContextGet(b *testing.B) {
 		b.Fatal(err)
 	}
 	str := ""
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		str = ctx.get()
 	}
 	b.Log(str)
@@ -674,8 +674,8 @@ func BenchmarkChcon(b *testing.B) {
 		b.Fatalf("FileLabel(%q): %v", file, err)
 	}
 	b.Logf("Chcon(%q, %q)", dir, con)
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
+
+	for b.Loop() {
 		if err := Chcon(dir, con, true); err != nil {
 			b.Fatal(err)
 		}
@@ -687,7 +687,7 @@ func BenchmarkCurrentLabel(b *testing.B) {
 		l   string
 		err error
 	)
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		l, err = CurrentLabel()
 		if err != nil {
 			b.Fatal(err)
@@ -698,14 +698,14 @@ func BenchmarkCurrentLabel(b *testing.B) {
 
 func BenchmarkReadConfig(b *testing.B) {
 	str := ""
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		str = readConfig(selinuxTypeTag)
 	}
 	b.Log(str)
 }
 
 func BenchmarkLoadLabels(b *testing.B) {
-	for n := 0; n < b.N; n++ {
+	for b.Loop() {
 		loadLabels()
 	}
 }

pkg/pwalk/pwalk.go

@@ -100,7 +100,7 @@ func WalkN(root string, walkFn WalkFunc, num int) error {
 	}()
 
 	wg.Add(num)
-	for i := 0; i < num; i++ {
+	for range num {
 		go func() {
 			for file := range files {
 				if e := walkFn(file.path, *file.info, nil); e != nil {

pkg/pwalk/pwalk_test.go

@@ -93,14 +93,14 @@ func TestWalkDirManyErrors(t *testing.T) {
 }
 
 func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err error) {
-	for d := 0; d < dirs; d++ {
+	for range dirs {
 		var dir string
 		dir, err = os.MkdirTemp(prefix, "d-")
 		if err != nil {
 			return count, err
 		}
 		count++
-		for f := 0; f < files; f++ {
+		for range files {
 			var fi *os.File
 			fi, err = os.CreateTemp(dir, "f-")
 			if err != nil {