mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 10:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix golint issues

Browse Source 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
This commit is contained in:
Madhu Rajanna
2019-01-16 18:33:38 +05:30
parent 9ddc265c10
commit 20af5afcab
9 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cephfs/cephuser.go
View File

@ -82,7 +82,7 @@ func getCephUser(adminCr *credentials, volId volumeID) (*cephEntity, error) {
func createCephUser(volOptions *volumeOptions, adminCr *credentials, volId volumeID) (*cephEntity, error) {
caps := cephEntityCaps{
Mds: fmt.Sprintf("allow rw path=%s", getVolumeRootPath_ceph(volId)),
Mds: fmt.Sprintf("allow rw path=%s", getVolumeRootPathCeph(volId)),
Mon: "allow r",
Osd: fmt.Sprintf("allow rw pool=%s namespace=%s", volOptions.Pool, getVolumeNamespace(volId)),
}

4
pkg/cephfs/nodeserver.go
View File

@ -35,7 +35,7 @@ type nodeServer struct {
func getCredentialsForVolume(volOptions *volumeOptions, volId volumeID, req *csi.NodeStageVolumeRequest) (*credentials, error) {
var (
userCr = &credentials{}
userCr *credentials
err error
)
@ -95,7 +95,7 @@ func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol
if volOptions.ProvisionVolume {
// Dynamically provisioned volumes don't have their root path set, do it here
volOptions.RootPath = getVolumeRootPath_ceph(volId)
volOptions.RootPath = getVolumeRootPathCeph(volId)
}
if err = createMountPoint(stagingTargetPath); err != nil {

18
pkg/cephfs/volume.go
View File

@ -29,15 +29,15 @@ const (
namespacePrefix = "ns-"
)
func getCephRootPath_local(volId volumeID) string {
func getCephRootPathLocal(volId volumeID) string {
return cephRootPrefix + string(volId)
}
func getCephRootVolumePath_local(volId volumeID) string {
return path.Join(getCephRootPath_local(volId), cephVolumesRoot, string(volId))
func getCephRootVolumePathLocal(volId volumeID) string {
return path.Join(getCephRootPathLocal(volId), cephVolumesRoot, string(volId))
}
func getVolumeRootPath_ceph(volId volumeID) string {
func getVolumeRootPathCeph(volId volumeID) string {
return path.Join("/", cephVolumesRoot, string(volId))
}
@ -50,7 +50,7 @@ func setVolumeAttribute(root, attrName, attrValue string) error {
}
func createVolume(volOptions *volumeOptions, adminCr *credentials, volId volumeID, bytesQuota int64) error {
cephRoot := getCephRootPath_local(volId)
cephRoot := getCephRootPathLocal(volId)
if err := createMountPoint(cephRoot); err != nil {
return err
@ -74,8 +74,8 @@ func createVolume(volOptions *volumeOptions, adminCr *credentials, volId volumeI
os.Remove(cephRoot)
}()
volOptions.RootPath = getVolumeRootPath_ceph(volId)
localVolRoot := getCephRootVolumePath_local(volId)
volOptions.RootPath = getVolumeRootPathCeph(volId)
localVolRoot := getCephRootVolumePathLocal(volId)
if err := createMountPoint(localVolRoot); err != nil {
return err
@ -100,8 +100,8 @@ func createVolume(volOptions *volumeOptions, adminCr *credentials, volId volumeI
func purgeVolume(volId volumeID, adminCr *credentials, volOptions *volumeOptions) error {
var (
cephRoot = getCephRootPath_local(volId)
volRoot = getCephRootVolumePath_local(volId)
cephRoot = getCephRootPathLocal(volId)
volRoot = getCephRootVolumePathLocal(volId)
volRootDeleting = volRoot + "-deleting"
)

12
pkg/cephfs/volumemounter.go
View File

@ -24,8 +24,8 @@ import (
)
const (
volumeMounter_fuse = "fuse"
volumeMounter_kernel = "kernel"
volumeMounterFuse = "fuse"
volumeMounterKernel = "kernel"
)
var (
@ -39,11 +39,11 @@ func loadAvailableMounters() error {
kernelMounterProbe := exec.Command("mount.ceph")
if fuseMounterProbe.Run() == nil {
availableMounters = append(availableMounters, volumeMounter_fuse)
availableMounters = append(availableMounters, volumeMounterFuse)
}
if kernelMounterProbe.Run() == nil {
availableMounters = append(availableMounters, volumeMounter_kernel)
availableMounters = append(availableMounters, volumeMounterKernel)
}
if len(availableMounters) == 0 {
@ -87,9 +87,9 @@ func newMounter(volOptions *volumeOptions) (volumeMounter, error) {
// Create the mounter
switch chosenMounter {
case volumeMounter_fuse:
case volumeMounterFuse:
return &fuseMounter{}, nil
case volumeMounter_kernel:
case volumeMounterKernel:
return &kernelMounter{}, nil
}

16
pkg/cephfs/volumeoptions.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package cephfs
import (
"errors"
"fmt"
"strconv"
)
@ -70,18 +69,19 @@ func (o *volumeOptions) validate() error {
}
func extractOption(dest *string, optionLabel string, options map[string]string) error {
if opt, ok := options[optionLabel]; !ok {
return errors.New("Missing required field " + optionLabel)
} else {
*dest = opt
return nil
opt, ok := options[optionLabel]
if !ok {
return fmt.Errorf("Missing required field %s", optionLabel)
}
*dest = opt
return nil
}
func validateMounter(m string) error {
switch m {
case volumeMounter_fuse:
case volumeMounter_kernel:
case volumeMounterFuse:
case volumeMounterKernel:
default:
return fmt.Errorf("Unknown mounter '%s'. Valid options are 'fuse' and 'kernel'", m)
}