aws-sdk 0.12.3 → 0.12.4

raw patch · 46 files changed

+213/−47 lines, 46 filesdep +conduit-extradep +resourcetdep ~conduit

Dependencies added: conduit-extra, resourcet

Dependency ranges changed: conduit

Files

AWS/Class.hs +6/−0
AWS/CloudWatch.hs +5/−1
AWS/CloudWatch/Alarm.hs +4/−1
AWS/CloudWatch/Internal.hs +4/−1
AWS/CloudWatch/Metric.hs +4/−1
AWS/EC2.hs +5/−2
AWS/EC2/Acl.hs +4/−1
AWS/EC2/Address.hs +4/−1
AWS/EC2/AvailabilityZone.hs +4/−1
AWS/EC2/ConversionTask.hs +4/−1
AWS/EC2/Image.hs +4/−1
AWS/EC2/Instance.hs +4/−1
AWS/EC2/Internal.hs +4/−2
AWS/EC2/KeyPair.hs +4/−1
AWS/EC2/Metadata.hs +5/−0
AWS/EC2/NetworkInterface.hs +4/−1
AWS/EC2/NetworkInterfaceAttribute.hs +6/−1
AWS/EC2/PlacementGroup.hs +4/−1
AWS/EC2/Query.hs +4/−1
AWS/EC2/Region.hs +4/−1
AWS/EC2/Route.hs +5/−1
AWS/EC2/RouteTable.hs +4/−1
AWS/EC2/SecurityGroup.hs +4/−1
AWS/EC2/Snapshot.hs +4/−1
AWS/EC2/Subnets.hs +4/−1
AWS/EC2/Tag.hs +7/−2
AWS/EC2/Util.hs +4/−1
AWS/EC2/VPC.hs +4/−1
AWS/EC2/Volume.hs +4/−1
AWS/ELB.hs +5/−1
AWS/ELB/Internal.hs +4/−1
AWS/ELB/LoadBalancer.hs +4/−1
AWS/Lib/FromText.hs +5/−1
AWS/Lib/Parser.hs +4/−0
AWS/Lib/Query.hs +3/−0
AWS/RDS.hs +5/−1
AWS/RDS/DBInstance.hs +4/−1
AWS/RDS/DBParameterGroup.hs +6/−1
AWS/RDS/DBSecurityGroup.hs +6/−1
AWS/RDS/DBSnapshot.hs +4/−1
AWS/RDS/DBSubnetGroup.hs +5/−1
AWS/RDS/Event.hs +4/−1
AWS/RDS/EventSubscription.hs +4/−1
AWS/RDS/Internal.hs +4/−1
AWS/RDS/OptionGroup.hs +4/−1
aws-sdk.cabal +15/−3

AWS/Class.hs view

@@ -6,6 +6,7 @@  , DeriveDataTypeable  , ExistentialQuantification  , StandaloneDeriving+ , CPP  #-}  module AWS.Class@@ -36,9 +37,14 @@     , defaultLiftBaseWith     , defaultRestoreM     )+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (monadThrow)+#endif import Control.Exception (Exception) import Data.Typeable (Typeable)+#if !MIN_VERSION_conduit(1,1,0) import Data.Conduit (MonadThrow, monadThrow)+#endif import Text.XML.Stream.Parse (XmlException)  import qualified Network.HTTP.Conduit as HTTP

AWS/CloudWatch.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.CloudWatch     ( -- * CloudWatch Environment@@ -13,7 +13,11 @@     ) where  import Data.Text (Text)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResource)+#else import Data.Conduit+#endif import Control.Monad.IO.Class (MonadIO) import qualified Control.Monad.State as State import qualified Network.HTTP.Conduit as HTTP

AWS/CloudWatch/Alarm.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RecordWildCards #-}+{-# LANGUAGE FlexibleContexts, RecordWildCards, CPP #-} module AWS.CloudWatch.Alarm     ( describeAlarms     , describeAlarmsForMetric@@ -11,6 +11,9 @@     ) where  import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.Conduit import Data.Text (Text) import Data.Time (UTCTime)

AWS/CloudWatch/Internal.hs view

@@ -1,9 +1,12 @@-{-# LANGUAGE FlexibleContexts, RankNTypes, RecordWildCards #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, RecordWildCards, CPP #-}  module AWS.CloudWatch.Internal     where  import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.ByteString (ByteString) import Data.Text (Text) import Data.Conduit

AWS/CloudWatch/Metric.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes, RecordWildCards #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, RecordWildCards, CPP #-}  module AWS.CloudWatch.Metric     ( listMetrics@@ -6,6 +6,9 @@     , putMetricData     ) where +#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.Text (Text) import Data.Time (UTCTime) import Data.Conduit

AWS/EC2.hs view

@@ -1,5 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}-{-# LANGUAGE RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2     ( -- * EC2 Environment@@ -42,7 +41,11 @@     , module AWS.EC2.ConversionTask     ) where +#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResource)+#else import Data.Conduit+#endif import qualified Control.Monad.State as State import Data.Text (Text) import Data.ByteString (ByteString)

AWS/EC2/Acl.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2.Acl     ( describeNetworkAcls@@ -14,6 +14,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Address.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.EC2.Address     ( describeAddresses@@ -15,6 +15,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/AvailabilityZone.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.EC2.AvailabilityZone     ( describeAvailabilityZones@@ -9,6 +9,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/ConversionTask.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RecordWildCards #-}+{-# LANGUAGE FlexibleContexts, RecordWildCards, CPP #-} module AWS.EC2.ConversionTask     ( describeConversionTasks     , cancelConversionTask@@ -7,6 +7,9 @@     ) where  import Control.Applicative ((<$>), (<*>))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif import Data.Conduit import Data.Text (Text) import Data.XML.Types (Event)

AWS/EC2/Image.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.EC2.Image     ( describeImages@@ -14,6 +14,9 @@ import Data.Conduit import Control.Applicative import Control.Monad (join)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Instance.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2.Instance     ( describeInstances@@ -22,6 +22,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif import Data.Maybe (fromMaybe, fromJust) import qualified Data.Map as Map import Control.Monad

AWS/EC2/Internal.hs view

@@ -1,5 +1,4 @@-{-# LANGUAGE RankNTypes #-}-{-# LANGUAGE ScopedTypeVariables #-}+{-# LANGUAGE RankNTypes, ScopedTypeVariables, CPP #-}  module AWS.EC2.Internal     ( module AWS.Class@@ -19,6 +18,9 @@  import Control.Monad.IO.Class (MonadIO) import Control.Monad.Trans.Class (lift)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow)+#endif import qualified Network.HTTP.Conduit as HTTP import Data.ByteString.Char8 () import Control.Applicative

AWS/EC2/KeyPair.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.EC2.KeyPair     ( describeKeyPairs@@ -12,6 +12,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Metadata.hs view

@@ -1,3 +1,5 @@+{-# LANGUAGE CPP #-}+ -- | EC2 Meta-data service. --   This is available to use within EC2/VPC instance. module AWS.EC2.Metadata@@ -37,6 +39,9 @@ import Data.Conduit import Network.HTTP.Conduit hiding (path) import Control.Monad.IO.Class (liftIO)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (runResourceT)+#endif import Data.Monoid import Control.Applicative import Control.Exception

AWS/EC2/NetworkInterface.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2.NetworkInterface     ( assignPrivateIpAddresses@@ -15,6 +15,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/NetworkInterfaceAttribute.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, Rank2Types #-}+{-# LANGUAGE FlexibleContexts, Rank2Types, CPP #-} module AWS.EC2.NetworkInterfaceAttribute    ( describeNetworkInterfaceDescription    , describeNetworkInterfaceGroupSet@@ -12,7 +12,12 @@    ) where  import Data.Text (Text)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResource)+import Data.Conduit (Consumer)+#else import Data.Conduit (Consumer, MonadBaseControl, MonadResource)+#endif import Data.XML.Types (Event)  import AWS.EC2.Internal (EC2, groupSetSink, networkInterfaceAttachmentSink)

AWS/EC2/PlacementGroup.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-} module AWS.EC2.PlacementGroup     ( describePlacementGroups     , createPlacementGroup@@ -6,6 +6,9 @@     ) where  import Control.Applicative ((<$>), (<*>))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif import Data.Conduit import Data.Text (Text) import Data.XML.Types (Event)

AWS/EC2/Query.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2.Query     ( ec2Query@@ -13,6 +13,9 @@ import           Data.ByteString.Lazy.Char8 ()  import Data.XML.Types (Event(..))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif import Data.Conduit import qualified Data.Conduit.List as CL import qualified Text.XML.Stream.Parse as XmlP

AWS/EC2/Region.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.EC2.Region     ( describeRegions@@ -9,6 +9,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Route.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RecordWildCards #-}+{-# LANGUAGE FlexibleContexts, RecordWildCards, CPP #-} module AWS.EC2.Route     ( createRoute     , deleteRoute@@ -6,7 +6,11 @@     ) where  import Data.ByteString (ByteString)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResource)+#else import Data.Conduit (MonadBaseControl, MonadResource)+#endif import Data.IP (AddrRange, IPv4) import Data.Text (Text)

AWS/EC2/RouteTable.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2.RouteTable     ( associateRouteTable@@ -13,6 +13,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/SecurityGroup.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2.SecurityGroup     ( describeSecurityGroups@@ -16,6 +16,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Snapshot.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.EC2.Snapshot     ( describeSnapshots@@ -14,6 +14,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Subnets.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2.Subnets     ( describeSubnets@@ -10,6 +10,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Tag.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.EC2.Tag     ( describeTags@@ -7,8 +7,13 @@     ) where  import Data.Text (Text)-import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResource)+import Data.Conduit (ResumableSource)+#else+import Data.Conduit+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Util.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, ScopedTypeVariables #-}+{-# LANGUAGE FlexibleContexts, ScopedTypeVariables, CPP #-}  module AWS.EC2.Util     ( list@@ -19,6 +19,9 @@ import Safe import qualified Control.Concurrent as CC import Control.Monad.IO.Class (liftIO, MonadIO)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResource)+#endif import Data.Text (Text) import qualified Data.Text as T import Control.Applicative

AWS/EC2/VPC.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.EC2.VPC     ( associateDhcpOptions@@ -35,6 +35,9 @@ import Data.Conduit import Data.IP (IPv4, AddrRange) import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Types

AWS/EC2/Volume.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-} module AWS.EC2.Volume     ( describeVolumes     , createVolume@@ -16,6 +16,9 @@ import Data.XML.Types (Event) import Data.Conduit import Control.Applicative+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadBaseControl, MonadResource)+#endif  import AWS.EC2.Internal import AWS.EC2.Params

AWS/ELB.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.ELB     ( -- * ELB Environment@@ -12,7 +12,11 @@     ) where  import Data.Text (Text)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResource)+#else import Data.Conduit+#endif import Control.Monad.IO.Class (MonadIO) import qualified Control.Monad.State as State import qualified Network.HTTP.Conduit as HTTP

AWS/ELB/Internal.hs view

@@ -1,9 +1,12 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.ELB.Internal     where  import Data.ByteString (ByteString)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadResource, MonadBaseControl)+#endif import Data.Conduit import Data.XML.Types (Event(..))

AWS/ELB/LoadBalancer.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes, RecordWildCards #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, RecordWildCards, CPP #-}  module AWS.ELB.LoadBalancer     ( describeLoadBalancers@@ -27,6 +27,9 @@     ) where  import Data.Text (Text)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.Conduit import Control.Applicative import Data.XML.Types (Event(..))

AWS/Lib/FromText.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE RankNTypes, OverloadedStrings, TemplateHaskell, FlexibleInstances #-}+{-# LANGUAGE RankNTypes, OverloadedStrings, TemplateHaskell, FlexibleInstances, CPP #-}  module AWS.Lib.FromText     ( FromText(..)@@ -14,7 +14,11 @@  import Control.Applicative ((<$>)) import Control.Monad+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow)+#else import Data.Conduit (MonadThrow)+#endif import Data.IP (IPv4, AddrRange) import Data.Monoid ((<>)) import Data.Text (Text)

AWS/Lib/Parser.hs view

@@ -1,5 +1,6 @@ {-# LANGUAGE FlexibleContexts, RankNTypes, ScopedTypeVariables, FlexibleInstances #-} {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE CPP #-}  module AWS.Lib.Parser     ( RequestId@@ -24,6 +25,9 @@ import Data.ByteString (ByteString) import Data.Char (isSpace) import Data.Conduit+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow)+#endif import qualified Data.Conduit.List as CL import qualified Data.Text as T import qualified Text.XML.Stream.Parse as XML

AWS/Lib/Query.hs view

@@ -36,6 +36,9 @@ #if !MIN_VERSION_conduit(1,0,16) import qualified Data.Conduit.Internal as CI #endif+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadResource, MonadBaseControl)+#endif import qualified Network.HTTP.Conduit as HTTP import qualified Text.XML.Stream.Parse as XmlP import Text.XML.Stream.Parse (XmlException)

AWS/RDS.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.RDS     ( -- * RDS Environment@@ -25,7 +25,11 @@     ) where  import Data.Text (Text)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadBaseControl, MonadResource)+#else import Data.Conduit+#endif import Control.Monad.IO.Class (MonadIO) import qualified Control.Monad.State as State import qualified Network.HTTP.Conduit as HTTP

AWS/RDS/DBInstance.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes, RecordWildCards #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, RecordWildCards, CPP #-}  module AWS.RDS.DBInstance     ( describeDBInstances@@ -11,6 +11,9 @@  import Data.Text (Text) import Data.Conduit+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Control.Applicative import Data.XML.Types (Event(..)) import Data.Maybe (catMaybes)

AWS/RDS/DBParameterGroup.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.RDS.DBParameterGroup     ( describeDBParameterGroups@@ -7,7 +7,12 @@     ) where  import Control.Applicative ((<$>), (<*>))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+import Data.Conduit (Consumer)+#else import Data.Conduit (Consumer, MonadBaseControl, MonadResource, MonadThrow)+#endif import Data.Text (Text) import Data.XML.Types (Event)

AWS/RDS/DBSecurityGroup.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.RDS.DBSecurityGroup     ( describeDBSecurityGroups@@ -7,7 +7,12 @@     ) where  import Control.Applicative ((<$>), (<*>))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+import Data.Conduit (Consumer)+#else import Data.Conduit (Consumer, MonadBaseControl, MonadResource, MonadThrow)+#endif import Data.Text (Text) import Data.XML.Types (Event)

AWS/RDS/DBSnapshot.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.RDS.DBSnapshot     ( describeDBSnapshots@@ -8,6 +8,9 @@     ) where  import Data.Text (Text)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.Conduit import Control.Applicative import Data.XML.Types (Event(..))

AWS/RDS/DBSubnetGroup.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.RDS.DBSubnetGroup     ( describeDBSubnetGroups@@ -7,7 +7,11 @@     ) where  import Control.Applicative ((<$>))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadResource, MonadBaseControl)+#else import Data.Conduit+#endif import Data.Text (Text)  import AWS.Lib.Parser (element)

AWS/RDS/Event.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.RDS.Event     ( describeEvents@@ -6,6 +6,9 @@     ) where  import Control.Applicative ((<$>), (<*>))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.Conduit import Data.Text (Text) import Data.Time (UTCTime)

AWS/RDS/EventSubscription.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.RDS.EventSubscription     ( describeEventSubscriptions@@ -9,6 +9,9 @@     ) where  import Control.Applicative ((<$>), (<*>))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.Conduit import Data.Text (Text) import Data.XML.Types (Event)

AWS/RDS/Internal.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts, RankNTypes #-}+{-# LANGUAGE FlexibleContexts, RankNTypes, CPP #-}  module AWS.RDS.Internal     ( apiVersion@@ -17,6 +17,9 @@ import qualified Control.Monad.Reader as Reader import qualified Control.Monad.State as State import Control.Monad.Trans.Class (lift)+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.ByteString (ByteString) import Data.Text (Text) import Data.Conduit

AWS/RDS/OptionGroup.hs view

@@ -1,4 +1,4 @@-{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleContexts, CPP #-}  module AWS.RDS.OptionGroup     ( describeOptionGroups@@ -7,6 +7,9 @@     ) where  import Control.Applicative ((<$>), (<*>))+#if MIN_VERSION_conduit(1,1,0)+import Control.Monad.Trans.Resource (MonadThrow, MonadResource, MonadBaseControl)+#endif import Data.Conduit import Data.Text (Text) import Data.XML.Types (Event)

aws-sdk.cabal view

@@ -1,5 +1,5 @@ name:                aws-sdk-version:             0.12.3+version:             0.12.4 synopsis:            AWS SDK for Haskell description: AWS (Amazon Web Services) sdk for Haskell.              .@@ -26,6 +26,9 @@     description: enable debug logging     default: False +flag conduit-1-1+    default:     True+ library   exposed-modules:   AWS                    , AWS.EC2@@ -121,7 +124,6 @@                    , base64-bytestring >= 1.0.0.0                    , bytestring                    , http-types-                   , conduit >= 1.0.0                    , transformers                    , time                    , old-locale@@ -142,6 +144,12 @@                    , parallel                    , iproute >= 1.2.9                    , tls+  if flag(conduit-1-1)+    build-depends:   conduit >= 1.1.0+                   , conduit-extra >= 1.1.0+                   , resourcet >= 1.1.0+  else+    build-depends:   conduit >= 1.0.0 && < 1.1.0  test-suite test     type:              exitcode-stdio-1.0@@ -153,7 +161,6 @@     extensions: OverloadedStrings     build-depends: base                  , aws-sdk-                 , conduit                  , text                  , monad-control                  , transformers@@ -166,6 +173,11 @@                  , tls                  , time                  , random+  if flag(conduit-1-1)+    build-depends:   conduit >= 1.1.0+                   , resourcet >= 1.1.0+  else+    build-depends:   conduit >= 1.0.0 && < 1.1.0  source-repository head     type:            git