diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +0.1.3 +===== + +* Fix [bug #9](https://github.com/alephcloud/hs-aws-kinesis/issues/9); + accept both `Message` and `message` in JSON error responses + from AWS. + +* Solve [issue #11](https://github.com/alephcloud/hs-aws-kinesis/issues/11); + export PutRecords from Aws.Kinesis + +* Raise lower bound on aws-general to 0.2. + 0.1.2 ===== diff --git a/aws-kinesis.cabal b/aws-kinesis.cabal --- a/aws-kinesis.cabal +++ b/aws-kinesis.cabal @@ -17,7 +17,7 @@ -- under the License. Name: aws-kinesis -Version: 0.1.2 +Version: 0.1.3 Synopsis: Bindings for Amazon Kinesis description: Bindings for @@ -55,7 +55,7 @@ source-repository this type: git location: https://github.com/alephcloud/hs-aws-kinesis.git - tag: 0.1.2 + tag: 0.1.3 Library default-language: Haskell2010 @@ -80,7 +80,7 @@ QuickCheck >= 2.7, aeson >= 0.7, aws >= 0.9, - aws-general >= 0.1, + aws-general >= 0.2, base == 4.*, base64-bytestring >= 1.0, blaze-builder >= 0.3, @@ -124,8 +124,4 @@ transformers >= 0.3 ghc-options: -Wall -threaded - - - - diff --git a/constraints b/constraints --- a/constraints +++ b/constraints @@ -1,38 +1,37 @@ constraints: QuickCheck ==2.7.6, aeson ==0.8.0.2, array ==0.5.0.0, - asn1-encoding ==0.8.1.3, - asn1-parse ==0.8.1, - asn1-types ==0.2.3, + asn1-encoding ==0.9.0, + asn1-parse ==0.9.0, + asn1-types ==0.3.0, + async ==2.0.1.6, attoparsec ==0.12.1.2, - aws ==0.10.5, - aws-general ==0.1.1, - aws-kinesis ==0.1.2, + aws ==0.11.2, + aws-general ==0.2.0, base ==4.7.0.1, base16-bytestring ==0.1.1.6, base64-bytestring ==1.0.0.1, blaze-builder ==0.3.3.4, - blaze-html ==0.7.0.3, - blaze-markup ==0.6.1.1, + blaze-html ==0.7.1.0, + blaze-markup ==0.6.3.0, byteable ==0.1.1, bytestring ==0.10.4.0, - case-insensitive ==1.2.0.1, - cereal ==0.4.1.0, + case-insensitive ==1.2.0.3, + cereal ==0.4.0.1, charset ==0.3.7, cipher-aes ==0.2.8, cipher-des ==0.0.6, cipher-rc4 ==0.1.4, - conduit ==1.2.1, - conduit-extra ==1.1.4, - connection ==0.2.3, + conduit ==1.2.3.1, + conduit-extra ==1.1.6.2, + connection ==0.2.4, containers ==0.5.5.1, cookie ==0.4.1.4, - cprng-aes ==0.5.2, crypto-cipher-types ==0.0.9, crypto-numbers ==0.2.3, - crypto-pubkey ==0.2.4, - crypto-pubkey-types ==0.4.2.2, - crypto-random ==0.0.8, + crypto-pubkey ==0.2.8, + crypto-pubkey-types ==0.4.3, + crypto-random ==0.0.7, cryptohash ==0.11.6, data-default ==0.5.3, data-default-class ==0.0.1, @@ -46,18 +45,19 @@ exceptions ==0.6.1, filepath ==1.3.0.2, ghc-prim ==0.3.1.0, - hashable ==1.2.2.0, - http-client ==0.4.0.1, + hashable ==1.2.3.1, + hourglass ==0.2.8, + http-client ==0.4.7, http-client-tls ==0.2.2, - http-conduit ==2.1.4.5, + http-conduit ==2.1.5, http-types ==0.8.5, integer-gmp ==0.5.1.0, - lifted-base ==0.2.3.0, - mime-types ==0.1.0.4, + lifted-base ==0.2.3.3, + mime-types ==0.1.0.5, mmorph ==1.0.4, - monad-control ==0.3.3.0, + monad-control ==1.0.0.1, mtl ==2.2.1, - nats ==0.2, + nats ==1, network ==2.6.0.2, network-uri ==2.6.0.1, old-locale ==1.0.0.6, @@ -69,36 +69,36 @@ primitive ==0.5.3.0, process ==1.2.0.0, publicsuffixlist ==0.1, - quickcheck-instances ==0.3.9, - random ==1.1, - resourcet ==1.1.2.3, + quickcheck-instances ==0.3.10, + random ==1.0.1.1, + resourcet ==1.1.3.3, rts ==1.0, - safe ==0.3.8, - scientific ==0.3.3.1, + safe ==0.3.6, + scientific ==0.3.3.5, securemem ==0.1.3, - semigroups ==0.15.3, + semigroups ==0.16.0.1, socks ==0.5.4, stm ==2.4.3, - streaming-commons ==0.1.5, + streaming-commons ==0.1.8, syb ==0.4.2, - system-filepath ==0.4.12, + system-filepath ==0.4.13.1, tagged ==0.7.2, template-haskell ==2.9.0.0, - text ==1.2.0.0, + text ==1.2.0.3, tf-random ==0.5, time ==1.4.2, - tls ==1.2.9, + tls ==1.2.16, transformers ==0.4.1.0, transformers-base ==0.4.3, unix ==2.7.0.1, - unordered-containers ==0.2.5.0, + unordered-containers ==0.2.5.1, utf8-string ==0.3.8, vector ==0.10.11.0, - void ==0.6.1, - x509 ==1.4.12, - x509-store ==1.4.4, - x509-system ==1.4.5, - x509-validation ==1.5.0, - xml-conduit ==1.2.3, + void ==0.7, + x509 ==1.5.0.1, + x509-store ==1.5.0, + x509-system ==1.5.0, + x509-validation ==1.5.1, + xml-conduit ==1.2.3.1, xml-types ==0.3.4, zlib ==0.5.4.1 diff --git a/src/Aws/Kinesis.hs b/src/Aws/Kinesis.hs --- a/src/Aws/Kinesis.hs +++ b/src/Aws/Kinesis.hs @@ -60,6 +60,7 @@ , module Aws.Kinesis.Commands.ListStreams , module Aws.Kinesis.Commands.MergeShards , module Aws.Kinesis.Commands.PutRecord +, module Aws.Kinesis.Commands.PutRecords , module Aws.Kinesis.Commands.SplitShard ) where @@ -73,4 +74,5 @@ import Aws.Kinesis.Commands.ListStreams import Aws.Kinesis.Commands.MergeShards import Aws.Kinesis.Commands.PutRecord +import Aws.Kinesis.Commands.PutRecords import Aws.Kinesis.Commands.SplitShard diff --git a/src/Aws/Kinesis/Core.hs b/src/Aws/Kinesis/Core.hs --- a/src/Aws/Kinesis/Core.hs +++ b/src/Aws/Kinesis/Core.hs @@ -256,9 +256,9 @@ (fromMaybe "" body) #if MIN_VERSION_aws(0,9,2) - cred2cred (Credentials a b c _) = SignatureV4Credentials a b c + cred2cred (Credentials a b c d) = SignatureV4Credentials a b c d #else - cred2cred (Credentials a b c) = SignatureV4Credentials a b c + cred2cred (Credentials a b c) = SignatureV4Credentials a b c Nothing #endif -- -------------------------------------------------------------------------- -- @@ -309,9 +309,7 @@ where kinesisError doc = case eitherDecode doc of Left e -> throwM . KinesisResponseJsonError $ T.pack e - Right a -> do - liftIO $ print doc - throwM (a :: KinesisErrorResponse) + Right a -> throwM (a :: KinesisErrorResponse) -- -------------------------------------------------------------------------- -- -- Kinesis Errors @@ -345,7 +343,7 @@ instance FromJSON KinesisErrorResponse where parseJSON = withObject "KinesisErrorResponse" $ \o -> KinesisErrorResponse <$> o .: "__type" - <*> o .:? "message" .!= "" + <*> (o .: "message" <|> o .: "Message" <|> pure "") -- | Common Kinesis Errors --