Merge pull request #139 from Madhu-1/fix_lint

Fix small lint issues

Author: k8s-ci-robot

pkg/controller/controller.go

@@ -326,10 +326,9 @@ func makeVolumeName(prefix, pvcUID string, volumeNameUUIDLength int) (string, er
 	if volumeNameUUIDLength == -1 {
 		// Default behavior is to not truncate or remove dashes
 		return fmt.Sprintf("%s-%s", prefix, pvcUID), nil
-	} else {
-		// Else we remove all dashes from UUID and truncate to volumeNameUUIDLength
-		return fmt.Sprintf("%s-%s", prefix, strings.Replace(string(pvcUID), "-", "", -1)[0:volumeNameUUIDLength]), nil
 	}
+	// Else we remove all dashes from UUID and truncate to volumeNameUUIDLength
+	return fmt.Sprintf("%s-%s", prefix, strings.Replace(string(pvcUID), "-", "", -1)[0:volumeNameUUIDLength]), nil
 
 }
 
@@ -338,7 +337,7 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
 		return nil, fmt.Errorf("claim Selector is not supported")
 	}
 
-	var needSnapshotSupport bool = false
+	var needSnapshotSupport bool
 	if options.PVC.Spec.DataSource != nil {
 		// PVC.Spec.DataSource.Name is the name of the VolumeSnapshot API object
 		if options.PVC.Spec.DataSource.Name == "" {

pkg/controller/controller_test.go

@@ -352,7 +352,7 @@ func TestGetDriverName(t *testing.T) {
 		in := &csi.GetPluginInfoRequest{}
 
 		out := test.output
-		var injectedErr error = nil
+		var injectedErr error
 		if test.injectError {
 			injectedErr = fmt.Errorf("mock error")
 		}