diff --git a/pkg/cephfs/cephuser.go b/pkg/cephfs/cephuser.go index b85dc4de1..340a8dbec 100644 --- a/pkg/cephfs/cephuser.go +++ b/pkg/cephfs/cephuser.go @@ -96,7 +96,7 @@ func createCephUser(volOptions *volumeOptions, adminCr *credentials, volID volum "osd", caps.Osd, } - if err := execCommandJson(&ents, "ceph", args[:]...); err != nil { + if err := execCommandJSON(&ents, "ceph", args[:]...); err != nil { return nil, fmt.Errorf("error creating ceph user: %v", err) } diff --git a/pkg/cephfs/driver.go b/pkg/cephfs/driver.go index 20ef8fbdd..564c2b25a 100644 --- a/pkg/cephfs/driver.go +++ b/pkg/cephfs/driver.go @@ -65,7 +65,7 @@ func NewNodeServer(d *csicommon.CSIDriver) *nodeServer { } } -func (fs *driver) Run(driverName, nodeId, endpoint, volumeMounter string, cachePersister util.CachePersister) { +func (fs *driver) Run(driverName, nodeID, endpoint, volumeMounter string, cachePersister util.CachePersister) { glog.Infof("Driver: %v version: %v", driverName, Version) // Configuration @@ -91,7 +91,7 @@ func (fs *driver) Run(driverName, nodeId, endpoint, volumeMounter string, cacheP // Initialize default library driver - fs.cd = csicommon.NewCSIDriver(driverName, Version, nodeId) + fs.cd = csicommon.NewCSIDriver(driverName, Version, nodeID) if fs.cd == nil { glog.Fatalln("Failed to initialize CSI driver") } diff --git a/pkg/cephfs/util.go b/pkg/cephfs/util.go index 5fb418ca6..25b5638e0 100644 --- a/pkg/cephfs/util.go +++ b/pkg/cephfs/util.go @@ -53,7 +53,7 @@ func execCommandAndValidate(program string, args ...string) error { return nil } -func execCommandJson(v interface{}, program string, args ...string) error { +func execCommandJSON(v interface{}, program string, args ...string) error { out, err := execCommand(program, args...) if err != nil { diff --git a/pkg/cephfs/volumemounter.go b/pkg/cephfs/volumemounter.go index ead40fabe..58ff48abd 100644 --- a/pkg/cephfs/volumemounter.go +++ b/pkg/cephfs/volumemounter.go @@ -55,7 +55,7 @@ func loadAvailableMounters() error { } type volumeMounter interface { - mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volId volumeID) error + mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error name() string } @@ -99,12 +99,12 @@ func newMounter(volOptions *volumeOptions) (volumeMounter, error) { type fuseMounter struct{} -func mountFuse(mountPoint string, cr *credentials, volOptions *volumeOptions, volId volumeID) error { +func mountFuse(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error { args := [...]string{ mountPoint, - "-c", getCephConfPath(volId), + "-c", getCephConfPath(volID), "-n", cephEntityClientPrefix + cr.id, - "--keyring", getCephKeyringPath(volId, cr.id), + "--keyring", getCephKeyringPath(volID, cr.id), "-r", volOptions.RootPath, "-o", "nonempty", } @@ -121,19 +121,19 @@ func mountFuse(mountPoint string, cr *credentials, volOptions *volumeOptions, vo return nil } -func (m *fuseMounter) mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volId volumeID) error { +func (m *fuseMounter) mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error { if err := createMountPoint(mountPoint); err != nil { return err } - return mountFuse(mountPoint, cr, volOptions, volId) + return mountFuse(mountPoint, cr, volOptions, volID) } func (m *fuseMounter) name() string { return "Ceph FUSE driver" } type kernelMounter struct{} -func mountKernel(mountPoint string, cr *credentials, volOptions *volumeOptions, volId volumeID) error { +func mountKernel(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error { if err := execCommandAndValidate("modprobe", "ceph"); err != nil { return err } @@ -143,16 +143,16 @@ func mountKernel(mountPoint string, cr *credentials, volOptions *volumeOptions, fmt.Sprintf("%s:%s", volOptions.Monitors, volOptions.RootPath), mountPoint, "-o", - fmt.Sprintf("name=%s,secretfile=%s", cr.id, getCephSecretPath(volId, cr.id)), + fmt.Sprintf("name=%s,secretfile=%s", cr.id, getCephSecretPath(volID, cr.id)), ) } -func (m *kernelMounter) mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volId volumeID) error { +func (m *kernelMounter) mount(mountPoint string, cr *credentials, volOptions *volumeOptions, volID volumeID) error { if err := createMountPoint(mountPoint); err != nil { return err } - return mountKernel(mountPoint, cr, volOptions, volId) + return mountKernel(mountPoint, cr, volOptions, volID) } func (m *kernelMounter) name() string { return "Ceph kernel client" } diff --git a/pkg/rbd/controllerserver.go b/pkg/rbd/controllerserver.go index f449b60e3..639d7d4c4 100644 --- a/pkg/rbd/controllerserver.go +++ b/pkg/rbd/controllerserver.go @@ -415,7 +415,7 @@ func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnap return nil, err } - sourceVolumeId := req.GetSourceVolumeId() + sourceVolumeID := req.GetSourceVolumeId() // TODO (sngchlko) list with token // TODO (#94) protect concurrent access to global data structures @@ -424,8 +424,8 @@ func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnap if snapshotID := req.GetSnapshotId(); len(snapshotID) != 0 { if rbdSnap, ok := rbdSnapshots[snapshotID]; ok { // if source volume ID also set, check source volume id on the cache. - if len(sourceVolumeId) != 0 && rbdSnap.SourceVolumeID != sourceVolumeId { - return nil, status.Errorf(codes.Unknown, "Requested Source Volume ID %s is different from %s", sourceVolumeId, rbdSnap.SourceVolumeID) + if len(sourceVolumeID) != 0 && rbdSnap.SourceVolumeID != sourceVolumeID { + return nil, status.Errorf(codes.Unknown, "Requested Source Volume ID %s is different from %s", sourceVolumeID, rbdSnap.SourceVolumeID) } return &csi.ListSnapshotsResponse{ Entries: []*csi.ListSnapshotsResponse_Entry{ @@ -450,7 +450,7 @@ func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnap entries := []*csi.ListSnapshotsResponse_Entry{} for _, rbdSnap := range rbdSnapshots { // if source volume ID also set, check source volume id on the cache. - if len(sourceVolumeId) != 0 && rbdSnap.SourceVolumeID != sourceVolumeId { + if len(sourceVolumeID) != 0 && rbdSnap.SourceVolumeID != sourceVolumeID { continue } entries = append(entries, &csi.ListSnapshotsResponse_Entry{ diff --git a/pkg/rbd/rbd_attach.go b/pkg/rbd/rbd_attach.go index 3b022ff62..ee7b39a2c 100644 --- a/pkg/rbd/rbd_attach.go +++ b/pkg/rbd/rbd_attach.go @@ -210,7 +210,7 @@ func checkRbdNbdTools() bool { return true } -func attachRBDImage(volOptions *rbdVolume, userId string, credentials map[string]string) (string, error) { +func attachRBDImage(volOptions *rbdVolume, userID string, credentials map[string]string) (string, error) { var err error var output []byte @@ -242,7 +242,7 @@ func attachRBDImage(volOptions *rbdVolume, userId string, credentials map[string Steps: rbdImageWatcherSteps, } err := wait.ExponentialBackoff(backoff, func() (bool, error) { - used, rbdOutput, err := rbdStatus(volOptions, userId, credentials) + used, rbdOutput, err := rbdStatus(volOptions, userID, credentials) if err != nil { return false, fmt.Errorf("fail to check rbd image status with: (%v), rbd output: (%s)", err, rbdOutput) } @@ -263,12 +263,12 @@ func attachRBDImage(volOptions *rbdVolume, userId string, credentials map[string } glog.V(5).Infof("rbd: map mon %s", mon) - key, err := getRBDKey(userId, credentials) + key, err := getRBDKey(userID, credentials) if err != nil { return "", err } output, err = execCommand(cmdName, []string{ - "map", imagePath, "--id", userId, "-m", mon, "--key=" + key}) + "map", imagePath, "--id", userID, "-m", mon, "--key=" + key}) if err != nil { glog.Warningf("rbd: map error %v, rbd output: %s", err, string(output)) return "", fmt.Errorf("rbd: map failed %v, rbd output: %s", err, string(output))