Merge pull request #79137 from qingsenLi/k8s-190618-golint

fix golint failures for pkg/volume/scaleio and pkg/volume/storageos

hack/.golint_failures

@@ -257,8 +257,6 @@ pkg/volume/csi/fake
 pkg/volume/git_repo
 pkg/volume/iscsi
 pkg/volume/rbd
-pkg/volume/scaleio
-pkg/volume/storageos
 pkg/volume/testing
 pkg/volume/util/fs
 pkg/volume/util/volumepathhandler

pkg/volume/scaleio/sio_util.go

@@ -76,13 +76,12 @@ var (
 	sdcGUIDLabelName = "scaleio.sdcGUID"
 	sdcRootPath      = "/opt/emc/scaleio/sdc/bin"
 
-	secretNotFoundErr              = errors.New("secret not found")
+	errSecretNotFound              = errors.New("secret not found")
-	configMapNotFoundErr           = errors.New("configMap not found")
+	errGatewayNotProvided          = errors.New("ScaleIO gateway not provided")
-	gatewayNotProvidedErr          = errors.New("ScaleIO gateway not provided")
+	errSecretRefNotProvided        = errors.New("secret ref not provided")
-	secretRefNotProvidedErr        = errors.New("secret ref not provided")
+	errSystemNotProvided           = errors.New("ScaleIO system not provided")
-	systemNotProvidedErr           = errors.New("ScaleIO system not provided")
+	errStoragePoolNotProvided      = errors.New("ScaleIO storage pool not provided")
-	storagePoolNotProvidedErr      = errors.New("ScaleIO storage pool not provided")
+	errProtectionDomainNotProvided = errors.New("ScaleIO protection domain not provided")
-	protectionDomainNotProvidedErr = errors.New("ScaleIO protection domain not provided")
 )
 
 // mapVolumeSpec maps attributes from either ScaleIOVolumeSource  or ScaleIOPersistentVolumeSource to config
@@ -118,19 +117,19 @@ func mapVolumeSpec(config map[string]string, spec *volume.Spec) {
 
 func validateConfigs(config map[string]string) error {
 	if config[confKey.gateway] == "" {
-		return gatewayNotProvidedErr
+		return errGatewayNotProvided
 	}
 	if config[confKey.secretName] == "" {
-		return secretRefNotProvidedErr
+		return errSecretRefNotProvided
 	}
 	if config[confKey.system] == "" {
-		return systemNotProvidedErr
+		return errSystemNotProvided
 	}
 	if config[confKey.storagePool] == "" {
-		return storagePoolNotProvidedErr
+		return errStoragePoolNotProvided
 	}
 	if config[confKey.protectionDomain] == "" {
-		return protectionDomainNotProvidedErr
+		return errProtectionDomainNotProvided
 	}
 
 	return nil
@@ -222,7 +221,7 @@ func attachSecret(plug *sioPlugin, namespace string, configData map[string]strin
 	secretMap, err := volutil.GetSecretForPV(namespace, secretRefName, sioPluginName, kubeClient)
 	if err != nil {
 		klog.Error(log("failed to get secret: %v", err))
-		return secretNotFoundErr
+		return errSecretNotFound
 	}
 	// merge secret data
 	for key, val := range secretMap {

pkg/volume/scaleio/sio_util_test.go

@@ -93,7 +93,7 @@ func TestUtilValidateConfigs(t *testing.T) {
 		confKey.secretName: "sio-secret",
 		confKey.system:     "sio",
 	}
-	if err := validateConfigs(data); err != gatewayNotProvidedErr {
+	if err := validateConfigs(data); err != errGatewayNotProvided {
 		t.Error("Expecting error for missing gateway, but did not get it")
 	}
 }

pkg/volume/storageos/storageos_util.go

@@ -37,9 +37,12 @@ const (
 	modeFile
 	modeUnsupported
 
-	ErrDeviceNotFound     = "device not found"
+	//ErrDeviceNotFound defines "device not found"
+	ErrDeviceNotFound = "device not found"
+	//ErrDeviceNotSupported defines "device not supported"
 	ErrDeviceNotSupported = "device not supported"
-	ErrNotAvailable       = "not available"
+	//ErrNotAvailable defines "not available"
+	ErrNotAvailable = "not available"
 )
 
 type deviceType int