Merge pull request #441 from spf13/lint

fix lint violations

Author: sagikazarmark

.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:

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

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 {

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

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"
 )

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
 		}

iofs_test.go

@@ -146,7 +146,6 @@ func TestIOFSNativeDirEntryWhenPossible(t *testing.T) {
 
 		return nil
 	})
-
 	if err != nil {
 		t.Fatal(err)
 	}

memmap.go

@@ -16,11 +16,9 @@ package afero
 import (
 	"fmt"
 	"io"
-
 	"log"
 	"os"
 	"path/filepath"
-
 	"sort"
 	"strings"
 	"sync"

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)
 		}

sftpfs/sftp.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/pkg/sftp"
+
 	"github.com/spf13/afero"
 )