amazonka 0.1.0 → 0.1.1
raw patch · 6 files changed
+22/−27 lines, 6 filesdep ~amazonka-corePVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: amazonka-core
API changes (from Hackage documentation)
- Control.Monad.Trans.AWS: Debug :: LogLevel
- Control.Monad.Trans.AWS: Info :: LogLevel
- Control.Monad.Trans.AWS: Trace :: LogLevel
- Control.Monad.Trans.AWS: data LogLevel
- Control.Monad.Trans.AWS: type Logger = LogLevel -> Builder -> IO ()
- Network.AWS: Debug :: LogLevel
- Network.AWS: Info :: LogLevel
- Network.AWS: Trace :: LogLevel
- Network.AWS: data LogLevel
- Network.AWS: type Logger = LogLevel -> Builder -> IO ()
Files
- amazonka.cabal +3/−3
- src/Control/Monad/Trans/AWS.hs +0/−2
- src/Network/AWS.hs +2/−3
- src/Network/AWS/EC2/Metadata.hs +1/−1
- src/Network/AWS/Internal/Env.hs +15/−10
- src/Network/AWS/Internal/Log.hs +1/−8
amazonka.cabal view
@@ -1,5 +1,5 @@ name: amazonka-version: 0.1.0+version: 0.1.1 synopsis: Comprehensive Amazon Web Services SDK homepage: https://github.com/brendanhay/amazonka license: OtherLicense@@ -7,7 +7,7 @@ author: Brendan Hay maintainer: Brendan Hay <brendan.g.hay@gmail.com> copyright: Copyright (c) 2013-2014 Brendan Hay-category: Network, AWS, Cloud+category: Network, AWS, Cloud, Distributed Computing build-type: Simple extra-source-files: README.md cabal-version: >= 1.10@@ -41,7 +41,7 @@ , Network.AWS.Internal.Retry build-depends:- amazonka-core == 0.1.0.*+ amazonka-core == 0.1.1.* , base >= 4.7 && < 5 , bytestring >= 0.9 , conduit >= 1.1 && < 1.3
src/Control/Monad/Trans/AWS.hs view
@@ -75,8 +75,6 @@ , secretKey -- * Logging- , LogLevel (..)- , Logger , newLogger , info , debug
src/Network/AWS.hs view
@@ -52,8 +52,6 @@ , secretKey -- * Logging- , LogLevel (..)- , Logger , newLogger -- * Types@@ -200,7 +198,7 @@ => Env -> Request a -> m (Response' a)-raw Env{..} rq = catch go err >>= response rq+raw Env{..} rq = catch go err >>= response _envLogger rq where go = do trace _envLogger (build rq)@@ -209,6 +207,7 @@ debug _envLogger (build s) trace _envLogger (build m) rs <- liftResourceT (http s _envManager)+ debug _envLogger (build rs) return (Right rs) err ex = return (Left (ex :: HttpException))
src/Network/AWS/EC2/Metadata.hs view
@@ -279,7 +279,7 @@ !_ <- request m "http://instance-data/latest" return True - err :: IOException -> IO Bool+ err :: HttpException -> IO Bool err = const (return False) dynamic :: MonadIO m
src/Network/AWS/Internal/Env.hs view
@@ -14,14 +14,14 @@ module Network.AWS.Internal.Env where -import Control.Lens-import Control.Retry-import Data.List (intersperse)-import Data.Monoid-import Network.AWS.Data (ToBuilder(..))-import Network.AWS.Internal.Log-import Network.AWS.Types (Region, Auth)-import Network.HTTP.Conduit+import Control.Lens+import Control.Retry+import qualified Data.ByteString.Lazy.Char8 as LBS+import Data.List (intersperse)+import Data.Monoid+import Network.AWS.Data (ToBuilder(..), buildBS)+import Network.AWS.Types+import Network.HTTP.Conduit -- | The environment containing the parameters required to make AWS requests. data Env = Env@@ -65,11 +65,16 @@ instance ToBuilder Env where build Env{..} = mconcat $ intersperse "\n"- [ "[Environment] {"+ [ "[Amazonka Env] {" , " region = " <> build _envRegion- , " auth = " <> build _envAuth , " retry (n=0) = " <> maybe "Nothing" policy _envRetryPolicy+ , build . indent $ buildBS _envAuth , "}" ] where policy (RetryPolicy f) = "Just " <> build (f 0)++ indent = mappend " "+ . LBS.concat+ . intersperse "\n "+ . LBS.lines
src/Network/AWS/Internal/Log.hs view
@@ -19,15 +19,8 @@ import Data.ByteString.Builder import Data.Monoid import Network.AWS.Data+import Network.AWS.Types import System.IO--data LogLevel- = Info -- ^ Informational messages supplied by the user, not used by the library.- | Debug -- ^ Info level + debug messages + non-streaming response bodies.- | Trace -- ^ Debug level + potentially sensitive signing metadata.- deriving (Eq, Ord, Enum, Show)--type Logger = LogLevel -> Builder -> IO () -- | This is a primitive logger which can be used to log messages to a 'Handle'. -- A more sophisticated logging library such as tinylog or FastLogger should be