hSimpleDB 0.1 → 0.2

raw patch · 2 files changed

+6/−13 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• hSimpleDB.cabal +1/−1
• src/Network/AWS/AWSConnection.hs +5/−12

@@ -1,5 +1,5 @@ name:                hSimpleDB-version:             0.1+version:             0.2 synopsis:            Interface to Amazon's SimpleDB service. description:         Interface to Amazon's SimpleDB service. category:            Database, Web, Network

@@ -10,7 +10,7 @@    -- * Constants    defaultAmazonSimpleDBHost, defaultAmazonSimpleDBPort,    -- * Function Types-   amazonSimpleDBConnection, -- amazonS3ConnectionFromEnv,+   amazonSimpleDBConnection, amazonConnectionFromEnv,    -- * Data Types    AWSConnection(..)    ) where@@ -44,13 +44,6 @@  -- | Create an AWSConnection to Amazon from credentials.  Uses the --   production service.-amazonS3Connection :: String -- ^ Access Key ID-                   -> String -- ^ Secret Access Key-                   -> AWSConnection -- ^ Connection to Amazon S3-amazonS3Connection = AWSConnection defaultAmazonS3Host defaultAmazonS3Port---- | Create an AWSConnection to Amazon from credentials.  Uses the---   production service. amazonSimpleDBConnection :: String -- ^ Access Key ID                          -> String -- ^ Secret Access Key                          -> AWSConnection -- ^ Connection to Amazon S3@@ -60,15 +53,15 @@ --   AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY, respectively. --   Either variable being undefined or empty will result in --   'Nothing'.-amazonS3ConnectionFromEnv :: IO (Maybe AWSConnection)-amazonS3ConnectionFromEnv =+amazonConnectionFromEnv :: IO (Maybe AWSConnection)+amazonConnectionFromEnv =     do ak <- getEnvKey "AWS_ACCESS_KEY_ID"        sk0 <- getEnvKey "AWS_ACCESS_KEY_SECRET"        sk1 <- getEnvKey "AWS_SECRET_ACCESS_KEY"        return $ case (ak, sk0, sk1) of                   ("",  _,  _) -> Nothing                   ( _, "", "") -> Nothing-                  ( _, "",  _) -> Just (amazonS3Connection ak sk1)-                  ( _,  _,  _) -> Just (amazonS3Connection ak sk0)+                  ( _, "",  _) -> Just (amazonSimpleDBConnection ak sk1)+                  ( _,  _,  _) -> Just (amazonSimpleDBConnection ak sk0)     where getEnvKey s = catch (getEnv s) (const $ return "")