Merge pull request #167 from IBM/rclone-typo

Fix linter issues

Author: ashimagarg27

cos-csi-mounter/server/rclone.go

@@ -95,11 +95,11 @@ func (args RCloneArgs) Validate(targetPath string) error {
 
 	// Check if rclone config file exists or not
 	if exists, err := fileExists(args.ConfigPath); err != nil {
-		logger.Error("error checking file existence", zap.Error(err), zap.Any("path", args.ConfigPath))
-		return fmt.Errorf("error checking file existence: %v", err)
+		logger.Error("error checking rclone config file existence", zap.Error(err))
+		return fmt.Errorf("error checking rclone config file existence: %v", err)
 	} else if !exists {
-		logger.Error("file not found", zap.Error(err), zap.Any("path", args.ConfigPath))
-		return fmt.Errorf("file not found: %v", args.ConfigPath)
+		logger.Error("rclone config file not found")
+		return fmt.Errorf("rclone config file not found")
 	}
 
 	// Check if value of daemon parameter is boolean "true" or "false"

cos-csi-mounter/server/s3fs.go

@@ -106,14 +106,6 @@ func (args S3FSArgs) Validate(targetPath string) error {
 		return fmt.Errorf("invalid value for 'curldbg' param. Should be either 'body' or 'normal': %v", args.CurlDebug)
 	}
 
-	if !(strings.HasPrefix(args.EndPoint, "https://") || strings.HasPrefix(args.EndPoint, "http://")) {
-		logger.Error("bad value for endpoint: scheme is missing."+
-			" Must be of the form http://<hostname> or https://<hostname>",
-			zap.String("endpoint", args.EndPoint))
-		return fmt.Errorf("bad value for endpoint \"%v\": scheme is missing."+
-			" Must be of the form http://<hostname> or https://<hostname>", args.EndPoint)
-	}
-
 	// Check if value of gid parameter can be converted to integer
 	if args.GID != "" {
 		_, err := strconv.Atoi(args.GID)
@@ -205,11 +197,11 @@ func (args S3FSArgs) Validate(targetPath string) error {
 
 	// Check if .passwd file exists or not
 	if exists, err := fileExists(args.PasswdFilePath); err != nil {
-		logger.Error("error checking file existence", zap.Error(err), zap.Any("path", args.PasswdFilePath))
-		return fmt.Errorf("error checking file existence: %v", err)
+		logger.Error("error checking credential file existence", zap.Error(err))
+		return fmt.Errorf("error checking credential file existence: %v", err)
 	} else if !exists {
-		logger.Error("file not found", zap.Error(err), zap.Any("path", args.PasswdFilePath))
-		return fmt.Errorf("file not found: %v", args.PasswdFilePath)
+		logger.Error("credential file not found")
+		return fmt.Errorf("credential file not found")
 	}
 
 	// Check if value of ro parameter is boolean "true" or "false"
@@ -295,5 +287,13 @@ func (args S3FSArgs) Validate(targetPath string) error {
 		}
 	}
 
+	if !(strings.HasPrefix(args.URL, "https://") || strings.HasPrefix(args.URL, "http://")) {
+		logger.Error("bad value for url: scheme is missing."+
+			" Must be of the form http://<hostname> or https://<hostname>",
+			zap.String("url", args.URL))
+		return fmt.Errorf("bad value for url \"%v\": scheme is missing."+
+			" Must be of the form http://<hostname> or https://<hostname>", args.URL)
+	}
+
 	return nil
 }

cos-csi-mounter/server/server.go

@@ -158,7 +158,7 @@ func handleCosUnmount() gin.HandlerFunc {
 			return
 		}
 
-		logger.Info("bucket unmount is Successful", zap.Any("path", request.Path))
+		logger.Info("bucket unmount is successful", zap.Any("path", request.Path))
 		c.JSON(http.StatusOK, "Success!!")
 	}
 }