@@ -1,6 +1,6 @@
11diff -ru orig/Aws/Aws.hs new/Aws/Aws.hs
2−--- orig/Aws/Aws.hs 2014-04-03 08:17:21.058394778 +0300
3−+++ new/Aws/Aws.hs 2014-04-03 08:17:20.000000000 +0300
2+--- orig/Aws/Aws.hs 2014-04-03 08:40:55.146364680 +0300
3++++ new/Aws/Aws.hs 2014-04-03 08:40:54.000000000 +0300
44@@ -33,7 +33,6 @@
55 import Control.Monad.IO.Class
66 import Control.Monad.Trans
@@ -35,8 +35,8 @@ diff -ru orig/Aws/Aws.hs new/Aws/Aws.hs
3535 Nothing -> return ()
3636 Just nextRequest -> go nextRequest
3737diff -ru orig/Aws/Core.hs new/Aws/Core.hs
38−--- orig/Aws/Core.hs 2014-04-03 08:17:21.058394778 +0300
39−+++ new/Aws/Core.hs 2014-04-03 08:17:20.000000000 +0300
38+--- orig/Aws/Core.hs 2014-04-03 08:40:55.146364680 +0300
39++++ new/Aws/Core.hs 2014-04-03 08:40:54.000000000 +0300
4040@@ -89,13 +89,12 @@
4141 import Control.Applicative
4242 import Control.Arrow
@@ -136,8 +136,8 @@ diff -ru orig/Aws/Core.hs new/Aws/Core.hs
136136+ Left err -> liftIO $ throwM err
137137+ Right v -> return v
138138diff -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
140−+++ new/Aws/DynamoDb/Core.hs 2014-04-03 08:17:20.000000000 +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:40:54.000000000 +0300
141141@@ -2,6 +2,7 @@
142142
143143 import Aws.Core
@@ -155,46 +155,29 @@ diff -ru orig/Aws/DynamoDb/Core.hs new/Aws/DynamoDb/Core.hs
155155+ A.Error err -> throwM $ DyError (HTTP.responseStatus resp) "" err
156156+ _ -> throwM $ DyError (HTTP.responseStatus resp) "" (show val)
157157diff -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
159−+++ new/Aws/Ec2/InstanceMetadata.hs 2014-04-03 08:17:20.000000000 +0300
160−@@ -2,8 +2,7 @@
158+--- orig/Aws/Ec2/InstanceMetadata.hs 2014-04-03 08:40:55.146364680 +0300
159++++ new/Aws/Ec2/InstanceMetadata.hs 2014-04-03 08:40:54.000000000 +0300
160+@@ -2,7 +2,7 @@
161161
162162 import Control.Applicative
163163 import Control.Exception
164164-import Control.Failure
165−-import Control.Monad.Trans.Resource
166165+import Control.Monad.Trans.Resource (throwM)
167166 import qualified Data.ByteString.Lazy as L
168167 import qualified Data.ByteString.Lazy.Char8 as B8
169168 import Data.ByteString.Lazy.UTF8 as BU
170−@@ -16,19 +15,19 @@
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
169+@@ -25,7 +25,7 @@
170+ getInstanceMetadataFirst :: HTTP.Manager -> String -> IO L.ByteString
185171 getInstanceMetadataFirst mgr p = do listing <- getInstanceMetadataListing mgr p
186172 case listing of
187173- [] -> failure (MetadataNotFound p)
188174+ [] -> throwM (MetadataNotFound p)
189175 (x:_) -> getInstanceMetadata mgr p x
190176
191−-getInstanceMetadataOrFirst :: HTTP.Manager -> String -> Maybe String -> ResIO L.ByteString
192−+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
177+ getInstanceMetadataOrFirst :: HTTP.Manager -> String -> Maybe String -> IO L.ByteString
195178diff -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
197−+++ new/Aws/Iam/Core.hs 2014-04-03 08:17:20.000000000 +0300
179+--- orig/Aws/Iam/Core.hs 2014-04-03 08:40:55.146364680 +0300
180++++ new/Aws/Iam/Core.hs 2014-04-03 08:40:54.000000000 +0300
198181@@ -19,8 +19,8 @@
199182 import qualified Blaze.ByteString.Builder as Blaze
200183 import qualified Blaze.ByteString.Builder.Char8 as Blaze8
@@ -232,8 +215,8 @@ diff -ru orig/Aws/Iam/Core.hs new/Aws/Iam/Core.hs
232215 userArn <- attr "Arn"
233216 userCreateDate <- attr "CreateDate" >>= parseDateTime . Text.unpack
234217diff -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
236−+++ new/Aws/Iam/Internal.hs 2014-04-03 08:17:20.000000000 +0300
218+--- orig/Aws/Iam/Internal.hs 2014-04-03 08:40:55.146364680 +0300
219++++ new/Aws/Iam/Internal.hs 2014-04-03 08:40:54.000000000 +0300
237220@@ -15,8 +15,8 @@
238221 import Aws.Iam.Core
239222 import Control.Applicative
@@ -254,8 +237,8 @@ diff -ru orig/Aws/Iam/Internal.hs new/Aws/Iam/Internal.hs
254237 -> m (Bool, Maybe Text)
255238 markedIterResponse cursor = do
256239diff -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
258−+++ new/Aws/S3/Commands/CopyObject.hs 2014-04-03 08:17:20.000000000 +0300
240+--- orig/Aws/S3/Commands/CopyObject.hs 2014-04-03 08:40:55.150364680 +0300
241++++ new/Aws/S3/Commands/CopyObject.hs 2014-04-03 08:40:54.000000000 +0300
259242@@ -5,7 +5,7 @@
260243 import Aws.S3.Core
261244 import Control.Applicative
@@ -275,8 +258,8 @@ diff -ru orig/Aws/S3/Commands/CopyObject.hs new/Aws/S3/Commands/CopyObject.hs
275258 lastMod <- forceM "Missing Last-Modified" $ el $/ elContent "LastModified" &| (parseHttpDate' . T.unpack)
276259 etag <- force "Missing ETag" $ el $/ elContent "ETag"
277260diff -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
279−+++ new/Aws/S3/Core.hs 2014-04-03 08:17:20.000000000 +0300
261+--- orig/Aws/S3/Core.hs 2014-04-03 08:40:55.150364680 +0300
262++++ new/Aws/S3/Core.hs 2014-04-03 08:40:54.000000000 +0300
280263@@ -5,8 +5,8 @@
281264 import Control.Arrow ((***))
282265 import Control.Monad
@@ -392,8 +375,8 @@ diff -ru orig/Aws/S3/Core.hs new/Aws/S3/Core.hs
392375 -- expiration = return undefined
393376 userMetadata = flip mapMaybe ht $
394377diff -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
396−+++ new/Aws/Ses/Core.hs 2014-04-03 08:17:20.000000000 +0300
378+--- orig/Aws/Ses/Core.hs 2014-04-03 08:40:55.150364680 +0300
379++++ new/Aws/Ses/Core.hs 2014-04-03 08:40:54.000000000 +0300
397380@@ -22,8 +22,8 @@
398381 import qualified Blaze.ByteString.Builder as Blaze
399382 import qualified Blaze.ByteString.Builder.Char8 as Blaze8
@@ -414,8 +397,8 @@ diff -ru orig/Aws/Ses/Core.hs new/Aws/Ses/Core.hs
414397 class SesAsQuery a where
415398 -- | Write a data type as a list of query parameters.
416399diff -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
418−+++ new/Aws/SimpleDb/Core.hs 2014-04-03 08:17:20.000000000 +0300
400+--- orig/Aws/SimpleDb/Core.hs 2014-04-03 08:40:55.150364680 +0300
401++++ new/Aws/SimpleDb/Core.hs 2014-04-03 08:40:54.000000000 +0300
419402@@ -4,8 +4,8 @@
420403 import qualified Blaze.ByteString.Builder as Blaze
421404 import qualified Blaze.ByteString.Builder.Char8 as Blaze8
@@ -475,8 +458,8 @@ diff -ru orig/Aws/SimpleDb/Core.hs new/Aws/SimpleDb/Core.hs
475458 name <- force "Missing Name" <=< sequence $ cursor $/ Cu.laxElement "Name" &| decodeBase64
476459 attributes <- sequence $ cursor $/ Cu.laxElement "Attribute" &| readAttribute
477460diff -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
479−+++ new/Aws/Sqs/Commands/Message.hs 2014-04-03 08:17:20.000000000 +0300
461+--- orig/Aws/Sqs/Commands/Message.hs 2014-04-03 08:40:55.154364680 +0300
462++++ new/Aws/Sqs/Commands/Message.hs 2014-04-03 08:40:54.000000000 +0300
480463@@ -4,9 +4,9 @@
481464 import Aws.Core
482465 import Aws.Sqs.Core
@@ -498,8 +481,8 @@ diff -ru orig/Aws/Sqs/Commands/Message.hs new/Aws/Sqs/Commands/Message.hs
498481 name <- force "Missing Name" $ cursor $/ Cu.laxElement "Name" &/ Cu.content
499482 value <- force "Missing Value" $ cursor $/ Cu.laxElement "Value" &/ Cu.content
500483diff -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
502−+++ new/Aws/Sqs/Core.hs 2014-04-03 08:17:20.000000000 +0300
484+--- orig/Aws/Sqs/Core.hs 2014-04-03 08:40:55.154364680 +0300
485++++ new/Aws/Sqs/Core.hs 2014-04-03 08:40:54.000000000 +0300
503486@@ -5,14 +5,12 @@
504487 import qualified Blaze.ByteString.Builder as Blaze
505488 import qualified Blaze.ByteString.Builder.Char8 as Blaze8
@@ -564,17 +547,8 @@ diff -ru orig/Aws/Sqs/Core.hs new/Aws/Sqs/Core.hs
564547 printMessageAttribute :: MessageAttribute -> T.Text
565548 printMessageAttribute MessageAll = "All"
566549diff -ru orig/aws.cabal new/aws.cabal
567−--- orig/aws.cabal 2014-04-03 08:17:21.070394778 +0300
568−+++ new/aws.cabal 2014-04-03 08:17:20.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
550+--- orig/aws.cabal 2014-04-03 08:40:55.158364680 +0300
551++++ new/aws.cabal 2014-04-03 08:40:54.000000000 +0300
578552@@ -98,8 +98,6 @@
579553 Aws.DynamoDb.Core
580554
@@ -619,17 +593,3 @@ diff -ru orig/aws.cabal new/aws.cabal
619593
620594 GHC-Options: -Wall
621595
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