github/csi-driver-nvmf
1
0
Fork 0
mirror of https://github.com/kubernetes-csi/csi-driver-nvmf.git synced 2025-06-21 20:17:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use filepath.Join instead of strings.Join

Browse Source
This commit is contained in:
haruband 2023-04-19 10:13:47 +09:00
parent 1830134ea1
commit e08b289d59
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/nvmf/fabrics.go
View File

@ -22,6 +22,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath"
"strings" "strings"
"github.com/kubernetes-csi/csi-driver-nvmf/pkg/utils" "github.com/kubernetes-csi/csi-driver-nvmf/pkg/utils"
@ -176,7 +177,7 @@ func disconnectByNqn(nqn, hostnqn string) int {
} }
// delete hostnqn file // delete hostnqn file
hostnqnPath := strings.Join([]string{RUN_NVMF, nqn, b64.StdEncoding.EncodeToString([]byte(hostnqn))}, "/") hostnqnPath := filepath.Join(RUN_NVMF, nqn, b64.StdEncoding.EncodeToString([]byte(hostnqn)))
os.Remove(hostnqnPath) os.Remove(hostnqnPath)
devices, err := ioutil.ReadDir(SYS_NVMF) devices, err := ioutil.ReadDir(SYS_NVMF)
@ -191,7 +192,7 @@ func disconnectByNqn(nqn, hostnqn string) int {
} }
} }
nqnPath := strings.Join([]string{RUN_NVMF, nqn}, "/") nqnPath := filepath.Join(RUN_NVMF, nqn)
hostnqns, err := ioutil.ReadDir(nqnPath) hostnqns, err := ioutil.ReadDir(nqnPath)
if err != nil { if err != nil {
klog.Errorf("Disconnect: readdir %s err: %v", nqnPath, err) klog.Errorf("Disconnect: readdir %s err: %v", nqnPath, err)
@ -258,7 +259,7 @@ func (c *Connector) Connect() (string, error) {
} }
// create nqn directory // create nqn directory
nqnPath := strings.Join([]string{RUN_NVMF, c.TargetNqn}, "/") nqnPath := filepath.Join(RUN_NVMF, c.TargetNqn)
if err := os.MkdirAll(nqnPath, 0750); err != nil { if err := os.MkdirAll(nqnPath, 0750); err != nil {
klog.Errorf("create nqn directory %s error %v, rollback!!!", c.TargetNqn, err) klog.Errorf("create nqn directory %s error %v, rollback!!!", c.TargetNqn, err)
ret := disconnectByNqn(c.TargetNqn, c.HostNqn) ret := disconnectByNqn(c.TargetNqn, c.HostNqn)
@ -269,7 +270,7 @@ func (c *Connector) Connect() (string, error) {
} }
// create hostnqn file // create hostnqn file
hostnqnPath := strings.Join([]string{RUN_NVMF, c.TargetNqn, b64.StdEncoding.EncodeToString([]byte(c.HostNqn))}, "/") hostnqnPath := filepath.Join(RUN_NVMF, c.TargetNqn, b64.StdEncoding.EncodeToString([]byte(c.HostNqn)))
file, err := os.Create(hostnqnPath) file, err := os.Create(hostnqnPath)
if err != nil { if err != nil {
klog.Errorf("create hostnqn file %s:%s error %v, rollback!!!", c.TargetNqn, c.HostNqn, err) klog.Errorf("create hostnqn file %s:%s error %v, rollback!!!", c.TargetNqn, c.HostNqn, err)