minio-hs 1.5.0 → 1.5.1

raw patch · 7 files changed

+22/−14 lines, 7 files

Files

CHANGELOG.md +4/−0
minio-hs.cabal +1/−1
src/Network/Minio/Data.hs +2/−3
src/Network/Minio/Utils.hs +0/−1
src/Network/Minio/XmlParser.hs +4/−4
stack.yaml +1/−1
test/LiveServer.hs +10/−4

CHANGELOG.md view

@@ -1,6 +1,10 @@ Changelog ========== +## Version 1.5.1++* Add support for GHC 8.8+ ## Version 1.5.0  * Switch to faster map data type - all previous usage of

minio-hs.cabal view

@@ -1,5 +1,5 @@ name:                minio-hs-version:             1.5.0+version:             1.5.1 synopsis:            A MinIO Haskell Library for Amazon S3 compatible cloud                      storage. description:         The MinIO Haskell client library provides simple APIs to

src/Network/Minio/Data.hs view

@@ -21,10 +21,9 @@ module Network.Minio.Data where  import qualified Conduit                      as C-import           Control.Concurrent.MVar      (MVar) import qualified Control.Concurrent.MVar      as M-import           Control.Monad.IO.Unlift      (MonadUnliftIO, UnliftIO (..),-                                               askUnliftIO, withUnliftIO)+import           Control.Monad.IO.Unlift      (UnliftIO (..), askUnliftIO,+                                               withUnliftIO) import           Control.Monad.Trans.Resource import qualified Data.Aeson                   as A import qualified Data.ByteArray               as BA

src/Network/Minio/Utils.hs view

@@ -26,7 +26,6 @@ import qualified Data.HashMap.Strict           as H import qualified Data.List                     as List import qualified Data.Text                     as T-import           Data.Text.Encoding.Error      (lenientDecode) import           Data.Text.Read                (decimal) import           Data.Time                     (defaultTimeLocale, parseTimeM,                                                 rfc822DateFormat)

src/Network/Minio/XmlParser.hs view

@@ -56,10 +56,10 @@ uncurry6 f (a, b, c, d, e, g) = f a b c d e g  -- | Parse time strings from XML-parseS3XMLTime :: (MonadIO m) => Text -> m UTCTime-parseS3XMLTime = either (throwIO . MErrVXmlParse) return-               . parseTimeM True defaultTimeLocale s3TimeFormat-               . T.unpack+parseS3XMLTime :: MonadIO m => Text -> m UTCTime+parseS3XMLTime t =+    maybe (throwIO $ MErrVXmlParse $ "timestamp parse failure: " <> t) return $+    parseTimeM True defaultTimeLocale s3TimeFormat $ T.unpack t  parseDecimal :: (MonadIO m, Integral a) => Text -> m a parseDecimal numStr = either (throwIO . MErrVXmlParse . show) return $

stack.yaml view

@@ -15,7 +15,7 @@ # resolver: #  name: custom-snapshot #  location: "./custom-snapshot.yaml"-resolver: lts-13.1+resolver: lts-14.6  # User packages to be built. # Various formats can be used as shown in the example below.

test/LiveServer.hs view

@@ -77,6 +77,15 @@ funTestBucketPrefix :: Text funTestBucketPrefix = "miniohstest-" +loadTestServer :: IO ConnectInfo+loadTestServer = do+    val <- lookupEnv "MINIO_LOCAL"+    isSecure <- lookupEnv "MINIO_SECURE"+    return $ case (val, isSecure) of+      (Just _, Just _) -> setCreds (Credentials "minio" "minio123") "https://localhost:9000"+      (Just _, Nothing) -> setCreds (Credentials "minio" "minio123") "http://localhost:9000"+      (Nothing, _) -> minioPlayCI+ funTestWithBucket :: TestName                   -> (([Char] -> Minio ()) -> Bucket -> Minio ()) -> TestTree funTestWithBucket t minioTest = testCaseSteps t $ \step -> do@@ -84,10 +93,7 @@   bktSuffix <- liftIO $ generate $ Q.vectorOf 10 (Q.choose ('a', 'z'))   let b = T.concat [funTestBucketPrefix, T.pack bktSuffix]       liftStep = liftIO . step-  connInfo <- ( bool minioPlayCI-                  ( setCreds (Credentials "minio" "minio123") "http://localhost:9000" )-                  . isJust-              ) <$> lookupEnv "MINIO_LOCAL"+  connInfo <- loadTestServer   ret <- runMinio connInfo $ do     liftStep $ "Creating bucket for test - " ++ t     foundBucket <- bucketExists b