Hlint fixes (#173)

* Hlint fixes

- Will require major version bump as some types were changed from data
  to newtype

* ormolu fixes after hlint

examples/FileUploader.hs

@@ -70,5 +70,5 @@ main = do
     fPutObject bucket object filepath defaultPutObjectOptions
 
   case res of
-    Left e -> putStrLn $ "file upload failed due to " ++ (show e)
+    Left e -> putStrLn $ "file upload failed due to " ++ show e
     Right () -> putStrLn "file upload succeeded."

examples/GetConfig.hs

@@ -16,7 +16,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-{-# LANGUAGE OverloadedStrings #-}
 
 import Network.Minio
 import Network.Minio.AdminAPI
@@ -25,6 +24,7 @@ import Prelude
 main :: IO ()
 main = do
   res <-
-    runMinio minioPlayCI $
+    runMinio
+      minioPlayCI
       getConfig
   print res

examples/GetObject.hs

@@ -37,5 +37,5 @@ main = do
     C.connect (gorObjectStream src) $ CB.sinkFileCautious "/tmp/my-object"
 
   case res of
-    Left e -> putStrLn $ "getObject failed." ++ (show e)
+    Left e -> putStrLn $ "getObject failed." ++ show e
     Right _ -> putStrLn "getObject succeeded."

examples/Heal.hs

@@ -16,7 +16,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-{-# LANGUAGE OverloadedStrings #-}
 
 import Network.Minio
 import Network.Minio.AdminAPI

examples/ListIncompleteUploads.hs

@@ -36,7 +36,7 @@ main = do
   res <-
     runMinio minioPlayCI $
       runConduit $
-        listIncompleteUploads bucket Nothing True .| mapM_C (\v -> (liftIO $ print v))
+        listIncompleteUploads bucket Nothing True .| mapM_C (liftIO . print)
   print res
 
 {-

examples/ListObjects.hs

@@ -36,7 +36,7 @@ main = do
   res <-
     runMinio minioPlayCI $
       runConduit $
-        listObjects bucket Nothing True .| mapM_C (\v -> (liftIO $ print v))
+        listObjects bucket Nothing True .| mapM_C (liftIO . print)
   print res
 
 {-

examples/PresignedGetObject.hs

@@ -46,7 +46,7 @@ main = do
   res <- runMinio minioPlayCI $ do
     liftIO $ B.putStrLn "Upload a file that we will fetch with a presigned URL..."
     putObject bucket object (CC.repeat "a") (Just kb15) defaultPutObjectOptions
-    liftIO $ putStrLn $ "Done. Object created at: my-bucket/my-object"
+    liftIO $ putStrLn "Done. Object created at: my-bucket/my-object"
 
     -- Extract Etag of uploaded object
     oi <- statObject bucket object defaultGetObjectOptions

examples/PresignedPostPolicy.hs

@@ -55,7 +55,7 @@ main = do
           ]
 
   case policyE of
-    Left err -> putStrLn $ show err
+    Left err -> print err
     Right policy -> do
       res <- runMinio minioPlayCI $ do
         (url, formData) <- presignedPostPolicy policy
@@ -74,13 +74,14 @@ main = do
             formOptions = B.intercalate " " $ map formFn $ H.toList formData
 
         return $
-          B.intercalate " " $
+          B.intercalate
+            " "
             ["curl", formOptions, "-F file=@/tmp/photo.jpg", url]
 
       case res of
-        Left e -> putStrLn $ "post-policy error: " ++ (show e)
+        Left e -> putStrLn $ "post-policy error: " ++ show e
         Right cmd -> do
-          putStrLn $ "Put a photo at /tmp/photo.jpg and run command:\n"
+          putStrLn "Put a photo at /tmp/photo.jpg and run command:\n"
 
           -- print the generated curl command
           Char8.putStrLn cmd

examples/SelectObject.hs

@@ -19,7 +19,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 import qualified Conduit as C
-import Control.Monad (when)
+import Control.Monad (unless)
 import Network.Minio
 import Prelude
 
@@ -35,7 +35,7 @@ main = do
 
   res <- runMinio minioPlayCI $ do
     exists <- bucketExists bucket
-    when (not exists) $
+    unless exists $
       makeBucket bucket Nothing
 
     C.liftIO $ putStrLn "Uploading csv object"

examples/ServerInfo.hs

@@ -16,7 +16,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-{-# LANGUAGE OverloadedStrings #-}
 
 import Network.Minio
 import Network.Minio.AdminAPI
@@ -25,6 +24,7 @@ import Prelude
 main :: IO ()
 main = do
   res <-
-    runMinio minioPlayCI $
+    runMinio
+      minioPlayCI
       getServerInfo
   print res

examples/ServiceSendRestart.hs

@@ -16,7 +16,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-{-# LANGUAGE OverloadedStrings #-}
 
 import Network.Minio
 import Network.Minio.AdminAPI

examples/ServiceSendStop.hs

@@ -16,7 +16,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-{-# LANGUAGE OverloadedStrings #-}
 
 import Network.Minio
 import Network.Minio.AdminAPI

examples/ServiceStatus.hs

@@ -16,7 +16,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-{-# LANGUAGE OverloadedStrings #-}
 
 import Network.Minio
 import Network.Minio.AdminAPI
@@ -25,6 +24,7 @@ import Prelude
 main :: IO ()
 main = do
   res <-
-    runMinio minioPlayCI $
+    runMinio
+      minioPlayCI
       serviceStatus
   print res

minio-hs.cabal

@@ -58,6 +58,7 @@ common base-settings
                      , DerivingStrategies
                      , FlexibleContexts
                      , FlexibleInstances
+                     , LambdaCase
                      , MultiParamTypeClasses
                      , MultiWayIf
                      , OverloadedStrings

src/Network/Minio/API.hs

@@ -130,18 +130,18 @@ getHostPathRegion ri = do
               regionMay
             )
           virtualStyle =
-            ( ( bucket <> "." <> regionHost,
-                encodeUtf8 $ "/" <> fromMaybe "" (riObject ri),
-                regionMay
-              )
+            ( bucket <> "." <> regionHost,
+              encodeUtf8 $ "/" <> fromMaybe "" (riObject ri),
+              regionMay
             )
-      if
-          | isAWSConnectInfo ci ->
-              return $
-                if bucketHasPeriods bucket
-                  then pathStyle
-                  else virtualStyle
-          | otherwise -> return pathStyle
+      ( if isAWSConnectInfo ci
+          then
+            return $
+              if bucketHasPeriods bucket
+                then pathStyle
+                else virtualStyle
+          else return pathStyle
+        )
 
 buildRequest :: S3ReqInfo -> Minio NC.Request
 buildRequest ri = do
@@ -203,7 +203,7 @@ buildRequest ri = do
                 existingQueryParams = HT.parseQuery (NC.queryString baseRequest)
                 updatedQueryParams = existingQueryParams ++ qpToAdd
             return $ NClient.setQueryString updatedQueryParams baseRequest
-      | isStreamingPayload (riPayload ri') && (not $ connectIsSecure ci') ->
+      | isStreamingPayload (riPayload ri') && not (connectIsSecure ci') ->
           -- case 2 from above.
           do
             (pLen, pSrc) <- case riPayload ri of
@@ -214,15 +214,16 @@ buildRequest ri = do
       | otherwise ->
           do
             sp' <-
-              if
-                  | connectIsSecure ci' ->
-                      -- case 1 described above.
-                      return sp
-                  | otherwise ->
-                      -- case 3 described above.
+              ( if connectIsSecure ci'
+                  then -- case 1 described above.
+                    return sp
+                  else
+                    ( -- case 3 described above.
                       do
                         pHash <- getPayloadSHA256Hash $ riPayload ri'
                         return $ sp {spPayloadHash = Just pHash}
+                    )
+                )
 
             let signHeaders = signV4 sp' baseRequest
             return $
@@ -285,8 +286,8 @@ isValidBucketName bucket =
   not
     ( or
         [ len < 3 || len > 63,
-          or (map labelCheck labels),
-          or (map labelCharsCheck labels),
+          any labelCheck labels,
+          any labelCharsCheck labels,
           isIPCheck
         ]
     )
@@ -316,7 +317,7 @@ isValidBucketName bucket =
 -- Throws exception iff bucket name is invalid according to AWS rules.
 checkBucketNameValidity :: MonadIO m => Bucket -> m ()
 checkBucketNameValidity bucket =
-  when (not $ isValidBucketName bucket) $
+  unless (isValidBucketName bucket) $
     throwIO $
       MErrVInvalidBucketName bucket
 
@@ -326,6 +327,6 @@ isValidObjectName object =
 
 checkObjectNameValidity :: MonadIO m => Object -> m ()
 checkObjectNameValidity object =
-  when (not $ isValidObjectName object) $
+  unless (isValidObjectName object) $
     throwIO $
       MErrVInvalidObjectName object

src/Network/Minio/AdminAPI.hs

@@ -429,7 +429,7 @@ instance FromJSON HealStatus where
 
 healPath :: Maybe Bucket -> Maybe Text -> ByteString
 healPath bucket prefix = do
-  if (isJust bucket)
+  if isJust bucket
     then
       encodeUtf8 $
         "v1/heal/"
@@ -599,12 +599,11 @@ buildAdminRequest :: AdminReqInfo -> Minio NC.Request
 buildAdminRequest areq = do
   ci <- asks mcConnInfo
   sha256Hash <-
-    if
-        | connectIsSecure ci ->
-            -- if secure connection
-            return "UNSIGNED-PAYLOAD"
-        -- otherwise compute sha256
-        | otherwise -> getPayloadSHA256Hash (ariPayload areq)
+    if connectIsSecure ci
+      then -- if secure connection
+        return "UNSIGNED-PAYLOAD"
+      else -- otherwise compute sha256
+        getPayloadSHA256Hash (ariPayload areq)
 
   timeStamp <- liftIO getCurrentTime