mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-29 17:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues found in gometalinter static check

Browse Source 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
This commit is contained in:
Madhu Rajanna 2019-02-04 10:44:37 +05:30
parent 6263b9cdb5
commit 5983fedddb
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cephfs/volumeoptions.go
View File

@ -34,7 +34,7 @@ type volumeOptions struct {
func validateNonEmptyField(field, fieldName string) error { func validateNonEmptyField(field, fieldName string) error {
if field == "" { if field == "" {
return fmt.Errorf("Parameter '%s' cannot be empty", fieldName) return fmt.Errorf("parameter '%s' cannot be empty", fieldName)
} }
return nil return nil
@ -53,7 +53,7 @@ func (o *volumeOptions) validate() error {
} }
} else { } else {
if o.ProvisionVolume { if o.ProvisionVolume {
return fmt.Errorf("Non-empty field rootPath is in conflict with provisionVolume=true") return fmt.Errorf("non-empty field rootPath is in conflict with provisionVolume=true")
} }
} }
@ -75,7 +75,7 @@ func (o *volumeOptions) validate() error {
func extractOption(dest *string, optionLabel string, options map[string]string) error { func extractOption(dest *string, optionLabel string, options map[string]string) error {
opt, ok := options[optionLabel] opt, ok := options[optionLabel]
if !ok { if !ok {
return fmt.Errorf("Missing required field %s", optionLabel) return fmt.Errorf("missing required field %s", optionLabel)
} }
*dest = opt *dest = opt
@ -87,7 +87,7 @@ func validateMounter(m string) error {
case volumeMounterFuse: case volumeMounterFuse:
case volumeMounterKernel: case volumeMounterKernel:
default: default:
return fmt.Errorf("Unknown mounter '%s'. Valid options are 'fuse' and 'kernel'", m) return fmt.Errorf("unknown mounter '%s'. Valid options are 'fuse' and 'kernel'", m)
} }
return nil return nil
@ -134,7 +134,7 @@ func extractNewVolOpt(opts *volumeOptions, volOpt map[string]string) error {
} }
if opts.ProvisionVolume, err = strconv.ParseBool(provisionVolumeBool); err != nil { if opts.ProvisionVolume, err = strconv.ParseBool(provisionVolumeBool); err != nil {
return fmt.Errorf("Failed to parse provisionVolume: %v", err) return fmt.Errorf("failed to parse provisionVolume: %v", err)
} }
if opts.ProvisionVolume { if opts.ProvisionVolume {

4
pkg/rbd/controllerserver.go
View File

@ -338,7 +338,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
return nil, status.Errorf(codes.NotFound, "Source Volume ID %s cannot found", req.GetSourceVolumeId()) return nil, status.Errorf(codes.NotFound, "Source Volume ID %s cannot found", req.GetSourceVolumeId())
} }
if !hasSnapshotFeature(rbdVolume.ImageFeatures) { if !hasSnapshotFeature(rbdVolume.ImageFeatures) {
return nil, fmt.Errorf("Volume(%s) has not snapshot feature(layering)", req.GetSourceVolumeId()) return nil, fmt.Errorf("volume(%s) has not snapshot feature(layering)", req.GetSourceVolumeId())
} }
rbdSnap.VolName = rbdVolume.VolName rbdSnap.VolName = rbdVolume.VolName
@ -437,7 +437,7 @@ func (cs *ControllerServer) doSnapshot(rbdSnap *rbdSnapshot, secret map[string]s
if err != nil { if err != nil {
return fmt.Errorf("snapshot is created but failed to protect and delete snapshot: %v", err) return fmt.Errorf("snapshot is created but failed to protect and delete snapshot: %v", err)
} }
return fmt.Errorf("Snapshot is created but failed to protect snapshot") return fmt.Errorf("snapshot is created but failed to protect snapshot")
} }
} }
return nil return nil

2
pkg/rbd/rbd_attach.go
View File

@ -299,7 +299,7 @@ func createPath(volOpt *rbdVolume, userID string, creds map[string]string) (stri
} }
devicePath, found := waitForPath(volOpt.Pool, image, 10, useNBD) devicePath, found := waitForPath(volOpt.Pool, image, 10, useNBD)
if !found { if !found {
return "", fmt.Errorf("Could not map image %s, Timeout after 10s", imagePath) return "", fmt.Errorf("could not map image %s, Timeout after 10s", imagePath)
} }
return devicePath, nil return devicePath, nil
} }

8
pkg/rbd/rbd_util.go
View File

@ -231,13 +231,13 @@ func getRBDVolumeOptions(volOptions map[string]string) (*rbdVolume, error) {
rbdVol := &rbdVolume{} rbdVol := &rbdVolume{}
rbdVol.Pool, ok = volOptions["pool"] rbdVol.Pool, ok = volOptions["pool"]
if !ok { if !ok {
return nil, fmt.Errorf("Missing required parameter pool") return nil, fmt.Errorf("missing required parameter pool")
} }
rbdVol.Monitors, ok = volOptions["monitors"] rbdVol.Monitors, ok = volOptions["monitors"]
if !ok { if !ok {
// if mons are not set in options, check if they are set in secret // if mons are not set in options, check if they are set in secret
if rbdVol.MonValueFromSecret, ok = volOptions["monValueFromSecret"]; !ok { if rbdVol.MonValueFromSecret, ok = volOptions["monValueFromSecret"]; !ok {
return nil, fmt.Errorf("Either monitors or monValueFromSecret must be set") return nil, fmt.Errorf("either monitors or monValueFromSecret must be set")
} }
} }
rbdVol.ImageFormat, ok = volOptions["imageFormat"] rbdVol.ImageFormat, ok = volOptions["imageFormat"]
@ -283,13 +283,13 @@ func getRBDSnapshotOptions(snapOptions map[string]string) (*rbdSnapshot, error)
rbdSnap := &rbdSnapshot{} rbdSnap := &rbdSnapshot{}
rbdSnap.Pool, ok = snapOptions["pool"] rbdSnap.Pool, ok = snapOptions["pool"]
if !ok { if !ok {
return nil, fmt.Errorf("Missing required parameter pool") return nil, fmt.Errorf("missing required parameter pool")
} }
rbdSnap.Monitors, ok = snapOptions["monitors"] rbdSnap.Monitors, ok = snapOptions["monitors"]
if !ok { if !ok {
// if mons are not set in options, check if they are set in secret // if mons are not set in options, check if they are set in secret
if rbdSnap.MonValueFromSecret, ok = snapOptions["monValueFromSecret"]; !ok { if rbdSnap.MonValueFromSecret, ok = snapOptions["monValueFromSecret"]; !ok {
return nil, fmt.Errorf("Either monitors or monValueFromSecret must be set") return nil, fmt.Errorf("either monitors or monValueFromSecret must be set")
} }
} }
rbdSnap.AdminID, ok = snapOptions["adminid"] rbdSnap.AdminID, ok = snapOptions["adminid"]