From e2a99530beaa5fbc7a4c043ab055a066547957e5 Mon Sep 17 00:00:00 2001 From: Aditya Manthramurthy Date: Fri, 20 Jan 2017 17:53:40 +0530 Subject: [PATCH] use Default instance for ConnectInfo --- src/Network/Minio.hs | 1 - src/Network/Minio/API.hs | 1 - src/Network/Minio/Data.hs | 8 ++++---- test/Spec.hs | 3 ++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Network/Minio.hs b/src/Network/Minio.hs index c34dcff..0838145 100644 --- a/src/Network/Minio.hs +++ b/src/Network/Minio.hs @@ -2,7 +2,6 @@ module Network.Minio ( D.ConnectInfo(..) - , D.defaultConnectInfo , D.connect , D.Minio diff --git a/src/Network/Minio/API.hs b/src/Network/Minio/API.hs index 7f1dfb0..f872387 100644 --- a/src/Network/Minio/API.hs +++ b/src/Network/Minio/API.hs @@ -1,7 +1,6 @@ module Network.Minio.API ( connect - , defaultConnectInfo , RequestInfo(..) , runMinio , executeRequest diff --git a/src/Network/Minio/Data.hs b/src/Network/Minio/Data.hs index fe9c4d2..ab07e96 100644 --- a/src/Network/Minio/Data.hs +++ b/src/Network/Minio/Data.hs @@ -14,7 +14,6 @@ module Network.Minio.Data , MinioErr(..) , MErrV(..) , runMinio - , defaultConnectInfo , connect , Payload(..) , s3Name @@ -35,6 +34,8 @@ import Text.XML import Lib.Prelude +-- | Connection Info data type. Use the Default instance to create +-- connection info for your service. data ConnectInfo = ConnectInfo { connectHost :: Text , connectPort :: Int @@ -43,9 +44,8 @@ data ConnectInfo = ConnectInfo { , connectIsSecure :: Bool } deriving (Eq, Show) -defaultConnectInfo :: ConnectInfo -defaultConnectInfo = - ConnectInfo "localhost" 9000 "minio" "minio123" False +instance Default ConnectInfo where + def = ConnectInfo "localhost" 9000 "minio" "minio123" False -- | -- Represents a bucket in the object store diff --git a/test/Spec.hs b/test/Spec.hs index e259f3e..511617f 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -7,6 +7,7 @@ import Lib.Prelude import Control.Monad.Trans.Resource (runResourceT) import qualified Data.Text as T +import Data.Default (Default(..)) -- import qualified Conduit as C -- import Data.Conduit.Binary @@ -51,7 +52,7 @@ liveServerUnitTests :: TestTree liveServerUnitTests = testGroup "Unit tests against a live server" [ testCaseSteps "Various functional tests" $ \step -> do - ret <- runResourceT $ runMinio defaultConnectInfo $ do + ret <- runResourceT $ runMinio def $ do liftIO $ step "getService works and returns no buckets in the beginning." buckets <- getService