Skip to content

Commit ac55a51

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#85056 from pohsienshih/volume/golint
Fix golint issues for pkg/volume/rbd
2 parents 5726fa2 + 9bfe818 commit ac55a51

File tree

5 files changed

+92
-93
lines changed

5 files changed

+92
-93
lines changed

‎hack/.golint_failures‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ pkg/volume/azure_file
210210
pkg/volume/csi/fake
211211
pkg/volume/git_repo
212212
pkg/volume/iscsi
213-
pkg/volume/rbd
214213
pkg/volume/testing
215214
pkg/volume/util/fs
216215
pkg/volume/util/volumepathhandler

‎pkg/volume/rbd/attacher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
// NewAttacher implements AttachableVolumePlugin.NewAttacher.
3434
func (plugin *rbdPlugin) NewAttacher() (volume.Attacher, error) {
35-
return plugin.newAttacherInternal(&RBDUtil{})
35+
return plugin.newAttacherInternal(&rbdUtil{})
3636
}
3737

3838
// NewDeviceMounter implements DeviceMountableVolumePlugin.NewDeviceMounter
@@ -50,7 +50,7 @@ func (plugin *rbdPlugin) newAttacherInternal(manager diskManager) (volume.Attach
5050

5151
// NewDetacher implements AttachableVolumePlugin.NewDetacher.
5252
func (plugin *rbdPlugin) NewDetacher() (volume.Detacher, error) {
53-
return plugin.newDetacherInternal(&RBDUtil{})
53+
return plugin.newDetacherInternal(&rbdUtil{})
5454
}
5555

5656
// NewDeviceUnmounter implements DeviceMountableVolumePlugin.NewDeviceUnmounter

‎pkg/volume/rbd/rbd.go‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var (
4848
supportedFeatures = sets.NewString("layering")
4949
)
5050

51-
// This is the primary entrypoint for volume plugins.
51+
// ProbeVolumePlugins is the primary entrypoint for volume plugins.
5252
func ProbeVolumePlugins() []volume.VolumePlugin {
5353
return []volume.VolumePlugin{&rbdPlugin{}}
5454
}
@@ -72,7 +72,7 @@ const (
7272
secretKeyName = "key" // key name used in secret
7373
rbdImageFormat1 = "1"
7474
rbdImageFormat2 = "2"
75-
rbdDefaultAdminId = "admin"
75+
rbdDefaultAdminID = "admin"
7676
rbdDefaultAdminSecretNamespace = "default"
7777
rbdDefaultPool = "rbd"
7878
)
@@ -154,7 +154,7 @@ func (plugin *rbdPlugin) getAdminAndSecret(spec *volume.Spec) (string, string, e
154154
}
155155

156156
if admin == "" {
157-
admin = rbdDefaultAdminId
157+
admin = rbdDefaultAdminID
158158
}
159159
secret, err := parsePVSecret(adminSecretNamespace, adminSecretName, plugin.host.GetKubeClient())
160160
if err != nil {
@@ -182,22 +182,22 @@ func (plugin *rbdPlugin) ExpandVolumeDevice(spec *volume.Spec, newSize resource.
182182
Image: spec.PersistentVolume.Spec.RBD.RBDImage,
183183
Pool: spec.PersistentVolume.Spec.RBD.RBDPool,
184184
plugin: plugin,
185-
manager: &RBDUtil{},
185+
manager: &rbdUtil{},
186186
mounter: &mount.SafeFormatAndMount{Interface: plugin.host.GetMounter(plugin.GetPluginName())},
187187
exec: plugin.host.GetExec(plugin.GetPluginName()),
188188
},
189189
Mon: spec.PersistentVolume.Spec.RBD.CephMonitors,
190-
adminId: admin,
190+
adminID: admin,
191191
adminSecret: secret,
192192
},
193193
}
194194

195195
expandedSize, err := expander.ResizeImage(oldSize, newSize)
196196
if err != nil {
197197
return oldSize, err
198-
} else {
199-
return expandedSize, nil
200198
}
199+
return expandedSize, nil
200+
201201
}
202202

203203
func (plugin *rbdPlugin) NodeExpand(resizeOptions volume.NodeResizeOptions) (bool, error) {
@@ -283,9 +283,9 @@ func (plugin *rbdPlugin) createMounterFromVolumeSpecAndPod(spec *volume.Spec, po
283283
}
284284

285285
return &rbdMounter{
286-
rbd: newRBD("", spec.Name(), img, pool, ro, plugin, &RBDUtil{}),
286+
rbd: newRBD("", spec.Name(), img, pool, ro, plugin, &rbdUtil{}),
287287
Mon: mon,
288-
Id: id,
288+
ID: id,
289289
Keyring: keyring,
290290
Secret: secret,
291291
fsType: fstype,
@@ -316,7 +316,7 @@ func (plugin *rbdPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, _ volume.Vol
316316
}
317317

318318
// Inject real implementations here, test through the internal function.
319-
return plugin.newMounterInternal(spec, pod.UID, &RBDUtil{}, secret)
319+
return plugin.newMounterInternal(spec, pod.UID, &rbdUtil{}, secret)
320320
}
321321

322322
func (plugin *rbdPlugin) newMounterInternal(spec *volume.Spec, podUID types.UID, manager diskManager, secret string) (volume.Mounter, error) {
@@ -356,7 +356,7 @@ func (plugin *rbdPlugin) newMounterInternal(spec *volume.Spec, podUID types.UID,
356356
return &rbdMounter{
357357
rbd: newRBD(podUID, spec.Name(), img, pool, ro, plugin, manager),
358358
Mon: mon,
359-
Id: id,
359+
ID: id,
360360
Keyring: keyring,
361361
Secret: secret,
362362
fsType: fstype,
@@ -367,7 +367,7 @@ func (plugin *rbdPlugin) newMounterInternal(spec *volume.Spec, podUID types.UID,
367367

368368
func (plugin *rbdPlugin) NewUnmounter(volName string, podUID types.UID) (volume.Unmounter, error) {
369369
// Inject real implementations here, test through the internal function.
370-
return plugin.newUnmounterInternal(volName, podUID, &RBDUtil{})
370+
return plugin.newUnmounterInternal(volName, podUID, &rbdUtil{})
371371
}
372372

373373
func (plugin *rbdPlugin) newUnmounterInternal(volName string, podUID types.UID, manager diskManager) (volume.Unmounter, error) {
@@ -498,7 +498,7 @@ func (plugin *rbdPlugin) NewBlockVolumeMapper(spec *volume.Spec, pod *v1.Pod, _
498498
}
499499
}
500500

501-
return plugin.newBlockVolumeMapperInternal(spec, uid, &RBDUtil{}, secret, plugin.host.GetMounter(plugin.GetPluginName()), plugin.host.GetExec(plugin.GetPluginName()))
501+
return plugin.newBlockVolumeMapperInternal(spec, uid, &rbdUtil{}, secret, plugin.host.GetMounter(plugin.GetPluginName()), plugin.host.GetExec(plugin.GetPluginName()))
502502
}
503503

504504
func (plugin *rbdPlugin) newBlockVolumeMapperInternal(spec *volume.Spec, podUID types.UID, manager diskManager, secret string, mounter mount.Interface, exec utilexec.Interface) (volume.BlockVolumeMapper, error) {
@@ -537,7 +537,7 @@ func (plugin *rbdPlugin) newBlockVolumeMapperInternal(spec *volume.Spec, podUID
537537
}
538538

539539
func (plugin *rbdPlugin) NewBlockVolumeUnmapper(volName string, podUID types.UID) (volume.BlockVolumeUnmapper, error) {
540-
return plugin.newUnmapperInternal(volName, podUID, &RBDUtil{})
540+
return plugin.newUnmapperInternal(volName, podUID, &rbdUtil{})
541541
}
542542

543543
func (plugin *rbdPlugin) newUnmapperInternal(volName string, podUID types.UID, manager diskManager) (volume.BlockVolumeUnmapper, error) {
@@ -575,21 +575,21 @@ func (plugin *rbdPlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) {
575575
return nil, err
576576
}
577577

578-
return plugin.newDeleterInternal(spec, admin, secret, &RBDUtil{})
578+
return plugin.newDeleterInternal(spec, admin, secret, &rbdUtil{})
579579
}
580580

581581
func (plugin *rbdPlugin) newDeleterInternal(spec *volume.Spec, admin, secret string, manager diskManager) (volume.Deleter, error) {
582582
return &rbdVolumeDeleter{
583583
rbdMounter: &rbdMounter{
584584
rbd: newRBD("", spec.Name(), spec.PersistentVolume.Spec.RBD.RBDImage, spec.PersistentVolume.Spec.RBD.RBDPool, false, plugin, manager),
585585
Mon: spec.PersistentVolume.Spec.RBD.CephMonitors,
586-
adminId: admin,
586+
adminID: admin,
587587
adminSecret: secret,
588588
}}, nil
589589
}
590590

591591
func (plugin *rbdPlugin) NewProvisioner(options volume.VolumeOptions) (volume.Provisioner, error) {
592-
return plugin.newProvisionerInternal(options, &RBDUtil{})
592+
return plugin.newProvisionerInternal(options, &rbdUtil{})
593593
}
594594

595595
func (plugin *rbdPlugin) newProvisionerInternal(options volume.VolumeOptions, manager diskManager) (volume.Provisioner, error) {
@@ -633,13 +633,13 @@ func (r *rbdVolumeProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
633633
arr := dstrings.Split(v, ",")
634634
r.Mon = append(r.Mon, arr...)
635635
case "adminid":
636-
r.adminId = v
636+
r.adminID = v
637637
case "adminsecretname":
638638
adminSecretName = v
639639
case "adminsecretnamespace":
640640
adminSecretNamespace = v
641641
case "userid":
642-
r.Id = v
642+
r.ID = v
643643
case "pool":
644644
r.Pool = v
645645
case "usersecretname":
@@ -655,9 +655,8 @@ func (r *rbdVolumeProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
655655
for _, f := range arr {
656656
if !supportedFeatures.Has(f) {
657657
return nil, fmt.Errorf("invalid feature %q for volume plugin %s, supported features are: %v", f, r.plugin.GetPluginName(), supportedFeatures)
658-
} else {
659-
r.imageFeatures = append(r.imageFeatures, f)
660658
}
659+
r.imageFeatures = append(r.imageFeatures, f)
661660
}
662661
case volume.VolumeParameterFSType:
663662
fstype = v
@@ -684,14 +683,14 @@ func (r *rbdVolumeProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
684683
if secretName == "" && keyring == "" {
685684
return nil, fmt.Errorf("must specify either keyring or user secret name")
686685
}
687-
if r.adminId == "" {
688-
r.adminId = rbdDefaultAdminId
686+
if r.adminID == "" {
687+
r.adminID = rbdDefaultAdminID
689688
}
690689
if r.Pool == "" {
691690
r.Pool = rbdDefaultPool
692691
}
693-
if r.Id == "" {
694-
r.Id = r.adminId
692+
if r.ID == "" {
693+
r.ID = r.adminID
695694
}
696695

697696
// create random image name
@@ -727,7 +726,7 @@ func (r *rbdVolumeProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
727726
}
728727
}
729728

730-
rbd.RadosUser = r.Id
729+
rbd.RadosUser = r.ID
731730
rbd.FSType = fstype
732731
pv.Spec.PersistentVolumeSource.RBD = rbd
733732
pv.Spec.PersistentVolumeReclaimPolicy = r.options.PersistentVolumeReclaimPolicy
@@ -808,12 +807,12 @@ type rbdMounter struct {
808807
*rbd
809808
// capitalized so they can be exported in persistRBD()
810809
Mon []string
811-
Id string
810+
ID string
812811
Keyring string
813812
Secret string
814813
fsType string
815814
adminSecret string
816-
adminId string
815+
adminID string
817816
mountOptions []string
818817
imageFormat string
819818
imageFeatures []string
@@ -822,10 +821,10 @@ type rbdMounter struct {
822821

823822
var _ volume.Mounter = &rbdMounter{}
824823

825-
func (b *rbd) GetAttributes() volume.Attributes {
824+
func (rbd *rbd) GetAttributes() volume.Attributes {
826825
return volume.Attributes{
827-
ReadOnly: b.ReadOnly,
828-
Managed: !b.ReadOnly,
826+
ReadOnly: rbd.ReadOnly,
827+
Managed: !rbd.ReadOnly,
829828
SupportsSELinux: true,
830829
}
831830
}
@@ -890,7 +889,7 @@ type rbdDiskMapper struct {
890889
keyring string
891890
secret string
892891
adminSecret string
893-
adminId string
892+
adminID string
894893
imageFormat string
895894
imageFeatures []string
896895
}
@@ -930,7 +929,7 @@ func (rbd *rbd) rbdGlobalMapPath(spec *volume.Spec) (string, error) {
930929
}
931930

932931
mounter := &rbdMounter{
933-
rbd: newRBD("", spec.Name(), img, pool, ro, rbd.plugin, &RBDUtil{}),
932+
rbd: newRBD("", spec.Name(), img, pool, ro, rbd.plugin, &rbdUtil{}),
934933
Mon: mon,
935934
}
936935
return rbd.manager.MakeGlobalVDPDName(*mounter.rbd), nil
@@ -1082,9 +1081,8 @@ func getVolumeAccessModes(spec *volume.Spec) ([]v1.PersistentVolumeAccessMode, e
10821081
if spec.PersistentVolume != nil {
10831082
if spec.PersistentVolume.Spec.RBD != nil {
10841083
return spec.PersistentVolume.Spec.AccessModes, nil
1085-
} else {
1086-
return nil, fmt.Errorf("Spec does not reference a RBD volume type")
10871084
}
1085+
return nil, fmt.Errorf("Spec does not reference a RBD volume type")
10881086
}
10891087

10901088
return nil, nil

‎pkg/volume/rbd/rbd_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ type fakeDiskManager struct {
140140
rbdDevices map[string]bool
141141
}
142142

143-
func NewFakeDiskManager() *fakeDiskManager {
143+
func newFakeDiskManager() *fakeDiskManager {
144144
return &fakeDiskManager{
145145
rbdImageLocks: make(map[string]bool),
146146
rbdMapIndex: 0,
@@ -256,7 +256,7 @@ func doTestPlugin(t *testing.T, c *testcase) {
256256
}
257257
fakeMounter := fakeVolumeHost.GetMounter(plug.GetPluginName()).(*mount.FakeMounter)
258258
fakeNodeName := types.NodeName("localhost")
259-
fdm := NewFakeDiskManager()
259+
fdm := newFakeDiskManager()
260260

261261
// attacher
262262
attacher, err := plug.(*rbdPlugin).newAttacherInternal(fdm)
@@ -539,7 +539,7 @@ func TestGetDeviceMountPath(t *testing.T) {
539539
if err != nil {
540540
t.Errorf("Can't find the plugin by name")
541541
}
542-
fdm := NewFakeDiskManager()
542+
fdm := newFakeDiskManager()
543543

544544
// attacher
545545
attacher, err := plug.(*rbdPlugin).newAttacherInternal(fdm)

0 commit comments

Comments
 (0)