Merge pull request #859 from mowangdk/cleanup/delete_remove_all

cleanup: delete RemoveAll MkdirAll method
kubernetes-sigs · Sep 5, 2023 · b9f0aeb · b9f0aeb
2 parents 8488217 + b36f1f6
commit b9f0aeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/pkg/metric/fuse_stat_collector.go b/pkg/metric/fuse_stat_collector.go
@@ -479,7 +479,7 @@ func NewFuseStatCollector() (Collector, error) {
 func getPodUID(fsClientPathPrefix string, fsClientType string) ([]string, error) {
 	fsClientPath := fsClientPathPrefix + fsClientType
 	if !utils.IsFileExisting(fsClientPath) {
-		_ = utils.MkdirAll(fsClientPath, os.FileMode(0755))
+		_ = os.MkdirAll(fsClientPath, os.FileMode(0755))
 	}
 	return listDirectory(fsClientPathPrefix + fsClientType)
 }

diff --git a/pkg/utils/util.go b/pkg/utils/util.go
@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/fs"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -918,21 +917,13 @@ func IsPathAvailiable(path string) error {
 	return nil
 }
 
-func RemoveAll(deletePath string) error {
-	return os.RemoveAll(deletePath)
-}
-
-func MkdirAll(path string, mode fs.FileMode) error {
-	return os.MkdirAll(path, mode)
-}
-
 func WriteMetricsInfo(metricsPathPrefix string, req *csi.NodePublishVolumeRequest, metricsTop string, clientName string, storageBackendName string, fsName string) {
 	podUIDPath := metricsPathPrefix + req.VolumeContext["csi.storage.k8s.io/pod.uid"] + "/"
 	mountPointPath := podUIDPath + req.GetVolumeId() + "/"
 	podInfoName := "pod_info"
 	mountPointName := "mount_point_info"
 	if !IsFileExisting(mountPointPath) {
-		_ = MkdirAll(mountPointPath, os.FileMode(0755))
+		_ = os.MkdirAll(mountPointPath, os.FileMode(0755))
 	}
 	if !IsFileExisting(podUIDPath + podInfoName) {
 		info := req.VolumeContext["csi.storage.k8s.io/pod.namespace"] + " " +