use Default instance for ConnectInfo
This commit is contained in:
parent
3dcb89d8ba
commit
e2a99530be
@ -2,7 +2,6 @@ module Network.Minio
|
|||||||
(
|
(
|
||||||
|
|
||||||
D.ConnectInfo(..)
|
D.ConnectInfo(..)
|
||||||
, D.defaultConnectInfo
|
|
||||||
, D.connect
|
, D.connect
|
||||||
|
|
||||||
, D.Minio
|
, D.Minio
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
module Network.Minio.API
|
module Network.Minio.API
|
||||||
(
|
(
|
||||||
connect
|
connect
|
||||||
, defaultConnectInfo
|
|
||||||
, RequestInfo(..)
|
, RequestInfo(..)
|
||||||
, runMinio
|
, runMinio
|
||||||
, executeRequest
|
, executeRequest
|
||||||
|
|||||||
@ -14,7 +14,6 @@ module Network.Minio.Data
|
|||||||
, MinioErr(..)
|
, MinioErr(..)
|
||||||
, MErrV(..)
|
, MErrV(..)
|
||||||
, runMinio
|
, runMinio
|
||||||
, defaultConnectInfo
|
|
||||||
, connect
|
, connect
|
||||||
, Payload(..)
|
, Payload(..)
|
||||||
, s3Name
|
, s3Name
|
||||||
@ -35,6 +34,8 @@ import Text.XML
|
|||||||
|
|
||||||
import Lib.Prelude
|
import Lib.Prelude
|
||||||
|
|
||||||
|
-- | Connection Info data type. Use the Default instance to create
|
||||||
|
-- connection info for your service.
|
||||||
data ConnectInfo = ConnectInfo {
|
data ConnectInfo = ConnectInfo {
|
||||||
connectHost :: Text
|
connectHost :: Text
|
||||||
, connectPort :: Int
|
, connectPort :: Int
|
||||||
@ -43,9 +44,8 @@ data ConnectInfo = ConnectInfo {
|
|||||||
, connectIsSecure :: Bool
|
, connectIsSecure :: Bool
|
||||||
} deriving (Eq, Show)
|
} deriving (Eq, Show)
|
||||||
|
|
||||||
defaultConnectInfo :: ConnectInfo
|
instance Default ConnectInfo where
|
||||||
defaultConnectInfo =
|
def = ConnectInfo "localhost" 9000 "minio" "minio123" False
|
||||||
ConnectInfo "localhost" 9000 "minio" "minio123" False
|
|
||||||
|
|
||||||
-- |
|
-- |
|
||||||
-- Represents a bucket in the object store
|
-- Represents a bucket in the object store
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import Lib.Prelude
|
|||||||
|
|
||||||
import Control.Monad.Trans.Resource (runResourceT)
|
import Control.Monad.Trans.Resource (runResourceT)
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
|
import Data.Default (Default(..))
|
||||||
-- import qualified Conduit as C
|
-- import qualified Conduit as C
|
||||||
-- import Data.Conduit.Binary
|
-- import Data.Conduit.Binary
|
||||||
|
|
||||||
@ -51,7 +52,7 @@ liveServerUnitTests :: TestTree
|
|||||||
liveServerUnitTests = testGroup "Unit tests against a live server"
|
liveServerUnitTests = testGroup "Unit tests against a live server"
|
||||||
[ testCaseSteps "Various functional tests" $ \step -> do
|
[ 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."
|
liftIO $ step "getService works and returns no buckets in the beginning."
|
||||||
buckets <- getService
|
buckets <- getService
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user