Improve initializing ConnectInfo (minio#101)

- Remove ConnectInfo's Default instance - Add support for reading from well-known credential files and environment variables
sinhaashish · Jun 30, 2018 · 44bbd66 · 44bbd66
1 parent 8273910
commit 44bbd66
Show file tree

Hide file tree

Showing 11 changed files with 232 additions and 206 deletions.
diff --git a/minio-hs.cabal b/minio-hs.cabal
@@ -57,11 +57,12 @@ library
                      , containers >= 0.5
                      , cryptonite >= 0.25
                      , cryptonite-conduit >= 0.2
-                     , data-default >= 0.7
+                     , directory
                      , filepath >= 1.4
                      , http-client >= 0.5
                      , http-conduit >= 2.3
                      , http-types >= 0.12
+                     , ini
                      , memory >= 0.14
                      , resourcet >= 1.2
                      , text >= 1.2
@@ -142,12 +143,12 @@ test-suite minio-hs-live-server-test
                      , containers
                      , cryptonite
                      , cryptonite-conduit
-                     , data-default
                      , directory
                      , filepath
                      , http-client
                      , http-conduit
                      , http-types
+                     , ini
                      , memory
                      , QuickCheck
                      , resourcet
@@ -181,11 +182,12 @@ test-suite minio-hs-test
                      , containers
                      , cryptonite
                      , cryptonite-conduit
-                     , data-default
+                     , filepath
                      , directory
                      , http-client
                      , http-conduit
                      , http-types
+                     , ini
                      , memory
                      , QuickCheck
                      , resourcet

diff --git a/src/Network/Minio.hs b/src/Network/Minio.hs
@@ -18,18 +18,27 @@
 
 module Network.Minio
   (
+  -- * Credentials
+    Credentials (..)
+  , fromAWSConfigFile
+  , fromAWSEnv
+  , fromMinioEnv
 
   -- * Connecting to object storage
   ---------------------------------
-    ConnectInfo(..)
-  , awsCI
-  , gcsCI
+  , ConnectInfo
+  , setRegion
+  , setCreds
+  , setCredsFrom
+  , MinioConn
+  , mkMinioConn
 
   -- ** Connection helpers
   ------------------------
-  , awsWithRegionCI
   , minioPlayCI
-  , minioCI
+  , awsCI
+  , gcsCI
+
 
   -- * Minio Monad
   ----------------
@@ -39,8 +48,9 @@ module Network.Minio
   -- this Monad.
 
   , Minio
+  , runMinioWith
   , runMinio
-  , def
+
 
   -- * Bucket Operations
   ----------------------
@@ -76,12 +86,16 @@ module Network.Minio
 
   -- ** Bucket Notifications
   , Notification(..)
+  , defaultNotification
   , NotificationConfig(..)
   , Arn
   , Event(..)
   , Filter(..)
+  , defaultFilter
   , FilterKey(..)
+  , defaultFilterKey
   , FilterRules(..)
+  , defaultFilterRules
   , FilterRule(..)
   , getBucketNotification
   , putBucketNotification
@@ -99,6 +113,7 @@ module Network.Minio
   , putObject
   -- | Input data type represents PutObject options.
   , PutObjectOptions
+  , defaultPutObjectOptions
   , pooContentType
   , pooContentEncoding
   , pooContentDisposition
@@ -111,6 +126,7 @@ module Network.Minio
   , getObject
   -- | Input data type represents GetObject options.
   , GetObjectOptions
+  , defaultGetObjectOptions
   , gooRange
   , gooIfMatch
   , gooIfNoneMatch
@@ -120,6 +136,7 @@ module Network.Minio
   -- ** Server-side copying
   , copyObject
   , SourceInfo
+  , defaultSourceInfo
   , srcBucket
   , srcObject
   , srcRange
@@ -128,6 +145,7 @@ module Network.Minio
   , srcIfModifiedSince
   , srcIfUnmodifiedSince
   , DestinationInfo
+  , defaultDestinationInfo
   , dstBucket
   , dstObject
 
@@ -178,7 +196,6 @@ This module exports the high-level Minio API for object storage.
 import qualified Data.Conduit             as C
 import qualified Data.Conduit.Binary      as CB
 import qualified Data.Conduit.Combinators as CC
-import           Data.Default             (def)
 
 import           Lib.Prelude
 

diff --git a/src/Network/Minio/API.hs b/src/Network/Minio/API.hs
@@ -31,7 +31,6 @@ module Network.Minio.API
 import qualified Data.ByteString           as B
 import qualified Data.Char                 as C
 import qualified Data.Conduit              as C
-import           Data.Default              (def)
 import qualified Data.Map                  as Map
 import qualified Data.Text                 as T
 import qualified Data.Time.Clock           as Time
@@ -53,7 +52,7 @@ import           Network.Minio.XmlParser
 -- | Fetch bucket location (region)
 getLocation :: Bucket -> Minio Region
 getLocation bucket = do
-  resp <- executeRequest $ def {
+  resp <- executeRequest $ defaultS3ReqInfo {
       riBucket = Just bucket
     , riQueryParams = [("location", Nothing)]
     , riNeedsLocation = False

diff --git a/src/Network/Minio/CopyObject.hs b/src/Network/Minio/CopyObject.hs
@@ -16,7 +16,6 @@
 
 module Network.Minio.CopyObject where
 
-import           Data.Default         (def)
 import qualified Data.List            as List
 
 import           Lib.Prelude
@@ -81,7 +80,7 @@ multiPartCopyObject b o cps srcSize = do
       partRanges = selectCopyRanges byteRange
       partSources = map (\(x, (start, end)) -> (x, cps {srcRange = Just (start, end) }))
                     partRanges
-      dstInfo = def { dstBucket = b, dstObject = o}
+      dstInfo = defaultDestinationInfo { dstBucket = b, dstObject = o}
 
   copiedParts <- limitedMapConcurrently 10
                  (\(pn, cps') -> do