use Default instance for ConnectInfo

This commit is contained in:
Aditya Manthramurthy 2017-01-20 17:53:40 +05:30
parent 3dcb89d8ba
commit e2a99530be
4 changed files with 6 additions and 7 deletions

View File

@ -2,7 +2,6 @@ module Network.Minio
(
D.ConnectInfo(..)
, D.defaultConnectInfo
, D.connect
, D.Minio

View File

@ -1,7 +1,6 @@
module Network.Minio.API
(
connect
, defaultConnectInfo
, RequestInfo(..)
, runMinio
, executeRequest

View File

@ -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

View File

@ -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