From 0094e05975d66b8277578a18187338471229614c Mon Sep 17 00:00:00 2001 From: jianglingxia Date: Sat, 17 Nov 2018 12:50:47 +0800 Subject: [PATCH] fix golint problem of volume cephfs/iscsi/nfs --- pkg/volume/cephfs/cephfs.go | 45 ++++++++++++++++----------------- pkg/volume/iscsi/iscsi.go | 46 +++++++++++++++++----------------- pkg/volume/iscsi/iscsi_util.go | 16 ++++++------ pkg/volume/nfs/nfs_test.go | 4 +-- 4 files changed, 55 insertions(+), 56 deletions(-) diff --git a/pkg/volume/cephfs/cephfs.go b/pkg/volume/cephfs/cephfs.go index 99697a0de5..f9da83a440 100644 --- a/pkg/volume/cephfs/cephfs.go +++ b/pkg/volume/cephfs/cephfs.go @@ -144,7 +144,7 @@ func (plugin *cephfsPlugin) newMounterInternal(spec *volume.Spec, podUID types.U path: path, secret: secret, id: id, - secret_file: secretFile, + secretFile: secretFile, readonly: readOnly, mounter: mounter, plugin: plugin, @@ -182,16 +182,16 @@ func (plugin *cephfsPlugin) ConstructVolumeSpec(volumeName, mountPath string) (* // CephFS volumes represent a bare host file or directory mount of an CephFS export. type cephfs struct { - volName string - podUID types.UID - mon []string - path string - id string - secret string - secret_file string - readonly bool - mounter mount.Interface - plugin *cephfsPlugin + volName string + podUID types.UID + mon []string + path string + id string + secret string + secretFile string + readonly bool + mounter mount.Interface + plugin *cephfsPlugin volume.MetricsNil mountOptions []string } @@ -250,10 +250,9 @@ func (cephfsVolume *cephfsMounter) SetUpAt(dir string, fsGroup *int64) error { if err == nil { // cephfs fuse mount succeeded. return nil - } else { - // if cephfs fuse mount failed, fallback to kernel mount. - glog.V(2).Infof("CephFS fuse mount failed: %v, fallback to kernel mount.", err) } + // if cephfs fuse mount failed, fallback to kernel mount. + glog.V(2).Infof("CephFS fuse mount failed: %v, fallback to kernel mount.", err) } glog.V(4).Info("CephFS kernel mount.") @@ -298,19 +297,19 @@ func (cephfsVolume *cephfs) GetKeyringPath() string { func (cephfsVolume *cephfs) execMount(mountpoint string) error { // cephfs mount option - ceph_opt := "" + cephOpt := "" // override secretfile if secret is provided if cephfsVolume.secret != "" { - ceph_opt = "name=" + cephfsVolume.id + ",secret=" + cephfsVolume.secret + cephOpt = "name=" + cephfsVolume.id + ",secret=" + cephfsVolume.secret } else { - ceph_opt = "name=" + cephfsVolume.id + ",secretfile=" + cephfsVolume.secret_file + cephOpt = "name=" + cephfsVolume.id + ",secretfile=" + cephfsVolume.secretFile } // build option array opt := []string{} if cephfsVolume.readonly { opt = append(opt, "ro") } - opt = append(opt, ceph_opt) + opt = append(opt, cephOpt) // build src like mon1:6789,mon2:6789,mon3:6789:/ hosts := cephfsVolume.mon @@ -346,7 +345,7 @@ func (cephfsMounter *cephfsMounter) checkFuseMount() bool { func (cephfsVolume *cephfs) execFuseMount(mountpoint string) error { // cephfs keyring file - keyring_file := "" + keyringFile := "" // override secretfile if secret is provided if cephfsVolume.secret != "" { // TODO: cephfs fuse currently doesn't support secret option, @@ -380,10 +379,10 @@ func (cephfsVolume *cephfs) execFuseMount(mountpoint string) error { return err } - keyring_file = path.Join(keyringPath, fileName) + keyringFile = path.Join(keyringPath, fileName) } else { - keyring_file = cephfsVolume.secret_file + keyringFile = cephfsVolume.secretFile } // build src like mon1:6789,mon2:6789,mon3:6789:/ @@ -399,7 +398,7 @@ func (cephfsVolume *cephfs) execFuseMount(mountpoint string) error { mountArgs := []string{} mountArgs = append(mountArgs, "-k") - mountArgs = append(mountArgs, keyring_file) + mountArgs = append(mountArgs, keyringFile) mountArgs = append(mountArgs, "-m") mountArgs = append(mountArgs, src) mountArgs = append(mountArgs, mountpoint) @@ -423,7 +422,7 @@ func (cephfsVolume *cephfs) execFuseMount(mountpoint string) error { command := exec.Command("ceph-fuse", mountArgs...) output, err := command.CombinedOutput() if err != nil || !(strings.Contains(string(output), "starting fuse")) { - return fmt.Errorf("Ceph-fuse failed: %v\narguments: %s\nOutput: %s\n", err, mountArgs, string(output)) + return fmt.Errorf("ceph-fuse failed: %v\narguments: %s\nOutput: %s", err, mountArgs, string(output)) } return nil diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index f7f2cc2b13..96dba1f03d 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -262,17 +262,17 @@ func (plugin *iscsiPlugin) ConstructBlockVolumeSpec(podUID types.UID, volumeName } type iscsiDisk struct { - VolName string - podUID types.UID - Portals []string - Iqn string - Lun string - Iface string - chap_discovery bool - chap_session bool - secret map[string]string - InitiatorName string - plugin *iscsiPlugin + VolName string + podUID types.UID + Portals []string + Iqn string + Lun string + Iface string + chapDiscovery bool + chapSession bool + secret map[string]string + InitiatorName string + plugin *iscsiPlugin // Utility interface that provides API calls to the provider to attach/detach disks. manager diskManager volume.MetricsProvider @@ -539,18 +539,18 @@ func createISCSIDisk(spec *volume.Spec, podUID types.UID, plugin *iscsiPlugin, m } return &iscsiDisk{ - podUID: podUID, - VolName: spec.Name(), - Portals: bkportal, - Iqn: iqn, - Lun: lun, - Iface: iface, - chap_discovery: chapDiscovery, - chap_session: chapSession, - secret: secret, - InitiatorName: initiatorName, - manager: manager, - plugin: plugin}, nil + podUID: podUID, + VolName: spec.Name(), + Portals: bkportal, + Iqn: iqn, + Lun: lun, + Iface: iface, + chapDiscovery: chapDiscovery, + chapSession: chapSession, + secret: secret, + InitiatorName: initiatorName, + manager: manager, + plugin: plugin}, nil } func createSecretMap(spec *volume.Spec, plugin *iscsiPlugin, namespace string) (map[string]string, error) { diff --git a/pkg/volume/iscsi/iscsi_util.go b/pkg/volume/iscsi/iscsi_util.go index 2e7eee8901..71cace74e2 100644 --- a/pkg/volume/iscsi/iscsi_util.go +++ b/pkg/volume/iscsi/iscsi_util.go @@ -54,12 +54,12 @@ const ( ) var ( - chap_st = []string{ + chapSt = []string{ "discovery.sendtargets.auth.username", "discovery.sendtargets.auth.password", "discovery.sendtargets.auth.username_in", "discovery.sendtargets.auth.password_in"} - chap_sess = []string{ + chapSess = []string{ "node.session.auth.username", "node.session.auth.password", "node.session.auth.username_in", @@ -69,7 +69,7 @@ var ( ) func updateISCSIDiscoverydb(b iscsiDiskMounter, tp string) error { - if !b.chap_discovery { + if !b.chapDiscovery { return nil } out, err := b.exec.Run("iscsiadm", "-m", "discoverydb", "-t", "sendtargets", "-p", tp, "-I", b.Iface, "-o", "update", "-n", "discovery.sendtargets.auth.authmethod", "-v", "CHAP") @@ -77,7 +77,7 @@ func updateISCSIDiscoverydb(b iscsiDiskMounter, tp string) error { return fmt.Errorf("iscsi: failed to update discoverydb with CHAP, output: %v", string(out)) } - for _, k := range chap_st { + for _, k := range chapSt { v := b.secret[k] if len(v) > 0 { out, err := b.exec.Run("iscsiadm", "-m", "discoverydb", "-t", "sendtargets", "-p", tp, "-I", b.Iface, "-o", "update", "-n", k, "-v", v) @@ -90,7 +90,7 @@ func updateISCSIDiscoverydb(b iscsiDiskMounter, tp string) error { } func updateISCSINode(b iscsiDiskMounter, tp string) error { - if !b.chap_session { + if !b.chapSession { return nil } @@ -99,7 +99,7 @@ func updateISCSINode(b iscsiDiskMounter, tp string) error { return fmt.Errorf("iscsi: failed to update node with CHAP, output: %v", string(out)) } - for _, k := range chap_sess { + for _, k := range chapSess { v := b.secret[k] if len(v) > 0 { out, err := b.exec.Run("iscsiadm", "-m", "node", "-p", tp, "-T", b.Iqn, "-I", b.Iface, "-o", "update", "-n", k, "-v", v) @@ -210,7 +210,7 @@ func (util *ISCSIUtil) persistISCSI(conf iscsiDisk, mnt string) error { defer fp.Close() encoder := json.NewEncoder(fp) if err = encoder.Encode(conf); err != nil { - return fmt.Errorf("iscsi: encode err: %v.", err) + return fmt.Errorf("iscsi: encode err: %v", err) } return nil } @@ -224,7 +224,7 @@ func (util *ISCSIUtil) loadISCSI(conf *iscsiDisk, mnt string) error { defer fp.Close() decoder := json.NewDecoder(fp) if err = decoder.Decode(conf); err != nil { - return fmt.Errorf("iscsi: decode err: %v.", err) + return fmt.Errorf("iscsi: decode err: %v", err) } return nil } diff --git a/pkg/volume/nfs/nfs_test.go b/pkg/volume/nfs/nfs_test.go index 924978454b..2c6b7667c7 100644 --- a/pkg/volume/nfs/nfs_test.go +++ b/pkg/volume/nfs/nfs_test.go @@ -89,8 +89,8 @@ func TestRecycler(t *testing.T) { plugMgr.InitPlugins([]volume.VolumePlugin{&nfsPlugin{nil, volume.VolumeConfig{}}}, nil, volumetest.NewFakeVolumeHost(tmpDir, nil, nil)) spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{PersistentVolumeSource: v1.PersistentVolumeSource{NFS: &v1.NFSVolumeSource{Path: "/foo"}}}}} - _, plugin_err := plugMgr.FindRecyclablePluginBySpec(spec) - if plugin_err != nil { + _, pluginErr := plugMgr.FindRecyclablePluginBySpec(spec) + if pluginErr != nil { t.Errorf("Can't find the plugin by name") } }