From f1829a7744a1c4d2211188e67a1d2d4231edd103 Mon Sep 17 00:00:00 2001 From: JieJhih Jhang Date: Tue, 12 Jan 2021 06:35:52 +0800 Subject: [PATCH] fix golint in volume fs --- hack/.golint_failures | 1 - pkg/volume/metrics_du.go | 2 +- pkg/volume/metrics_statfs.go | 2 +- pkg/volume/util/fs/fs.go | 4 ++-- pkg/volume/util/fs/fs_unsupported.go | 11 ++++++----- pkg/volume/util/fs/fs_windows.go | 6 +++--- pkg/volume/util/fs/fs_windows_test.go | 24 ++++++++++++------------ 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index bbe9d9a693b..d58a2f7a27c 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -183,7 +183,6 @@ pkg/volume/csi/fake pkg/volume/git_repo pkg/volume/iscsi pkg/volume/testing -pkg/volume/util/fs pkg/volume/util/volumepathhandler pkg/volume/vsphere_volume plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1 diff --git a/pkg/volume/metrics_du.go b/pkg/volume/metrics_du.go index 1cae99c1073..1491c30de76 100644 --- a/pkg/volume/metrics_du.go +++ b/pkg/volume/metrics_du.go @@ -87,7 +87,7 @@ func (md *metricsDu) runFind(metrics *Metrics) error { // getFsInfo writes metrics.Capacity and metrics.Available from the filesystem // info func (md *metricsDu) getFsInfo(metrics *Metrics) error { - available, capacity, _, inodes, inodesFree, _, err := fs.FsInfo(md.path) + available, capacity, _, inodes, inodesFree, _, err := fs.Info(md.path) if err != nil { return NewFsInfoFailedError(err) } diff --git a/pkg/volume/metrics_statfs.go b/pkg/volume/metrics_statfs.go index 66f99e30a7a..29151457e07 100644 --- a/pkg/volume/metrics_statfs.go +++ b/pkg/volume/metrics_statfs.go @@ -55,7 +55,7 @@ func (md *metricsStatFS) GetMetrics() (*Metrics, error) { // getFsInfo writes metrics.Capacity, metrics.Used and metrics.Available from the filesystem info func (md *metricsStatFS) getFsInfo(metrics *Metrics) error { - available, capacity, usage, inodes, inodesFree, inodesUsed, err := fs.FsInfo(md.path) + available, capacity, usage, inodes, inodesFree, inodesUsed, err := fs.Info(md.path) if err != nil { return NewFsInfoFailedError(err) } diff --git a/pkg/volume/util/fs/fs.go b/pkg/volume/util/fs/fs.go index 0050c5fe48c..a6114f259a6 100644 --- a/pkg/volume/util/fs/fs.go +++ b/pkg/volume/util/fs/fs.go @@ -30,9 +30,9 @@ import ( "k8s.io/kubernetes/pkg/volume/util/fsquota" ) -// FsInfo linux returns (available bytes, byte capacity, byte usage, total inodes, inodes free, inode usage, error) +// Info linux returns (available bytes, byte capacity, byte usage, total inodes, inodes free, inode usage, error) // for the filesystem that path resides upon. -func FsInfo(path string) (int64, int64, int64, int64, int64, int64, error) { +func Info(path string) (int64, int64, int64, int64, int64, int64, error) { statfs := &unix.Statfs_t{} err := unix.Statfs(path, statfs) if err != nil { diff --git a/pkg/volume/util/fs/fs_unsupported.go b/pkg/volume/util/fs/fs_unsupported.go index 340b4fdc225..8cadf72bd53 100644 --- a/pkg/volume/util/fs/fs_unsupported.go +++ b/pkg/volume/util/fs/fs_unsupported.go @@ -24,16 +24,17 @@ import ( "k8s.io/apimachinery/pkg/api/resource" ) -// FSInfo unsupported returns 0 values for available and capacity and an error. -func FsInfo(path string) (int64, int64, int64, int64, int64, int64, error) { - return 0, 0, 0, 0, 0, 0, fmt.Errorf("FsInfo not supported for this build.") +// Info unsupported returns 0 values for available and capacity and an error. +func Info(path string) (int64, int64, int64, int64, int64, int64, error) { + return 0, 0, 0, 0, 0, 0, fmt.Errorf("fsinfo not supported for this build") } // DiskUsage gets disk usage of specified path. func DiskUsage(path string) (*resource.Quantity, error) { - return nil, fmt.Errorf("Du not supported for this build.") + return nil, fmt.Errorf("du not supported for this build") } +// Find will always return zero since is on unsupported platform. func Find(path string) (int64, error) { - return 0, fmt.Errorf("Find not supported for this build.") + return 0, fmt.Errorf("find not supported for this build") } diff --git a/pkg/volume/util/fs/fs_windows.go b/pkg/volume/util/fs/fs_windows.go index 07c4e6bdbee..0fab9bcb6ce 100644 --- a/pkg/volume/util/fs/fs_windows.go +++ b/pkg/volume/util/fs/fs_windows.go @@ -34,9 +34,9 @@ var ( procGetDiskFreeSpaceEx = modkernel32.NewProc("GetDiskFreeSpaceExW") ) -// FSInfo returns (available bytes, byte capacity, byte usage, total inodes, inodes free, inode usage, error) +// Info returns (available bytes, byte capacity, byte usage, total inodes, inodes free, inode usage, error) // for the filesystem that path resides upon. -func FsInfo(path string) (int64, int64, int64, int64, int64, int64, error) { +func Info(path string) (int64, int64, int64, int64, int64, int64, error) { var freeBytesAvailable, totalNumberOfBytes, totalNumberOfFreeBytes int64 var err error @@ -77,7 +77,7 @@ func DiskUsage(path string) (*resource.Quantity, error) { return &used, nil } -// Always return zero since inodes is not supported on Windows. +// Find will always return zero since inodes is not supported on Windows. func Find(path string) (int64, error) { return 0, nil } diff --git a/pkg/volume/util/fs/fs_windows_test.go b/pkg/volume/util/fs/fs_windows_test.go index 5723dcd72b6..1fd47681962 100644 --- a/pkg/volume/util/fs/fs_windows_test.go +++ b/pkg/volume/util/fs/fs_windows_test.go @@ -27,35 +27,35 @@ import ( func TestDiskUsage(t *testing.T) { - dir_1, err := ioutil.TempDir("", "dir_1") + dir1, err := ioutil.TempDir("", "dir_1") if err != nil { t.Fatalf("TestDiskUsage failed: %s", err.Error()) } - defer os.RemoveAll(dir_1) + defer os.RemoveAll(dir1) - tmpfile_1, err := ioutil.TempFile(dir_1, "test") - if _, err = tmpfile_1.WriteString("just for testing"); err != nil { + tmpfile1, err := ioutil.TempFile(dir1, "test") + if _, err = tmpfile1.WriteString("just for testing"); err != nil { t.Fatalf("TestDiskUsage failed: %s", err.Error()) } - dir_2, err := ioutil.TempDir(dir_1, "dir_2") + dir2, err := ioutil.TempDir(dir1, "dir_2") if err != nil { t.Fatalf("TestDiskUsage failed: %s", err.Error()) } - tmpfile_2, err := ioutil.TempFile(dir_2, "test") - if _, err = tmpfile_2.WriteString("just for testing"); err != nil { + tmpfile2, err := ioutil.TempFile(dir2, "test") + if _, err = tmpfile2.WriteString("just for testing"); err != nil { t.Fatalf("TestDiskUsage failed: %s", err.Error()) } - dirInfo1, err := os.Lstat(dir_1) + dirInfo1, err := os.Lstat(dir1) if err != nil { t.Fatalf("TestDiskUsage failed: %s", err.Error()) } - dirInfo2, err := os.Lstat(dir_2) + dirInfo2, err := os.Lstat(dir2) if err != nil { t.Fatalf("TestDiskUsage failed: %s", err.Error()) } - file1 := dir_1 + "/" + "test" - file2 := dir_2 + "/" + "test" + file1 := dir1 + "/" + "test" + file2 := dir2 + "/" + "test" fileInfo1, err := os.Lstat(file1) if err != nil { t.Fatalf("TestDiskUsage failed: %s", err.Error()) @@ -66,7 +66,7 @@ func TestDiskUsage(t *testing.T) { } total := dirInfo1.Size() + dirInfo2.Size() + fileInfo1.Size() + fileInfo2.Size() - size, err := DiskUsage(dir_1) + size, err := DiskUsage(dir1) if err != nil { t.Fatalf("TestDiskUsage failed: %s", err.Error()) }