677acfb · stackage · git.iko.soy

git.iko.soy/stackage

on master help sign in

Updated aws patch

677acfbMichael Snoyman13 years ago

patching/patches/aws-0.8.5.patch → patching/patches/aws-0.8.6.patchrenamed+30−70

compare with master

unifiedsplit

@@ -1,6 +1,6 @@

1diff -ru orig/Aws/Aws.hs new/Aws/Aws.hs

2−--- orig/Aws/Aws.hs 2014-04-03 08:17:21.058394778 +0300

2+--- orig/Aws/Aws.hs 2014-04-03 08:40:55.146364680 +0300

3−+++ new/Aws/Aws.hs 2014-04-03 08:17:20.000000000 +0300

3++++ new/Aws/Aws.hs 2014-04-03 08:40:54.000000000 +0300

4@@ -33,7 +33,6 @@

5 import Control.Monad.IO.Class

6 import Control.Monad.Trans

@@ -35,8 +35,8 @@ diff -ru orig/Aws/Aws.hs new/Aws/Aws.hs

35 Nothing -> return ()

36 Just nextRequest -> go nextRequest

37diff -ru orig/Aws/Core.hs new/Aws/Core.hs

38−--- orig/Aws/Core.hs 2014-04-03 08:17:21.058394778 +0300

38+--- orig/Aws/Core.hs 2014-04-03 08:40:55.146364680 +0300

39−+++ new/Aws/Core.hs 2014-04-03 08:17:20.000000000 +0300

39++++ new/Aws/Core.hs 2014-04-03 08:40:54.000000000 +0300

40@@ -89,13 +89,12 @@

41 import Control.Applicative

42 import Control.Arrow

@@ -136,8 +136,8 @@ diff -ru orig/Aws/Core.hs new/Aws/Core.hs

136+ Left err -> liftIO $ throwM err

137+ Right v -> return v

138diff -ru orig/Aws/DynamoDb/Core.hs new/Aws/DynamoDb/Core.hs

139−--- orig/Aws/DynamoDb/Core.hs 2014-04-03 08:17:21.062394778 +0300

139+--- orig/Aws/DynamoDb/Core.hs 2014-04-03 08:40:55.146364680 +0300

140−+++ new/Aws/DynamoDb/Core.hs 2014-04-03 08:17:20.000000000 +0300

140++++ new/Aws/DynamoDb/Core.hs 2014-04-03 08:40:54.000000000 +0300

141@@ -2,6 +2,7 @@

142

143 import Aws.Core

@@ -155,46 +155,29 @@ diff -ru orig/Aws/DynamoDb/Core.hs new/Aws/DynamoDb/Core.hs

155+ A.Error err -> throwM $ DyError (HTTP.responseStatus resp) "" err

156+ _ -> throwM $ DyError (HTTP.responseStatus resp) "" (show val)

157diff -ru orig/Aws/Ec2/InstanceMetadata.hs new/Aws/Ec2/InstanceMetadata.hs

158−--- orig/Aws/Ec2/InstanceMetadata.hs 2014-04-03 08:17:21.062394778 +0300

158+--- orig/Aws/Ec2/InstanceMetadata.hs 2014-04-03 08:40:55.146364680 +0300

159−+++ new/Aws/Ec2/InstanceMetadata.hs 2014-04-03 08:17:20.000000000 +0300

159++++ new/Aws/Ec2/InstanceMetadata.hs 2014-04-03 08:40:54.000000000 +0300

160−@@ -2,8 +2,7 @@

160+@@ -2,7 +2,7 @@

161

162 import Control.Applicative

163 import Control.Exception

164-import Control.Failure

165−-import Control.Monad.Trans.Resource

166+import Control.Monad.Trans.Resource (throwM)

165+import Control.Monad.Trans.Resource (throwM)

167 import qualified Data.ByteString.Lazy as L

166 import qualified Data.ByteString.Lazy as L

168 import qualified Data.ByteString.Lazy.Char8 as B8

167 import qualified Data.ByteString.Lazy.Char8 as B8

169 import Data.ByteString.Lazy.UTF8 as BU

168 import Data.ByteString.Lazy.UTF8 as BU

170−@@ -16,19 +15,19 @@

169+@@ -25,7 +25,7 @@

171−

172− instance Exception InstanceMetadataException

173−

174−-getInstanceMetadata :: HTTP.Manager -> String -> String -> ResIO L.ByteString

175−+getInstanceMetadata :: HTTP.Manager -> String -> String -> IO L.ByteString

176− getInstanceMetadata mgr p x = do req <- HTTP.parseUrl ("http://169.254.169.254/" ++ p ++ '/' : x)

177− HTTP.responseBody <$> HTTP.httpLbs req mgr

178−

179−-getInstanceMetadataListing :: HTTP.Manager -> String -> ResIO [String]

180−+getInstanceMetadataListing :: HTTP.Manager -> String -> IO [String]

181− getInstanceMetadataListing mgr p = map BU.toString . B8.split '\n' <$> getInstanceMetadata mgr p ""

182−

183−-getInstanceMetadataFirst :: HTTP.Manager -> String -> ResIO L.ByteString

184−+getInstanceMetadataFirst :: HTTP.Manager -> String -> IO L.ByteString

170+ getInstanceMetadataFirst :: HTTP.Manager -> String -> IO L.ByteString

185 getInstanceMetadataFirst mgr p = do listing <- getInstanceMetadataListing mgr p

171 getInstanceMetadataFirst mgr p = do listing <- getInstanceMetadataListing mgr p

186 case listing of

172 case listing of

187- [] -> failure (MetadataNotFound p)

173- [] -> failure (MetadataNotFound p)

188+ [] -> throwM (MetadataNotFound p)

174+ [] -> throwM (MetadataNotFound p)

189 (x:_) -> getInstanceMetadata mgr p x

175 (x:_) -> getInstanceMetadata mgr p x

190

176

191−-getInstanceMetadataOrFirst :: HTTP.Manager -> String -> Maybe String -> ResIO L.ByteString

192−+getInstanceMetadataOrFirst :: HTTP.Manager -> String -> Maybe String -> IO L.ByteString

177+ getInstanceMetadataOrFirst :: HTTP.Manager -> String -> Maybe String -> IO L.ByteString

193− getInstanceMetadataOrFirst mgr p (Just x) = getInstanceMetadata mgr p x

194− getInstanceMetadataOrFirst mgr p Nothing = getInstanceMetadataFirst mgr p

195diff -ru orig/Aws/Iam/Core.hs new/Aws/Iam/Core.hs

178diff -ru orig/Aws/Iam/Core.hs new/Aws/Iam/Core.hs

196−--- orig/Aws/Iam/Core.hs 2014-04-03 08:17:21.062394778 +0300

179+--- orig/Aws/Iam/Core.hs 2014-04-03 08:40:55.146364680 +0300

197−+++ new/Aws/Iam/Core.hs 2014-04-03 08:17:20.000000000 +0300

180++++ new/Aws/Iam/Core.hs 2014-04-03 08:40:54.000000000 +0300

198@@ -19,8 +19,8 @@

181@@ -19,8 +19,8 @@

199 import qualified Blaze.ByteString.Builder as Blaze

182 import qualified Blaze.ByteString.Builder as Blaze

200 import qualified Blaze.ByteString.Builder.Char8 as Blaze8

183 import qualified Blaze.ByteString.Builder.Char8 as Blaze8

@@ -232,8 +215,8 @@ diff -ru orig/Aws/Iam/Core.hs new/Aws/Iam/Core.hs

232 userArn <- attr "Arn"

215 userArn <- attr "Arn"

233 userCreateDate <- attr "CreateDate" >>= parseDateTime . Text.unpack

216 userCreateDate <- attr "CreateDate" >>= parseDateTime . Text.unpack

234diff -ru orig/Aws/Iam/Internal.hs new/Aws/Iam/Internal.hs

217diff -ru orig/Aws/Iam/Internal.hs new/Aws/Iam/Internal.hs

235−--- orig/Aws/Iam/Internal.hs 2014-04-03 08:17:21.062394778 +0300

218+--- orig/Aws/Iam/Internal.hs 2014-04-03 08:40:55.146364680 +0300

236−+++ new/Aws/Iam/Internal.hs 2014-04-03 08:17:20.000000000 +0300

219++++ new/Aws/Iam/Internal.hs 2014-04-03 08:40:54.000000000 +0300

237@@ -15,8 +15,8 @@

220@@ -15,8 +15,8 @@

238 import Aws.Iam.Core

221 import Aws.Iam.Core

239 import Control.Applicative

222 import Control.Applicative

@@ -254,8 +237,8 @@ diff -ru orig/Aws/Iam/Internal.hs new/Aws/Iam/Internal.hs

254 -> m (Bool, Maybe Text)

237 -> m (Bool, Maybe Text)

255 markedIterResponse cursor = do

238 markedIterResponse cursor = do

256diff -ru orig/Aws/S3/Commands/CopyObject.hs new/Aws/S3/Commands/CopyObject.hs

239diff -ru orig/Aws/S3/Commands/CopyObject.hs new/Aws/S3/Commands/CopyObject.hs

257−--- orig/Aws/S3/Commands/CopyObject.hs 2014-04-03 08:17:21.062394778 +0300

240+--- orig/Aws/S3/Commands/CopyObject.hs 2014-04-03 08:40:55.150364680 +0300

258−+++ new/Aws/S3/Commands/CopyObject.hs 2014-04-03 08:17:20.000000000 +0300

241++++ new/Aws/S3/Commands/CopyObject.hs 2014-04-03 08:40:54.000000000 +0300

259@@ -5,7 +5,7 @@

242@@ -5,7 +5,7 @@

260 import Aws.S3.Core

243 import Aws.S3.Core

261 import Control.Applicative

244 import Control.Applicative

@@ -275,8 +258,8 @@ diff -ru orig/Aws/S3/Commands/CopyObject.hs new/Aws/S3/Commands/CopyObject.hs

275 lastMod <- forceM "Missing Last-Modified" $ el $/ elContent "LastModified" &| (parseHttpDate' . T.unpack)

258 lastMod <- forceM "Missing Last-Modified" $ el $/ elContent "LastModified" &| (parseHttpDate' . T.unpack)

276 etag <- force "Missing ETag" $ el $/ elContent "ETag"

259 etag <- force "Missing ETag" $ el $/ elContent "ETag"

277diff -ru orig/Aws/S3/Core.hs new/Aws/S3/Core.hs

260diff -ru orig/Aws/S3/Core.hs new/Aws/S3/Core.hs

278−--- orig/Aws/S3/Core.hs 2014-04-03 08:17:21.062394778 +0300

261+--- orig/Aws/S3/Core.hs 2014-04-03 08:40:55.150364680 +0300

279−+++ new/Aws/S3/Core.hs 2014-04-03 08:17:20.000000000 +0300

262++++ new/Aws/S3/Core.hs 2014-04-03 08:40:54.000000000 +0300

280@@ -5,8 +5,8 @@

263@@ -5,8 +5,8 @@

281 import Control.Arrow ((***))

264 import Control.Arrow ((***))

282 import Control.Monad

265 import Control.Monad

@@ -392,8 +375,8 @@ diff -ru orig/Aws/S3/Core.hs new/Aws/S3/Core.hs

392 -- expiration = return undefined

375 -- expiration = return undefined

393 userMetadata = flip mapMaybe ht $

376 userMetadata = flip mapMaybe ht $

394diff -ru orig/Aws/Ses/Core.hs new/Aws/Ses/Core.hs

377diff -ru orig/Aws/Ses/Core.hs new/Aws/Ses/Core.hs

395−--- orig/Aws/Ses/Core.hs 2014-04-03 08:17:21.062394778 +0300

378+--- orig/Aws/Ses/Core.hs 2014-04-03 08:40:55.150364680 +0300

396−+++ new/Aws/Ses/Core.hs 2014-04-03 08:17:20.000000000 +0300

379++++ new/Aws/Ses/Core.hs 2014-04-03 08:40:54.000000000 +0300

397@@ -22,8 +22,8 @@

380@@ -22,8 +22,8 @@

398 import qualified Blaze.ByteString.Builder as Blaze

381 import qualified Blaze.ByteString.Builder as Blaze

399 import qualified Blaze.ByteString.Builder.Char8 as Blaze8

382 import qualified Blaze.ByteString.Builder.Char8 as Blaze8

@@ -414,8 +397,8 @@ diff -ru orig/Aws/Ses/Core.hs new/Aws/Ses/Core.hs

414 class SesAsQuery a where

397 class SesAsQuery a where

415 -- | Write a data type as a list of query parameters.

398 -- | Write a data type as a list of query parameters.

416diff -ru orig/Aws/SimpleDb/Core.hs new/Aws/SimpleDb/Core.hs

399diff -ru orig/Aws/SimpleDb/Core.hs new/Aws/SimpleDb/Core.hs

417−--- orig/Aws/SimpleDb/Core.hs 2014-04-03 08:17:21.066394778 +0300

400+--- orig/Aws/SimpleDb/Core.hs 2014-04-03 08:40:55.150364680 +0300

418−+++ new/Aws/SimpleDb/Core.hs 2014-04-03 08:17:20.000000000 +0300

401++++ new/Aws/SimpleDb/Core.hs 2014-04-03 08:40:54.000000000 +0300

419@@ -4,8 +4,8 @@

402@@ -4,8 +4,8 @@

420 import qualified Blaze.ByteString.Builder as Blaze

403 import qualified Blaze.ByteString.Builder as Blaze

421 import qualified Blaze.ByteString.Builder.Char8 as Blaze8

404 import qualified Blaze.ByteString.Builder.Char8 as Blaze8

@@ -475,8 +458,8 @@ diff -ru orig/Aws/SimpleDb/Core.hs new/Aws/SimpleDb/Core.hs

475 name <- force "Missing Name" <=< sequence $ cursor $/ Cu.laxElement "Name" &| decodeBase64

458 name <- force "Missing Name" <=< sequence $ cursor $/ Cu.laxElement "Name" &| decodeBase64

476 attributes <- sequence $ cursor $/ Cu.laxElement "Attribute" &| readAttribute

459 attributes <- sequence $ cursor $/ Cu.laxElement "Attribute" &| readAttribute

477diff -ru orig/Aws/Sqs/Commands/Message.hs new/Aws/Sqs/Commands/Message.hs

460diff -ru orig/Aws/Sqs/Commands/Message.hs new/Aws/Sqs/Commands/Message.hs

478−--- orig/Aws/Sqs/Commands/Message.hs 2014-04-03 08:17:21.066394778 +0300

461+--- orig/Aws/Sqs/Commands/Message.hs 2014-04-03 08:40:55.154364680 +0300

479−+++ new/Aws/Sqs/Commands/Message.hs 2014-04-03 08:17:20.000000000 +0300

462++++ new/Aws/Sqs/Commands/Message.hs 2014-04-03 08:40:54.000000000 +0300

480@@ -4,9 +4,9 @@

463@@ -4,9 +4,9 @@

481 import Aws.Core

464 import Aws.Core

482 import Aws.Sqs.Core

465 import Aws.Sqs.Core

@@ -498,8 +481,8 @@ diff -ru orig/Aws/Sqs/Commands/Message.hs new/Aws/Sqs/Commands/Message.hs

498 name <- force "Missing Name" $ cursor $/ Cu.laxElement "Name" &/ Cu.content

481 name <- force "Missing Name" $ cursor $/ Cu.laxElement "Name" &/ Cu.content

499 value <- force "Missing Value" $ cursor $/ Cu.laxElement "Value" &/ Cu.content

482 value <- force "Missing Value" $ cursor $/ Cu.laxElement "Value" &/ Cu.content

500diff -ru orig/Aws/Sqs/Core.hs new/Aws/Sqs/Core.hs

483diff -ru orig/Aws/Sqs/Core.hs new/Aws/Sqs/Core.hs

501−--- orig/Aws/Sqs/Core.hs 2014-04-03 08:17:21.066394778 +0300

484+--- orig/Aws/Sqs/Core.hs 2014-04-03 08:40:55.154364680 +0300

502−+++ new/Aws/Sqs/Core.hs 2014-04-03 08:17:20.000000000 +0300

485++++ new/Aws/Sqs/Core.hs 2014-04-03 08:40:54.000000000 +0300

503@@ -5,14 +5,12 @@

486@@ -5,14 +5,12 @@

504 import qualified Blaze.ByteString.Builder as Blaze

487 import qualified Blaze.ByteString.Builder as Blaze

505 import qualified Blaze.ByteString.Builder.Char8 as Blaze8

488 import qualified Blaze.ByteString.Builder.Char8 as Blaze8

@@ -564,17 +547,8 @@ diff -ru orig/Aws/Sqs/Core.hs new/Aws/Sqs/Core.hs

564 printMessageAttribute :: MessageAttribute -> T.Text

547 printMessageAttribute :: MessageAttribute -> T.Text

565 printMessageAttribute MessageAll = "All"

548 printMessageAttribute MessageAll = "All"

566diff -ru orig/aws.cabal new/aws.cabal

549diff -ru orig/aws.cabal new/aws.cabal

567−--- orig/aws.cabal 2014-04-03 08:17:21.070394778 +0300

550+--- orig/aws.cabal 2014-04-03 08:40:55.158364680 +0300

568−+++ new/aws.cabal 2014-04-03 08:17:20.000000000 +0300

551++++ new/aws.cabal 2014-04-03 08:40:54.000000000 +0300

569−@@ -20,7 +20,7 @@

570− Source-repository this

571− type: git

572− location: https://github.com/aristidb/aws.git

573−- tag: 0.8.5

574−+ tag: 0.8.6

575−

576− Source-repository head

577− type: git

578@@ -98,8 +98,6 @@

552@@ -98,8 +98,6 @@

579 Aws.DynamoDb.Core

553 Aws.DynamoDb.Core

580

554

@@ -619,17 +593,3 @@ diff -ru orig/aws.cabal new/aws.cabal

619

593

620 GHC-Options: -Wall

594 GHC-Options: -Wall

621

595

622−diff -ru orig/README.org new/README.org

623−--- orig/README.org 2014-04-03 08:17:21.058394778 +0300

624−+++ new/README.org 2014-04-03 08:17:20.000000000 +0300

625−@@ -90,6 +90,10 @@

626−

627− ** 0.8 series

628−

629−+- 0.8.6

630−+ - move Instance metadata functions out of ResourceT to remove problem with exceptions-0.5

631−+ (this makes a fresh install of aws on a clean system possible again)

632−+

633− - 0.8.5

634− - compatibility with case-insensitive 1.2

635− - support for V4 signatures