From d7d54c408dcc7f27b1d15bbf0d942ef8702fcd6b Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 28 Oct 2021 09:12:09 -0700 Subject: [PATCH] Format code with gofumpt, enable linter Signed-off-by: Kir Kolyshkin --- .golangci.yml | 1 + mount/mount_unix_test.go | 24 +++++++++---------- mount/mounter_linux.go | 1 - mount/sharedsubtree_linux_test.go | 40 +++++++++++++++---------------- mountinfo/mountinfo_linux_test.go | 1 - symlink/fs_unix_test.go | 4 ++-- symlink/fs_windows.go | 2 +- 7 files changed, 36 insertions(+), 37 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 89cee998..e727261b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,3 +2,4 @@ linters: enable: - unconvert - errorlint + - gofumpt diff --git a/mount/mount_unix_test.go b/mount/mount_unix_test.go index 019c0af9..1a703edd 100644 --- a/mount/mount_unix_test.go +++ b/mount/mount_unix_test.go @@ -35,7 +35,7 @@ func TestMounted(t *testing.T) { } tmp := path.Join(os.TempDir(), "mount-tests") - if err := os.MkdirAll(tmp, 0777); err != nil { + if err := os.MkdirAll(tmp, 0o777); err != nil { t.Fatal(err) } defer os.RemoveAll(tmp) @@ -47,18 +47,18 @@ func TestMounted(t *testing.T) { targetPath = path.Join(targetDir, "file.txt") ) - if err := os.Mkdir(sourceDir, 0777); err != nil { + if err := os.Mkdir(sourceDir, 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(targetDir, 0777); err != nil { + if err := os.Mkdir(targetDir, 0o777); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0644); err != nil { + if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0o644); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(targetPath, nil, 0644); err != nil { + if err := ioutil.WriteFile(targetPath, nil, 0o644); err != nil { t.Fatal(err) } @@ -105,7 +105,7 @@ func TestMountTmpfsOptions(t *testing.T) { } target := path.Join(os.TempDir(), "mount-tmpfs-tests-"+t.Name()) - if err := os.MkdirAll(target, 0777); err != nil { + if err := os.MkdirAll(target, 0o777); err != nil { t.Fatal(err) } defer os.RemoveAll(target) @@ -142,7 +142,7 @@ func TestMountReadonly(t *testing.T) { } tmp := path.Join(os.TempDir(), "mount-tests") - if err := os.MkdirAll(tmp, 0777); err != nil { + if err := os.MkdirAll(tmp, 0o777); err != nil { t.Fatal(err) } defer os.RemoveAll(tmp) @@ -154,18 +154,18 @@ func TestMountReadonly(t *testing.T) { targetPath = path.Join(targetDir, "file.txt") ) - if err := os.Mkdir(sourceDir, 0777); err != nil { + if err := os.Mkdir(sourceDir, 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(targetDir, 0777); err != nil { + if err := os.Mkdir(targetDir, 0o777); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0644); err != nil { + if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0o644); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(targetPath, nil, 0644); err != nil { + if err := ioutil.WriteFile(targetPath, nil, 0o644); err != nil { t.Fatal(err) } @@ -178,7 +178,7 @@ func TestMountReadonly(t *testing.T) { } }() - if err := ioutil.WriteFile(targetPath, []byte("hello"), 0644); err == nil { + if err := ioutil.WriteFile(targetPath, []byte("hello"), 0o644); err == nil { t.Fatal("Should not be able to open a ro file as rw") } } diff --git a/mount/mounter_linux.go b/mount/mounter_linux.go index 0c477cc3..4e18f4b6 100644 --- a/mount/mounter_linux.go +++ b/mount/mounter_linux.go @@ -65,7 +65,6 @@ func mount(device, target, mType string, flags uintptr, data string) error { flags: oflags | unix.MS_REMOUNT, err: err, } - } } diff --git a/mount/sharedsubtree_linux_test.go b/mount/sharedsubtree_linux_test.go index 36e8536c..3a92496d 100644 --- a/mount/sharedsubtree_linux_test.go +++ b/mount/sharedsubtree_linux_test.go @@ -17,7 +17,7 @@ func TestSubtreePrivate(t *testing.T) { } tmp := path.Join(os.TempDir(), "mount-tests") - if err := os.MkdirAll(tmp, 0777); err != nil { + if err := os.MkdirAll(tmp, 0o777); err != nil { t.Fatal(err) } defer os.RemoveAll(tmp) @@ -33,19 +33,19 @@ func TestSubtreePrivate(t *testing.T) { outside1CheckPath = path.Join(targetDir, "a", "file.txt") outside2CheckPath = path.Join(sourceDir, "b", "file.txt") ) - if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil { + if err := os.MkdirAll(path.Join(sourceDir, "a"), 0o777); err != nil { t.Fatal(err) } - if err := os.MkdirAll(path.Join(sourceDir, "b"), 0777); err != nil { + if err := os.MkdirAll(path.Join(sourceDir, "b"), 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(targetDir, 0777); err != nil { + if err := os.Mkdir(targetDir, 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(outside1Dir, 0777); err != nil { + if err := os.Mkdir(outside1Dir, 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(outside2Dir, 0777); err != nil { + if err := os.Mkdir(outside2Dir, 0o777); err != nil { t.Fatal(err) } @@ -119,7 +119,7 @@ func TestSubtreeShared(t *testing.T) { } tmp := path.Join(os.TempDir(), "mount-tests") - if err := os.MkdirAll(tmp, 0777); err != nil { + if err := os.MkdirAll(tmp, 0o777); err != nil { t.Fatal(err) } defer os.RemoveAll(tmp) @@ -133,13 +133,13 @@ func TestSubtreeShared(t *testing.T) { sourceCheckPath = path.Join(sourceDir, "a", "file.txt") ) - if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil { + if err := os.MkdirAll(path.Join(sourceDir, "a"), 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(targetDir, 0777); err != nil { + if err := os.Mkdir(targetDir, 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(outsideDir, 0777); err != nil { + if err := os.Mkdir(outsideDir, 0o777); err != nil { t.Fatal(err) } @@ -191,7 +191,7 @@ func TestSubtreeSharedSlave(t *testing.T) { } tmp := path.Join(os.TempDir(), "mount-tests") - if err := os.MkdirAll(tmp, 0777); err != nil { + if err := os.MkdirAll(tmp, 0o777); err != nil { t.Fatal(err) } defer os.RemoveAll(tmp) @@ -207,19 +207,19 @@ func TestSubtreeSharedSlave(t *testing.T) { outside1CheckPath = path.Join(targetDir, "a", "file.txt") outside2CheckPath = path.Join(sourceDir, "b", "file.txt") ) - if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil { + if err := os.MkdirAll(path.Join(sourceDir, "a"), 0o777); err != nil { t.Fatal(err) } - if err := os.MkdirAll(path.Join(sourceDir, "b"), 0777); err != nil { + if err := os.MkdirAll(path.Join(sourceDir, "b"), 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(targetDir, 0777); err != nil { + if err := os.Mkdir(targetDir, 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(outside1Dir, 0777); err != nil { + if err := os.Mkdir(outside1Dir, 0o777); err != nil { t.Fatal(err) } - if err := os.Mkdir(outside2Dir, 0777); err != nil { + if err := os.Mkdir(outside2Dir, 0o777); err != nil { t.Fatal(err) } @@ -299,7 +299,7 @@ func TestSubtreeUnbindable(t *testing.T) { } tmp := path.Join(os.TempDir(), "mount-tests") - if err := os.MkdirAll(tmp, 0777); err != nil { + if err := os.MkdirAll(tmp, 0o777); err != nil { t.Fatal(err) } defer os.RemoveAll(tmp) @@ -308,10 +308,10 @@ func TestSubtreeUnbindable(t *testing.T) { sourceDir = path.Join(tmp, "source") targetDir = path.Join(tmp, "target") ) - if err := os.MkdirAll(sourceDir, 0777); err != nil { + if err := os.MkdirAll(sourceDir, 0o777); err != nil { t.Fatal(err) } - if err := os.MkdirAll(targetDir, 0777); err != nil { + if err := os.MkdirAll(targetDir, 0o777); err != nil { t.Fatal(err) } @@ -339,5 +339,5 @@ func TestSubtreeUnbindable(t *testing.T) { } func createFile(path string) error { - return ioutil.WriteFile(path, []byte("hello"), 0666) + return ioutil.WriteFile(path, []byte("hello"), 0o666) } diff --git a/mountinfo/mountinfo_linux_test.go b/mountinfo/mountinfo_linux_test.go index 7e50bcd7..dca55536 100644 --- a/mountinfo/mountinfo_linux_test.go +++ b/mountinfo/mountinfo_linux_test.go @@ -770,5 +770,4 @@ func TestUnescape(t *testing.T) { continue } } - } diff --git a/symlink/fs_unix_test.go b/symlink/fs_unix_test.go index d2e54c7b..2c580632 100644 --- a/symlink/fs_unix_test.go +++ b/symlink/fs_unix_test.go @@ -24,10 +24,10 @@ func makeFs(tmpdir string, fs []dirOrLink) error { for _, s := range fs { s.path = filepath.Join(tmpdir, s.path) if s.target == "" { - _ = os.MkdirAll(s.path, 0755) + _ = os.MkdirAll(s.path, 0o755) continue } - if err := os.MkdirAll(filepath.Dir(s.path), 0755); err != nil { + if err := os.MkdirAll(filepath.Dir(s.path), 0o755); err != nil { return err } if err := os.Symlink(s.target, s.path); err != nil && !os.IsExist(err) { diff --git a/symlink/fs_windows.go b/symlink/fs_windows.go index a7da8c2e..87fd1b88 100644 --- a/symlink/fs_windows.go +++ b/symlink/fs_windows.go @@ -101,7 +101,7 @@ func walkSymlinks(path string) (string, error) { } // find next path component, p - var i = -1 + i := -1 for j, c := range path { if c < utf8RuneSelf && os.IsPathSeparator(uint8(c)) { i = j