diff --git a/amazonka-core.cabal b/amazonka-core.cabal --- a/amazonka-core.cabal +++ b/amazonka-core.cabal @@ -1,5 +1,5 @@ name: amazonka-core -version: 0.3.3 +version: 0.3.4 synopsis: Core functionality and data types for Amazonka libraries. homepage: https://github.com/brendanhay/amazonka license: OtherLicense @@ -76,26 +76,26 @@ , Network.AWS.Signing.Internal.V4 build-depends: - aeson > 0.7.0.6 && < 0.9 - , attoparsec >= 0.12 && < 0.15 + aeson > 0.7.0.6 + , attoparsec >= 0.12 , base >= 4.7 && < 5 - , base16-bytestring >= 0.1 && < 1 - , base64-bytestring >= 1 && < 2 - , bifunctors >= 4.1 && < 5 + , base16-bytestring >= 0.1 + , base64-bytestring >= 1 + , bifunctors >= 4.1 , bytestring >= 0.9 , case-insensitive >= 1.2 && < 2 - , conduit >= 1.1 && < 1.3 - , conduit-extra == 1.1.* - , cryptohash == 0.11.* + , conduit >= 1.1 + , conduit-extra >= 1.1 + , cryptohash >= 0.11 , data-default-class >= 0.0.1 , hashable >= 1.2 , http-client >= 0.4.3 && < 0.5 , http-types >= 0.8 - , lens >= 4.4 && < 5 + , lens >= 4.4 , mmorph >= 1 && < 2 , mtl >= 2.1.3.1 - , resourcet == 1.1.* - , scientific == 0.3.* + , resourcet >= 1.1 + , scientific >= 0.3 , semigroups >= 0.12 , tagged >= 0.7 , text >= 1.1 @@ -103,7 +103,7 @@ , transformers-compat >= 0.3 , unordered-containers >= 0.2.5 , vector >= 0.10.9 - , xml-conduit == 1.2.* + , xml-conduit >= 1.2 if !impl(ghc>=7.9) build-depends: diff --git a/src/Network/AWS/Data/Internal/JSON.hs b/src/Network/AWS/Data/Internal/JSON.hs --- a/src/Network/AWS/Data/Internal/JSON.hs +++ b/src/Network/AWS/Data/Internal/JSON.hs @@ -28,6 +28,7 @@ -- * ToJSON , ToJSON (..) , toJSONText + , Object , object , (.=) ) where diff --git a/src/Network/AWS/Data/Internal/Time.hs b/src/Network/AWS/Data/Internal/Time.hs --- a/src/Network/AWS/Data/Internal/Time.hs +++ b/src/Network/AWS/Data/Internal/Time.hs @@ -78,11 +78,11 @@ convert :: Time a -> Time b convert (Time t) = Time t -type RFC822 = Time RFC822Format -type ISO8601 = Time ISO8601Format -type BasicTime = Time BasicFormat -type AWSTime = Time AWSFormat -type POSIX = Time POSIXFormat +type RFC822 = Time 'RFC822Format +type ISO8601 = Time 'ISO8601Format +type BasicTime = Time 'BasicFormat +type AWSTime = Time 'AWSFormat +type POSIX = Time 'POSIXFormat class TimeFormat a where format :: Tagged a String diff --git a/src/Network/AWS/Prelude.hs b/src/Network/AWS/Prelude.hs --- a/src/Network/AWS/Prelude.hs +++ b/src/Network/AWS/Prelude.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE PatternSynonyms #-} - -- Module : Network.AWS.Prelude.Types -- Copyright : (c) 2013-2015 Brendan Hay -- License : This Source Code Form is subject to the terms of @@ -59,50 +57,36 @@ , Status (..) ) where -import Network.AWS.Error -import Network.AWS.Types - -import Control.Exception (Exception) -import Data.ByteString (ByteString) -import Data.CaseInsensitive (CI) -import Data.HashMap.Strict (HashMap) -import Data.List.NonEmpty (NonEmpty(..)) -import Data.Semigroup (Semigroup) -import Data.String (IsString(..)) -import Data.Text (Text) -import GHC.Generics (Generic) -import Network.HTTP.Client (HttpException, RequestBody) -import Network.HTTP.Types.Method (StdMethod(..)) -import Network.HTTP.Types.Status (Status(..)) -import Numeric.Natural (Natural) +import Control.Exception (Exception) +import Data.ByteString (ByteString) +import Data.CaseInsensitive (CI) +import Data.HashMap.Strict (HashMap) +import Data.List.NonEmpty (NonEmpty (..)) +import Data.Semigroup (Semigroup) +import Data.String (IsString (..)) +import Data.Text (Text) +import GHC.Generics (Generic) +import Network.AWS.Error +import Network.AWS.Types +import Network.HTTP.Client (HttpException, RequestBody) +import Network.HTTP.Types.Method (StdMethod (..)) +import Network.HTTP.Types.Status (Status (..)) +import Numeric.Natural (Natural) -import Control.Applicative as Export -import Data.Bifunctor as Export -import Data.Coerce as Export -import Data.Default.Class as Export -import Data.Hashable as Export -import Data.Maybe as Export -import Data.Monoid as Export hiding (All, Any, Sum) -import Data.Tagged as Export -import Network.AWS.Data as Export hiding (Query) -import Network.AWS.Pagination as Export -import Network.AWS.Response as Export -import Prelude as Export hiding (head, error) +import Control.Applicative as Export +import Data.Bifunctor as Export +import Data.Coerce as Export +import Data.Default.Class as Export +import Data.Hashable as Export +import Data.Maybe as Export +import Data.Monoid as Export hiding (All, Any, Sum) +import Data.Tagged as Export +import Network.AWS.Data as Export hiding (Object, Query) +import Network.AWS.Pagination as Export +import Network.AWS.Response as Export +import Prelude as Export hiding (error, head) -import Control.Lens as Export - ( Lens' - , Prism' - , Iso' - , (&) - , (^.) - , (.~) - , (?~) - , (%~) - , (<>~) - , lens - , prism - , iso - , withIso - , to - , mapping - ) +import Control.Lens as Export (Iso', Lens', Prism', iso, + lens, mapping, prism, to, + withIso, (%~), (&), (.~), + (<>~), (?~), (^.)) diff --git a/src/Network/AWS/Types.hs b/src/Network/AWS/Types.hs --- a/src/Network/AWS/Types.hs +++ b/src/Network/AWS/Types.hs @@ -439,8 +439,8 @@ "ap-southeast-2" -> pure Sydney "cn-north-1" -> pure Beijing "us-east-1" -> pure NorthVirginia - "us-west-2" -> pure NorthCalifornia - "us-west-1" -> pure Oregon + "us-west-2" -> pure Oregon + "us-west-1" -> pure NorthCalifornia "us-gov-west-1" -> pure GovCloud "fips-us-gov-west-1" -> pure GovCloudFIPS "sa-east-1" -> pure SaoPaulo diff --git a/src/Network/AWS/Waiters.hs b/src/Network/AWS/Waiters.hs --- a/src/Network/AWS/Waiters.hs +++ b/src/Network/AWS/Waiters.hs @@ -29,6 +29,9 @@ , matchError , matchStatus + -- * Util + , nonEmpty + -- * Lenses , module Control.Lens ) where @@ -36,6 +39,8 @@ import Control.Lens import Data.ByteString (ByteString) import Data.Maybe +import Data.Text (Text) +import qualified Data.Text as Text import Network.AWS.Data import Network.AWS.Error import Network.AWS.Types @@ -91,3 +96,6 @@ Right (_, rs) | f rs -> Just a _ -> Nothing + +nonEmpty :: Fold a Text -> Fold a Bool +nonEmpty l = l . to Text.null