Merge pull request #441 from spf13/lint

sagikazarmark · web-flow · commit d4d55e82d9c7 · 2025-01-09T12:01:20.000+01:00
fix lint violations
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -3,13 +3,14 @@ linters-settings:
         sections:
             - standard
             - default
-            - prefix(github.com/spf13/viper)
+            - prefix(github.com/spf13/afero)
 
 linters:
     disable-all: true
     enable:
+        - gci
         - gofmt
-        # - gofumpt
+        - gofumpt
         - staticcheck
 
 issues:
diff --git a/gcsfs/file.go b/gcsfs/file.go
@@ -26,11 +26,10 @@ import (
 	"sort"
 	"syscall"
 
-	"github.com/spf13/afero/gcsfs/internal/stiface"
-
 	"cloud.google.com/go/storage"
-
 	"google.golang.org/api/iterator"
+
+	"github.com/spf13/afero/gcsfs/internal/stiface"
 )
 
 // GcsFs is the Afero version adapted for GCS
diff --git a/gcsfs/gcs.go b/gcsfs/gcs.go
@@ -22,10 +22,10 @@ import (
 	"time"
 
 	"cloud.google.com/go/storage"
+	"google.golang.org/api/option"
+
 	"github.com/spf13/afero"
 	"github.com/spf13/afero/gcsfs/internal/stiface"
-
-	"google.golang.org/api/option"
 )
 
 type GcsFs struct {
diff --git a/gcsfs/gcs_mocks.go b/gcsfs/gcs_mocks.go
@@ -18,9 +18,10 @@ import (
 	"strings"
 
 	"cloud.google.com/go/storage"
+	"google.golang.org/api/iterator"
+
 	"github.com/spf13/afero"
 	"github.com/spf13/afero/gcsfs/internal/stiface"
-	"google.golang.org/api/iterator"
 )
 
 // sets filesystem separators to the one, expected (and hard-coded) in the tests
diff --git a/gcsfs/gcs_test.go b/gcsfs/gcs_test.go
@@ -17,9 +17,9 @@ import (
 	"syscall"
 	"testing"
 
+	"cloud.google.com/go/storage"
 	"golang.org/x/oauth2/google"
 
-	"cloud.google.com/go/storage"
 	"github.com/spf13/afero"
 	"github.com/spf13/afero/gcsfs/internal/stiface"
 )
diff --git a/iofs.go b/iofs.go
@@ -255,7 +255,6 @@ func (f fromIOFSFile) Readdir(count int) ([]os.FileInfo, error) {
 	ret := make([]os.FileInfo, len(entries))
 	for i := range entries {
 		ret[i], err = entries[i].Info()
-
 		if err != nil {
 			return nil, err
 		}
diff --git a/iofs_test.go b/iofs_test.go
@@ -146,7 +146,6 @@ func TestIOFSNativeDirEntryWhenPossible(t *testing.T) {
 
 		return nil
 	})
-
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/memmap.go b/memmap.go
@@ -16,11 +16,9 @@ package afero
 import (
 	"fmt"
 	"io"
-
 	"log"
 	"os"
 	"path/filepath"
-
 	"sort"
 	"strings"
 	"sync"
diff --git a/memmap_test.go b/memmap_test.go
@@ -881,7 +881,7 @@ func TestMemMapFsRename(t *testing.T) {
 		}
 
 		for _, dir := range data.dirs {
-			err = fs.MkdirAll(dir, os.FileMode(0775))
+			err = fs.MkdirAll(dir, os.FileMode(0o775))
 			if err != nil {
 				t.Fatalf("%s: MkdirAll %q failed: %v", fs.Name(), dir, err)
 			}
@@ -892,7 +892,7 @@ func TestMemMapFsRename(t *testing.T) {
 		if err != nil {
 			t.Fatalf("%s: rename %q, %q failed: %v", fs.Name(), data.from, data.to, err)
 		}
-		err = fs.Mkdir(data.from, os.FileMode(0775))
+		err = fs.Mkdir(data.from, os.FileMode(0o775))
 		if err != nil {
 			t.Fatalf("%s: Mkdir %q failed: %v", fs.Name(), data.from, err)
 		}
diff --git a/sftpfs/sftp.go b/sftpfs/sftp.go
@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/pkg/sftp"
+
 	"github.com/spf13/afero"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ import (`
`17`	`17`	`"syscall"`
`18`	`18`	`"testing"`
`19`	`19`
	`20`	`+ "cloud.google.com/go/storage"`
`20`	`21`	`"golang.org/x/oauth2/google"`
`21`	`22`
`22`		`- "cloud.google.com/go/storage"`
`23`	`23`	`"github.com/spf13/afero"`
`24`	`24`	`"github.com/spf13/afero/gcsfs/internal/stiface"`
`25`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,6 @@ func (f fromIOFSFile) Readdir(count int) ([]os.FileInfo, error) {`
`255`	`255`	`ret := make([]os.FileInfo, len(entries))`
`256`	`256`	`for i := range entries {`
`257`	`257`	`ret[i], err = entries[i].Info()`
`258`		`-`
`259`	`258`	`if err != nil {`
`260`	`259`	`return nil, err`
`261`	`260`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,6 @@ func TestIOFSNativeDirEntryWhenPossible(t *testing.T) {`
`146`	`146`
`147`	`147`	`return nil`
`148`	`148`	`})`
`149`		`-`
`150`	`149`	`if err != nil {`
`151`	`150`	`t.Fatal(err)`
`152`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ func TestMemMapFsRename(t *testing.T) {`
`881`	`881`	`}`
`882`	`882`
`883`	`883`	`for _, dir := range data.dirs {`
`884`		`- err = fs.MkdirAll(dir, os.FileMode(0775))`
	`884`	`+ err = fs.MkdirAll(dir, os.FileMode(0o775))`
`885`	`885`	`if err != nil {`
`886`	`886`	`t.Fatalf("%s: MkdirAll %q failed: %v", fs.Name(), dir, err)`
`887`	`887`	`}`
`@@ -892,7 +892,7 @@ func TestMemMapFsRename(t *testing.T) {`
`892`	`892`	`if err != nil {`
`893`	`893`	`t.Fatalf("%s: rename %q, %q failed: %v", fs.Name(), data.from, data.to, err)`
`894`	`894`	`}`
`895`		`- err = fs.Mkdir(data.from, os.FileMode(0775))`
	`895`	`+ err = fs.Mkdir(data.from, os.FileMode(0o775))`
`896`	`896`	`if err != nil {`
`897`	`897`	`t.Fatalf("%s: Mkdir %q failed: %v", fs.Name(), data.from, err)`
`898`	`898`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import (`
`18`	`18`	`"time"`
`19`	`19`
`20`	`20`	`"github.com/pkg/sftp"`
	`21`	`+`
`21`	`22`	`"github.com/spf13/afero"`
`22`	`23`	`)`
`23`	`24`