chore: fix lint violations

Signed-off-by: Mark Sagi-Kazar <[email protected]>

Author: sagikazarmark

.golangci.yaml

@@ -7,14 +7,15 @@ linters:
   enable:
     - govet
     - ineffassign
-    # - misspell
+    - misspell
     - nolintlint
     # - revive
+    - staticcheck
     - unused
 
   disable:
     - errcheck
-    - staticcheck
+    # - staticcheck
 
   settings:
     misspell:
@@ -31,9 +32,9 @@ formatters:
   enable:
     - gci
     - gofmt
-    # - gofumpt
+    - gofumpt
     - goimports
-    # - golines
+    - golines
 
   settings:
     gci:

afero_test.go

@@ -60,7 +60,9 @@ func TestRead0(t *testing.T) {
 	for _, fs := range Fss {
 		f := tmpFile(fs)
 		defer f.Close()
-		f.WriteString("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
+		f.WriteString(
+			"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+		)
 
 		var b []byte
 		// b := make([]byte, 0)
@@ -103,7 +105,12 @@ func TestOpenFile(t *testing.T) {
 		contents, _ := io.ReadAll(f)
 		expectedContents := "initial|append"
 		if string(contents) != expectedContents {
-			t.Errorf("%v: appending, expected '%v', got: '%v'", fs.Name(), expectedContents, string(contents))
+			t.Errorf(
+				"%v: appending, expected '%v', got: '%v'",
+				fs.Name(),
+				expectedContents,
+				string(contents),
+			)
 		}
 		f.Close()
 
@@ -158,7 +165,11 @@ func TestCreate(t *testing.T) {
 			continue
 		}
 		if string(buf) != secondContent {
-			t.Error(fs.Name(), "Content should be", "\""+secondContent+"\" but is \""+string(buf)+"\"")
+			t.Error(
+				fs.Name(),
+				"Content should be",
+				"\""+secondContent+"\" but is \""+string(buf)+"\"",
+			)
 			f.Close()
 			continue
 		}
@@ -351,7 +362,15 @@ func TestSeek(t *testing.T) {
 					// http://code.google.com/p/go/issues/detail?id=91
 					break
 				}
-				t.Errorf("#%d: Seek(%v, %v) = %v, %v want %v, nil", i, tt.in, tt.whence, off, err, tt.out)
+				t.Errorf(
+					"#%d: Seek(%v, %v) = %v, %v want %v, nil",
+					i,
+					tt.in,
+					tt.whence,
+					off,
+					err,
+					tt.out,
+				)
 			}
 		}
 	}

basepath_test.go

@@ -123,12 +123,14 @@ func TestNestedBasePaths(t *testing.T) {
 				t.Errorf("Got error %s", err.Error())
 			}
 
-			if s.BaseFs == level3Fs {
+			switch s.BaseFs {
+			case level3Fs:
 				pathToExist := filepath.Join(ds.Dir3, s.FileName)
 				if _, err := level2Fs.Stat(pathToExist); err != nil {
 					t.Errorf("Got error %s (path %s)", err.Error(), pathToExist)
 				}
-			} else if s.BaseFs == level2Fs {
+
+			case level2Fs:
 				pathToExist := filepath.Join(ds.Dir2, ds.Dir3, s.FileName)
 				if _, err := level1Fs.Stat(pathToExist); err != nil {
 					t.Errorf("Got error %s (path %s)", err.Error(), pathToExist)

copyOnWriteFs.go

@@ -34,7 +34,8 @@ func (u *CopyOnWriteFs) isBaseFile(name string) (bool, error) {
 	_, err := u.base.Stat(name)
 	if err != nil {
 		if oerr, ok := err.(*os.PathError); ok {
-			if oerr.Err == os.ErrNotExist || oerr.Err == syscall.ENOENT || oerr.Err == syscall.ENOTDIR {
+			if oerr.Err == os.ErrNotExist || oerr.Err == syscall.ENOENT ||
+				oerr.Err == syscall.ENOTDIR {
 				return false, nil
 			}
 		}
@@ -237,7 +238,11 @@ func (u *CopyOnWriteFs) OpenFile(name string, flag int, perm os.FileMode) (File,
 			return u.layer.OpenFile(name, flag, perm)
 		}
 
-		return nil, &os.PathError{Op: "open", Path: name, Err: syscall.ENOTDIR} // ...or os.ErrNotExist?
+		return nil, &os.PathError{
+			Op:   "open",
+			Path: name,
+			Err:  syscall.ENOTDIR,
+		} // ...or os.ErrNotExist?
 	}
 	if b {
 		return u.base.OpenFile(name, flag, perm)

gcsfs/file.go

@@ -108,7 +108,10 @@ func (o *GcsFile) Seek(newOffset int64, whence int) (int64, error) {
 	if (whence == 0 && newOffset == o.fhOffset) || (whence == 1 && newOffset == 0) {
 		return o.fhOffset, nil
 	}
-	log.Printf("WARNING: Seek behavior triggered, highly inefficent. Offset before seek is at %d\n", o.fhOffset)
+	log.Printf(
+		"WARNING: Seek behavior triggered, highly inefficent. Offset before seek is at %d\n",
+		o.fhOffset,
+	)
 
 	// Fore the reader/writers to be reopened (at correct offset)
 	err := o.Sync()

gcsfs/fs.go

@@ -158,7 +158,9 @@ func (fs *Fs) Create(name string) (*GcsFile, error) {
 }
 
 func (fs *Fs) Mkdir(name string, _ os.FileMode) error {
-	name = fs.ensureNoLeadingSeparator(fs.ensureTrailingSeparator(fs.normSeparators(ensureNoPrefix(name))))
+	name = fs.ensureNoLeadingSeparator(
+		fs.ensureTrailingSeparator(fs.normSeparators(ensureNoPrefix(name))),
+	)
 	if err := validateName(name); err != nil {
 		return err
 	}
@@ -181,7 +183,9 @@ func (fs *Fs) Mkdir(name string, _ os.FileMode) error {
 }
 
 func (fs *Fs) MkdirAll(path string, perm os.FileMode) error {
-	path = fs.ensureNoLeadingSeparator(fs.ensureTrailingSeparator(fs.normSeparators(ensureNoPrefix(path))))
+	path = fs.ensureNoLeadingSeparator(
+		fs.ensureTrailingSeparator(fs.normSeparators(ensureNoPrefix(path))),
+	)
 	if err := validateName(path); err != nil {
 		return err
 	}
@@ -404,7 +408,9 @@ func (fs *Fs) Chmod(_ string, _ os.FileMode) error {
 }
 
 func (fs *Fs) Chtimes(_ string, _, _ time.Time) error {
-	return errors.New("method Chtimes is not implemented. Create, Delete, Updated times are read only fields in GCS and set implicitly")
+	return errors.New(
+		"method Chtimes is not implemented. Create, Delete, Updated times are read only fields in GCS and set implicitly",
+	)
 }
 
 func (fs *Fs) Chown(_ string, _, _ int) error {

gcsfs/gcs.go

@@ -48,7 +48,11 @@ func NewGcsFS(ctx context.Context, opts ...option.ClientOption) (afero.Fs, error
 }
 
 // NewGcsFSWithSeparator is the same as NewGcsFS, but the files system will use the provided folder separator.
-func NewGcsFSWithSeparator(ctx context.Context, folderSeparator string, opts ...option.ClientOption) (afero.Fs, error) {
+func NewGcsFSWithSeparator(
+	ctx context.Context,
+	folderSeparator string,
+	opts ...option.ClientOption,
+) (afero.Fs, error) {
 	client, err := storage.NewClient(ctx, opts...)
 	if err != nil {
 		return nil, err
@@ -65,7 +69,11 @@ func NewGcsFSFromClient(ctx context.Context, client *storage.Client) (afero.Fs,
 }
 
 // NewGcsFSFromClientWithSeparator is the same as NewGcsFSFromClient, but the file system will use the provided folder separator.
-func NewGcsFSFromClientWithSeparator(ctx context.Context, client *storage.Client, folderSeparator string) (afero.Fs, error) {
+func NewGcsFSFromClientWithSeparator(
+	ctx context.Context,
+	client *storage.Client,
+	folderSeparator string,
+) (afero.Fs, error) {
 	c := stiface.AdaptClient(client)
 
 	return &GcsFs{NewGcsFsWithSeparator(ctx, c, folderSeparator)}, nil

gcsfs/gcs_mocks.go

@@ -73,7 +73,10 @@ func (o *objectMock) NewWriter(_ context.Context) stiface.Writer {
 	return &writerMock{name: o.name, fs: o.fs}
 }
 
-func (o *objectMock) NewRangeReader(_ context.Context, offset, length int64) (stiface.Reader, error) {
+func (o *objectMock) NewRangeReader(
+	_ context.Context,
+	offset, length int64,
+) (stiface.Reader, error) {
 	if o.name == "" {
 		return nil, ErrEmptyObjectName
 	}
@@ -126,7 +129,11 @@ func (o *objectMock) Attrs(_ context.Context) (*storage.ObjectAttrs, error) {
 		return nil, err
 	}
 
-	res := &storage.ObjectAttrs{Name: normSeparators(o.name), Size: info.Size(), Updated: info.ModTime()}
+	res := &storage.ObjectAttrs{
+		Name:    normSeparators(o.name),
+		Size:    info.Size(),
+		Updated: info.ModTime(),
+	}
 
 	if info.IsDir() {
 		// we have to mock it here, because of FileInfo logic
@@ -240,7 +247,14 @@ func (it *objectItMock) Next() (*storage.ObjectAttrs, error) {
 			if err != nil {
 				return nil, err
 			}
-			it.infos = append(it.infos, &storage.ObjectAttrs{Name: normSeparators(info.Name()), Size: info.Size(), Updated: info.ModTime()})
+			it.infos = append(
+				it.infos,
+				&storage.ObjectAttrs{
+					Name:    normSeparators(info.Name()),
+					Size:    info.Size(),
+					Updated: info.ModTime(),
+				},
+			)
 		} else {
 			var fInfos []os.FileInfo
 			fInfos, err = it.dir.Readdir(0)

gcsfs/gcs_test.go

@@ -55,7 +55,10 @@ var dirs = []struct {
 	name     string
 	children []string
 }{
-	{"", []string{"sub", "testDir1", "testFile"}}, // in this case it will be prepended with bucket name
+	{
+		"",
+		[]string{"sub", "testDir1", "testFile"},
+	}, // in this case it will be prepended with bucket name
 	{"sub", []string{"testDir2"}},
 	{"sub/testDir2", []string{"testFile"}},
 	{"testDir1", []string{"testFile"}},
@@ -365,7 +368,14 @@ func TestGcsSeek(t *testing.T) {
 				}
 
 				if n != s.offOut {
-					t.Errorf("%v: (off: %v, whence: %v): got %v, expected %v", f.name, s.offIn, s.whence, n, s.offOut)
+					t.Errorf(
+						"%v: (off: %v, whence: %v): got %v, expected %v",
+						f.name,
+						s.offIn,
+						s.whence,
+						n,
+						s.offOut,
+					)
 				}
 			}
 		}
@@ -693,7 +703,10 @@ func TestGcsGlob(t *testing.T) {
 		prefixedEntries := [][]string{{}, {}}
 		for _, entry := range s.entries {
 			prefixedEntries[0] = append(prefixedEntries[0], filepath.Join(bucketName, entry))
-			prefixedEntries[1] = append(prefixedEntries[1], string(os.PathSeparator)+filepath.Join(bucketName, entry))
+			prefixedEntries[1] = append(
+				prefixedEntries[1],
+				string(os.PathSeparator)+filepath.Join(bucketName, entry),
+			)
 		}
 
 		for i, prefixedGlob := range prefixedGlobs {
@@ -775,7 +788,11 @@ func TestGcsMkdirAll(t *testing.T) {
 			t.Errorf("%s: mode is not directory", filepath.Join(bucketName, "a"))
 		}
 		if info.Mode() != os.ModeDir|0o755 {
-			t.Errorf("%s: wrong permissions, expected drwxr-xr-x, got %s", filepath.Join(bucketName, "a"), info.Mode())
+			t.Errorf(
+				"%s: wrong permissions, expected drwxr-xr-x, got %s",
+				filepath.Join(bucketName, "a"),
+				info.Mode(),
+			)
 		}
 		info, err = gcsAfs.Stat(filepath.Join(bucketName, "a/b"))
 		if err != nil {
@@ -785,7 +802,11 @@ func TestGcsMkdirAll(t *testing.T) {
 			t.Errorf("%s: mode is not directory", filepath.Join(bucketName, "a/b"))
 		}
 		if info.Mode() != os.ModeDir|0o755 {
-			t.Errorf("%s: wrong permissions, expected drwxr-xr-x, got %s", filepath.Join(bucketName, "a/b"), info.Mode())
+			t.Errorf(
+				"%s: wrong permissions, expected drwxr-xr-x, got %s",
+				filepath.Join(bucketName, "a/b"),
+				info.Mode(),
+			)
 		}
 		info, err = gcsAfs.Stat(dirName)
 		if err != nil {
@@ -800,7 +821,11 @@ func TestGcsMkdirAll(t *testing.T) {
 
 		err = gcsAfs.RemoveAll(filepath.Join(bucketName, "a"))
 		if err != nil {
-			t.Fatalf("failed to remove the folder %s with error: %s", filepath.Join(bucketName, "a"), err)
+			t.Fatalf(
+				"failed to remove the folder %s with error: %s",
+				filepath.Join(bucketName, "a"),
+				err,
+			)
 		}
 	})
 }

iofs.go

@@ -137,7 +137,7 @@ type readDirFile struct {
 var _ fs.ReadDirFile = readDirFile{}
 
 func (r readDirFile) ReadDir(n int) ([]fs.DirEntry, error) {
-	items, err := r.File.Readdir(n)
+	items, err := r.Readdir(n)
 	if err != nil {
 		return nil, err
 	}
@@ -161,7 +161,12 @@ var _ Fs = FromIOFS{}
 
 func (f FromIOFS) Create(name string) (File, error) { return nil, notImplemented("create", name) }
 
-func (f FromIOFS) Mkdir(name string, perm os.FileMode) error { return notImplemented("mkdir", name) }
+func (f FromIOFS) Mkdir(
+	name string,
+	perm os.FileMode,
+) error {
+	return notImplemented("mkdir", name)
+}
 
 func (f FromIOFS) MkdirAll(path string, perm os.FileMode) error {
 	return notImplemented("mkdirall", path)