antiope-s3 7.4.2 → 7.4.3

raw patch · 6 files changed

+74/−23 lines, 6 filesdep +dlistPVP ok

version bump matches the API change (PVP)

Dependencies added: dlist

API changes (from Hackage documentation)

Files

• antiope-s3.cabal +2/−1
• src/Antiope/S3.hs +0/−18
• src/Antiope/S3/Internal.hs +23/−1
• src/Antiope/S3/Lazy.hs +43/−1
• src/Antiope/S3/Types.hs +6/−0
• test/Antiope/S3/MessagesSpec.hs +0/−2

@@ -1,7 +1,7 @@ cabal-version: 2.4  name:                   antiope-s3-version:                7.4.2+version:                7.4.3 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme> description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>. category:               Services@@ -54,6 +54,7 @@                       , exceptions                       , generic-lens                       , http-types+                      , dlist                 >= 0.8.0.7                       , lens                       , mtl                       , network-uri

@@ -109,24 +109,6 @@  -- Private -- --- Builds the request for the next page of a NextObjectsV2 request,--- based on the original request and the most recent response.-nextPageReq :: ListObjectsV2 -> ListObjectsV2Response -> ListObjectsV2-nextPageReq initial resp =-  initial & lovContinuationToken .~ resp ^. lovrsNextContinuationToken---- The type signature is like this so that it can be used with `unfoldM`-lsBucketPage :: MonadAWS m-  => Maybe ListObjectsV2-  -> m (Maybe (ListObjectsV2Response, Maybe ListObjectsV2))-lsBucketPage Nothing    = pure Nothing-lsBucketPage (Just req) = do-  resp <- AWS.send req-  pure . Just . (resp, ) $-    case resp ^. lovrsIsTruncated of-      Just True -> Just $ nextPageReq req resp-      _         -> Nothing- -- | Streams all pages of the result (ListObjectsV2Responses) of a ListObjectsV2 -- request from S3. -- lsBucketResponseStream :: MonadAWS m => ListObjectsV2 -> ConduitT i ListObjectsV2Response m ()

@@ -1,10 +1,32 @@ {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE TupleSections     #-}  module Antiope.S3.Internal where +import Control.Lens import Data.Monoid    ((<>)) import Data.Text      (Text)-import Network.AWS.S3 (BucketName (..), ObjectKey (..))+import Network.AWS    (MonadAWS)+import Network.AWS.S3 +import qualified Network.AWS as AWS+ toS3Uri :: BucketName -> ObjectKey -> Text toS3Uri (BucketName b) (ObjectKey k) = "s3://" <> b <> "/" <> k++-- Builds the request for the next page of a NextObjectsV2 request,+-- based on the original request and the most recent response.+nextPageReq :: ListObjectsV2 -> ListObjectsV2Response -> ListObjectsV2+nextPageReq initial resp = initial & lovContinuationToken .~ resp ^. lovrsNextContinuationToken++-- The type signature is like this so that it can be used with `unfoldM`+lsBucketPage :: MonadAWS m+  => Maybe ListObjectsV2+  -> m (Maybe (ListObjectsV2Response, Maybe ListObjectsV2))+lsBucketPage Nothing    = pure Nothing+lsBucketPage (Just req) = do+  resp <- AWS.send req+  pure . Just . (resp, ) $+    case resp ^. lovrsIsTruncated of+      Just True -> Just $ nextPageReq req resp+      _         -> Nothing

@@ -1,4 +1,6 @@+{-# LANGUAGE DataKinds           #-} {-# LANGUAGE ScopedTypeVariables #-}+{-# LANGUAGE TypeApplications    #-}  module Antiope.S3.Lazy   ( unsafeDownload@@ -6,18 +8,27 @@   , download   , downloadRequest   , downloadFromS3Uri+  , listObjectsV2+  , listS3Uris+  , dlistObjectsV2+  , dlistS3Uris+  , s3UriToListObjectsV2   ) where  import Antiope.Core.Error import Antiope.S3.GetObject-import Antiope.S3.Types             (S3Uri (S3Uri))+import Antiope.S3.Types             (S3Uri (S3Uri), s3UriToListObjectsV2) import Control.Lens+import Control.Monad.IO.Unlift import Control.Monad.Trans.Resource import Network.AWS                  (MonadAWS) +import qualified Antiope.S3.Internal  as I import qualified Data.ByteString.Lazy as LBS+import qualified Data.DList           as DL import qualified Network.AWS          as AWS import qualified Network.AWS.S3       as AWS+import qualified System.IO.Unsafe     as IO  unsafeDownloadRequest :: (MonadAWS m, MonadResource m)   => AWS.GetObject@@ -47,3 +58,34 @@   => S3Uri   -> m (Maybe LBS.ByteString) downloadFromS3Uri (S3Uri b k) = download b k++dlistObjectsV2 :: (MonadAWS m, MonadResource m, MonadUnliftIO m)+  => AWS.ListObjectsV2+  -> m (DL.DList AWS.ListObjectsV2Response)+dlistObjectsV2 req = do+  f <- askUnliftIO+  r <- AWS.send req+  case r ^. AWS.lovrsIsTruncated of+    Just True -> do+      rs <- liftIO $ IO.unsafeInterleaveIO (unliftIO f (dlistObjectsV2 (I.nextPageReq req r)))+      return (DL.cons r rs)+    _ -> return (DL.singleton r)++dlistS3Uris :: (MonadAWS m, MonadResource m, MonadUnliftIO m)+  => AWS.ListObjectsV2+  -> m (DL.DList S3Uri)+dlistS3Uris req = dlistObjectsV2 req >>= toS3Uris+  where toS3Uris responses  = return (responses >>= toS3Uris')+        toS3Uris' response  = do+          c <- response ^. AWS.lovrsContents & DL.fromList+          response ^.. AWS.lovrsName . _Just & DL.fromList <&> \bucketName -> S3Uri bucketName (c ^. AWS.oKey)++listObjectsV2 :: (MonadAWS m, MonadResource m, MonadUnliftIO m)+  => AWS.ListObjectsV2+  -> m [AWS.ListObjectsV2Response]+listObjectsV2 req = DL.toList <$> dlistObjectsV2 req++listS3Uris :: (MonadAWS m, MonadResource m, MonadUnliftIO m)+  => AWS.ListObjectsV2+  -> m [S3Uri]+listS3Uris req = DL.toList <$> dlistS3Uris req

@@ -12,6 +12,7 @@   , readWhile   , dirname   , Range(..)+  , s3UriToListObjectsV2   ) where  import Antiope.S3.Internal@@ -33,6 +34,7 @@ import qualified Data.Attoparsec.Combinator      as DAC import qualified Data.Attoparsec.Text            as DAT import qualified Data.Text                       as T+import qualified Network.AWS.S3                  as AWS import qualified Network.AWS.S3.Types            as X import qualified Text.ParserCombinators.ReadPrec as RP @@ -102,3 +104,7 @@ dirname :: S3Uri -> S3Uri dirname (S3Uri bk (ObjectKey key)) = S3Uri bk (ObjectKey newKey)   where newKey = T.intercalate "/" (reverse (drop 1 (dropWhile T.null (reverse (T.splitOn "/" key)))))++s3UriToListObjectsV2 :: S3Uri -> AWS.ListObjectsV2+s3UriToListObjectsV2 s3Uri = AWS.listObjectsV2 (s3Uri ^. the @"bucket")+  & AWS.lovPrefix ?~ (s3Uri ^. the @"objectKey" . the @1)

@@ -64,5 +64,3 @@   it "Can encode and decode S3Message" $ require $ property $ do     msg <- forAll $ s3Message     tripping msg encode decode--