amazonka-core 1.4.2 → 1.4.3
raw patch · 3 files changed
+18/−40 lines, 3 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Network.AWS.Data.Base64: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Data.Base64.Base64
- Network.AWS.Data.Base64: instance Data.Aeson.Types.ToJSON.ToJSON Network.AWS.Data.Base64.Base64
- Network.AWS.Data.JSON: parseJSONList :: FromJSON a => Value -> Parser [a]
- Network.AWS.Data.JSON: toEncodingList :: ToJSON a => [a] -> Encoding
- Network.AWS.Data.JSON: toJSONList :: ToJSON a => [a] -> Value
- Network.AWS.Data.List1: instance Data.Aeson.Types.FromJSON.FromJSON a => Data.Aeson.Types.FromJSON.FromJSON (Network.AWS.Data.List1.List1 a)
- Network.AWS.Data.List1: instance Data.Aeson.Types.ToJSON.ToJSON a => Data.Aeson.Types.ToJSON.ToJSON (Network.AWS.Data.List1.List1 a)
- Network.AWS.Data.Map: instance (Data.Hashable.Class.Hashable k, GHC.Classes.Eq k) => Data.Semigroup.Semigroup (Network.AWS.Data.Map.Map k v)
- Network.AWS.Data.Map: instance (Data.Hashable.Class.Hashable k, GHC.Classes.Eq k) => GHC.Base.Monoid (Network.AWS.Data.Map.Map k v)
- Network.AWS.Data.Map: instance (Data.Hashable.Class.Hashable k, GHC.Classes.Eq k, Data.Data.Data v, Data.Data.Data k) => Data.Data.Data (Network.AWS.Data.Map.Map k v)
- Network.AWS.Data.Map: instance (GHC.Classes.Eq k, Data.Hashable.Class.Hashable k, Network.AWS.Data.Text.FromText k, Data.Aeson.Types.FromJSON.FromJSON v) => Data.Aeson.Types.FromJSON.FromJSON (Network.AWS.Data.Map.Map k v)
- Network.AWS.Data.Map: instance (GHC.Classes.Eq k, Data.Hashable.Class.Hashable k, Network.AWS.Data.Text.ToText k, Data.Aeson.Types.ToJSON.ToJSON v) => Data.Aeson.Types.ToJSON.ToJSON (Network.AWS.Data.Map.Map k v)
- Network.AWS.Data.Map: instance (GHC.Classes.Eq v, GHC.Classes.Eq k) => GHC.Classes.Eq (Network.AWS.Data.Map.Map k v)
- Network.AWS.Data.Map: instance (GHC.Read.Read v, GHC.Read.Read k, Data.Hashable.Class.Hashable k, GHC.Classes.Eq k) => GHC.Read.Read (Network.AWS.Data.Map.Map k v)
- Network.AWS.Data.Map: instance (GHC.Show.Show v, GHC.Show.Show k) => GHC.Show.Show (Network.AWS.Data.Map.Map k v)
- Network.AWS.Data.Numeric: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Data.Numeric.Nat
- Network.AWS.Data.Numeric: instance Data.Aeson.Types.ToJSON.ToJSON Network.AWS.Data.Numeric.Nat
- Network.AWS.Data.Sensitive: instance Data.Aeson.Types.FromJSON.FromJSON a => Data.Aeson.Types.FromJSON.FromJSON (Network.AWS.Data.Sensitive.Sensitive a)
- Network.AWS.Data.Sensitive: instance Data.Aeson.Types.ToJSON.ToJSON a => Data.Aeson.Types.ToJSON.ToJSON (Network.AWS.Data.Sensitive.Sensitive a)
- Network.AWS.Data.Time: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Data.Time.AWSTime
- Network.AWS.Data.Time: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Data.Time.BasicTime
- Network.AWS.Data.Time: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Data.Time.ISO8601
- Network.AWS.Data.Time: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Data.Time.POSIX
- Network.AWS.Data.Time: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Data.Time.RFC822
- Network.AWS.Data.Time: instance Data.Aeson.Types.ToJSON.ToJSON Network.AWS.Data.Time.AWSTime
- Network.AWS.Data.Time: instance Data.Aeson.Types.ToJSON.ToJSON Network.AWS.Data.Time.BasicTime
- Network.AWS.Data.Time: instance Data.Aeson.Types.ToJSON.ToJSON Network.AWS.Data.Time.ISO8601
- Network.AWS.Data.Time: instance Data.Aeson.Types.ToJSON.ToJSON Network.AWS.Data.Time.POSIX
- Network.AWS.Data.Time: instance Data.Aeson.Types.ToJSON.ToJSON Network.AWS.Data.Time.RFC822
- Network.AWS.Data.Time: instance Network.AWS.Data.Text.FromText Network.AWS.Data.Time.POSIX
- Network.AWS.Data.Time: instance Network.AWS.Data.XML.FromXML Network.AWS.Data.Time.POSIX
- Network.AWS.Data.Time: instance Network.AWS.Data.XML.ToXML Network.AWS.Data.Time.POSIX
- Network.AWS.Types: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Types.Abbrev
- Network.AWS.Types: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Types.AuthEnv
- Network.AWS.Types: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Types.ErrorCode
- Network.AWS.Types: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Types.ErrorMessage
- Network.AWS.Types: instance Data.Aeson.Types.FromJSON.FromJSON Network.AWS.Types.RequestId
+ Network.AWS.Data.Base64: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Data.Base64.Base64
+ Network.AWS.Data.Base64: instance Data.Aeson.Types.Class.ToJSON Network.AWS.Data.Base64.Base64
+ Network.AWS.Data.List1: instance Data.Aeson.Types.Class.FromJSON a => Data.Aeson.Types.Class.FromJSON (Network.AWS.Data.List1.List1 a)
+ Network.AWS.Data.List1: instance Data.Aeson.Types.Class.ToJSON a => Data.Aeson.Types.Class.ToJSON (Network.AWS.Data.List1.List1 a)
+ Network.AWS.Data.Map: instance (GHC.Classes.Eq k, Data.Data.Data k, Data.Data.Data v, Data.Hashable.Class.Hashable k) => Data.Data.Data (Network.AWS.Data.Map.Map k v)
+ Network.AWS.Data.Map: instance (GHC.Classes.Eq k, Data.Hashable.Class.Hashable k) => Data.Semigroup.Semigroup (Network.AWS.Data.Map.Map k v)
+ Network.AWS.Data.Map: instance (GHC.Classes.Eq k, Data.Hashable.Class.Hashable k) => GHC.Base.Monoid (Network.AWS.Data.Map.Map k v)
+ Network.AWS.Data.Map: instance (GHC.Classes.Eq k, Data.Hashable.Class.Hashable k, Network.AWS.Data.Text.FromText k, Data.Aeson.Types.Class.FromJSON v) => Data.Aeson.Types.Class.FromJSON (Network.AWS.Data.Map.Map k v)
+ Network.AWS.Data.Map: instance (GHC.Classes.Eq k, Data.Hashable.Class.Hashable k, Network.AWS.Data.Text.ToText k, Data.Aeson.Types.Class.ToJSON v) => Data.Aeson.Types.Class.ToJSON (Network.AWS.Data.Map.Map k v)
+ Network.AWS.Data.Map: instance (GHC.Classes.Eq k, GHC.Classes.Eq v) => GHC.Classes.Eq (Network.AWS.Data.Map.Map k v)
+ Network.AWS.Data.Map: instance (GHC.Classes.Eq k, GHC.Read.Read k, GHC.Read.Read v, Data.Hashable.Class.Hashable k) => GHC.Read.Read (Network.AWS.Data.Map.Map k v)
+ Network.AWS.Data.Map: instance (GHC.Show.Show k, GHC.Show.Show v) => GHC.Show.Show (Network.AWS.Data.Map.Map k v)
+ Network.AWS.Data.Numeric: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Data.Numeric.Nat
+ Network.AWS.Data.Numeric: instance Data.Aeson.Types.Class.ToJSON Network.AWS.Data.Numeric.Nat
+ Network.AWS.Data.Sensitive: instance Data.Aeson.Types.Class.FromJSON a => Data.Aeson.Types.Class.FromJSON (Network.AWS.Data.Sensitive.Sensitive a)
+ Network.AWS.Data.Sensitive: instance Data.Aeson.Types.Class.ToJSON a => Data.Aeson.Types.Class.ToJSON (Network.AWS.Data.Sensitive.Sensitive a)
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Data.Time.AWSTime
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Data.Time.BasicTime
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Data.Time.ISO8601
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Data.Time.POSIX
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Data.Time.RFC822
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.ToJSON Network.AWS.Data.Time.AWSTime
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.ToJSON Network.AWS.Data.Time.BasicTime
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.ToJSON Network.AWS.Data.Time.ISO8601
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.ToJSON Network.AWS.Data.Time.POSIX
+ Network.AWS.Data.Time: instance Data.Aeson.Types.Class.ToJSON Network.AWS.Data.Time.RFC822
+ Network.AWS.Types: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Types.Abbrev
+ Network.AWS.Types: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Types.AuthEnv
+ Network.AWS.Types: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Types.ErrorCode
+ Network.AWS.Types: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Types.ErrorMessage
+ Network.AWS.Types: instance Data.Aeson.Types.Class.FromJSON Network.AWS.Types.RequestId
- Network.AWS.Data.JSON: parseJSON :: FromJSON a => Value -> Parser a
+ Network.AWS.Data.JSON: parseJSON :: Value -> Parser a
- Network.AWS.Data.JSON: toEncoding :: ToJSON a => a -> Encoding
+ Network.AWS.Data.JSON: toEncoding :: a -> Encoding
- Network.AWS.Data.JSON: toJSON :: ToJSON a => a -> Value
+ Network.AWS.Data.JSON: toJSON :: a -> Value
Files
- amazonka-core.cabal +1/−1
- src/Network/AWS/Data/Time.hs +17/−11
- test/Test/AWS/Data/Time.hs +0/−28
amazonka-core.cabal view
@@ -1,5 +1,5 @@ name: amazonka-core-version: 1.4.2+version: 1.4.3 synopsis: Core data types and functionality for Amazonka libraries. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues
src/Network/AWS/Data/Time.hs view
@@ -37,6 +37,7 @@ import Control.Applicative import Control.DeepSeq import Data.Aeson+import qualified Data.Aeson.Types as Aeson import Data.Attoparsec.Text (Parser) import qualified Data.Attoparsec.Text as AText import qualified Data.ByteString.Char8 as BS@@ -122,10 +123,6 @@ -- Deprecated, but ensure compatibility with examples until further investigation can be done <|> parseFormattedTime' (Tagged $ iso8601DateFormat (Just "%X%Q%Z")) -instance FromText POSIX where- parser = Time . posixSecondsToUTCTime . realToFrac- <$> (parser :: Parser Scientific)- parseFormattedTime :: forall a. TimeFormat (Time a) => Parser (Time a) parseFormattedTime = parseFormattedTime' format @@ -162,20 +159,30 @@ instance FromXML ISO8601 where parseXML = parseXMLText "ISO8601" instance FromXML AWSTime where parseXML = parseXMLText "AWSTime" instance FromXML BasicTime where parseXML = parseXMLText "BasicTime"-instance FromXML POSIX where parseXML = parseXMLText "POSIX" instance FromJSON RFC822 where parseJSON = parseJSONText "RFC822" instance FromJSON ISO8601 where parseJSON = parseJSONText "ISO8601" instance FromJSON AWSTime where parseJSON = parseJSONText "AWSTime" instance FromJSON BasicTime where parseJSON = parseJSONText "BasicTime" +-- This is a somewhat unfortunate hack to support the bizzare apigateway+-- occurence of returning ISO8601 or POSIX timestamps in unknown scenarios.+--+-- See: https://github.com/brendanhay/amazonka/issues/291 instance FromJSON POSIX where- parseJSON = withScientific "POSIX"- $ pure- . Time- . posixSecondsToUTCTime- . realToFrac+ parseJSON o = fmap convert (str o) <|> num o+ where+ str :: Value -> Aeson.Parser ISO8601+ str = parseJSON + num :: Value -> Aeson.Parser POSIX+ num = withScientific "POSIX"+ ( pure+ . Time+ . posixSecondsToUTCTime+ . realToFrac+ )+ instance ToByteString RFC822 where toBS = BS.pack . renderFormattedTime instance ToByteString ISO8601 where toBS = BS.pack . renderFormattedTime instance ToByteString BasicTime where toBS = BS.pack . renderFormattedTime@@ -190,7 +197,6 @@ instance ToXML ISO8601 where toXML = toXMLText instance ToXML AWSTime where toXML = toXMLText instance ToXML BasicTime where toXML = toXMLText-instance ToXML POSIX where toXML = toXMLText instance ToJSON RFC822 where toJSON = toJSONText instance ToJSON ISO8601 where toJSON = toJSONText
test/Test/AWS/Data/Time.hs view
@@ -30,17 +30,6 @@ , testFromText "aws" "20141107T044213Z" (time :: AWSTime)-- , testGroup "posix"- [ testFromText "integer"- "1415335333" (time :: POSIX)-- , testFromText "double"- "1415335333.000" (time :: POSIX)-- , testFromText "scientific"- "1.415335333E9" (time :: POSIX)- ] ] , testGroup "serialise"@@ -52,9 +41,6 @@ , testToText "aws" "20141107T044213Z" (time :: AWSTime)-- , testToText "posix"- "1415335333" (time :: POSIX) ] ] @@ -81,17 +67,6 @@ , testFromXML "aws" "20141107T044213Z" (time :: AWSTime)-- , testGroup "posix"- [ testFromXML "integer"- "1415335333" (time :: POSIX)-- , testFromXML "double"- "1415335333.000" (time :: POSIX)-- , testFromXML "scientific"- "1.415335333E9" (time :: POSIX)- ] ] , testGroup "serialise"@@ -103,9 +78,6 @@ , testToXML "aws" "20141107T044213Z" (time :: AWSTime)-- , testToXML "posix"- "1415335333" (time :: POSIX) ] ]