diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Version -`1.1.0` +`1.2.0` ## Description diff --git a/amazonka-sdb.cabal b/amazonka-sdb.cabal --- a/amazonka-sdb.cabal +++ b/amazonka-sdb.cabal @@ -1,5 +1,5 @@ name: amazonka-sdb -version: 1.1.0 +version: 1.2.0 synopsis: Amazon SimpleDB SDK. homepage: https://github.com/brendanhay/amazonka license: OtherLicense @@ -75,7 +75,7 @@ , Network.AWS.SDB.Types.Sum build-depends: - amazonka-core == 1.1.0.* + amazonka-core == 1.2.0.* , base >= 4.7 && < 5 test-suite amazonka-sdb-test @@ -94,9 +94,9 @@ , Test.AWS.SDB.Internal build-depends: - amazonka-core == 1.1.0 - , amazonka-test == 1.1.0 - , amazonka-sdb == 1.1.0 + amazonka-core == 1.2.0 + , amazonka-test == 1.2.0 + , amazonka-sdb == 1.2.0 , base , bytestring , lens diff --git a/gen/Network/AWS/SDB.hs b/gen/Network/AWS/SDB.hs --- a/gen/Network/AWS/SDB.hs +++ b/gen/Network/AWS/SDB.hs @@ -32,8 +32,8 @@ -- /See:/ module Network.AWS.SDB ( - -- * Service - SDB + -- * Service Configuration + sDB -- * Errors -- $errors diff --git a/gen/Network/AWS/SDB/BatchDeleteAttributes.hs b/gen/Network/AWS/SDB/BatchDeleteAttributes.hs --- a/gen/Network/AWS/SDB/BatchDeleteAttributes.hs +++ b/gen/Network/AWS/SDB/BatchDeleteAttributes.hs @@ -79,10 +79,9 @@ bdaItems = lens _bdaItems (\ s a -> s{_bdaItems = a}) . _Coerce; instance AWSRequest BatchDeleteAttributes where - type Sv BatchDeleteAttributes = SDB type Rs BatchDeleteAttributes = BatchDeleteAttributesResponse - request = postQuery + request = postQuery sDB response = receiveNull BatchDeleteAttributesResponse' instance ToHeaders BatchDeleteAttributes where diff --git a/gen/Network/AWS/SDB/BatchPutAttributes.hs b/gen/Network/AWS/SDB/BatchPutAttributes.hs --- a/gen/Network/AWS/SDB/BatchPutAttributes.hs +++ b/gen/Network/AWS/SDB/BatchPutAttributes.hs @@ -119,10 +119,9 @@ bpaItems = lens _bpaItems (\ s a -> s{_bpaItems = a}) . _Coerce; instance AWSRequest BatchPutAttributes where - type Sv BatchPutAttributes = SDB type Rs BatchPutAttributes = BatchPutAttributesResponse - request = postQuery + request = postQuery sDB response = receiveNull BatchPutAttributesResponse' instance ToHeaders BatchPutAttributes where diff --git a/gen/Network/AWS/SDB/CreateDomain.hs b/gen/Network/AWS/SDB/CreateDomain.hs --- a/gen/Network/AWS/SDB/CreateDomain.hs +++ b/gen/Network/AWS/SDB/CreateDomain.hs @@ -73,9 +73,8 @@ cdDomainName = lens _cdDomainName (\ s a -> s{_cdDomainName = a}); instance AWSRequest CreateDomain where - type Sv CreateDomain = SDB type Rs CreateDomain = CreateDomainResponse - request = postQuery + request = postQuery sDB response = receiveNull CreateDomainResponse' instance ToHeaders CreateDomain where diff --git a/gen/Network/AWS/SDB/DeleteAttributes.hs b/gen/Network/AWS/SDB/DeleteAttributes.hs --- a/gen/Network/AWS/SDB/DeleteAttributes.hs +++ b/gen/Network/AWS/SDB/DeleteAttributes.hs @@ -105,9 +105,8 @@ daItemName = lens _daItemName (\ s a -> s{_daItemName = a}); instance AWSRequest DeleteAttributes where - type Sv DeleteAttributes = SDB type Rs DeleteAttributes = DeleteAttributesResponse - request = postQuery + request = postQuery sDB response = receiveNull DeleteAttributesResponse' instance ToHeaders DeleteAttributes where diff --git a/gen/Network/AWS/SDB/DeleteDomain.hs b/gen/Network/AWS/SDB/DeleteDomain.hs --- a/gen/Network/AWS/SDB/DeleteDomain.hs +++ b/gen/Network/AWS/SDB/DeleteDomain.hs @@ -65,9 +65,8 @@ ddDomainName = lens _ddDomainName (\ s a -> s{_ddDomainName = a}); instance AWSRequest DeleteDomain where - type Sv DeleteDomain = SDB type Rs DeleteDomain = DeleteDomainResponse - request = postQuery + request = postQuery sDB response = receiveNull DeleteDomainResponse' instance ToHeaders DeleteDomain where diff --git a/gen/Network/AWS/SDB/DomainMetadata.hs b/gen/Network/AWS/SDB/DomainMetadata.hs --- a/gen/Network/AWS/SDB/DomainMetadata.hs +++ b/gen/Network/AWS/SDB/DomainMetadata.hs @@ -74,9 +74,8 @@ dmDomainName = lens _dmDomainName (\ s a -> s{_dmDomainName = a}); instance AWSRequest DomainMetadata where - type Sv DomainMetadata = SDB type Rs DomainMetadata = DomainMetadataResponse - request = postQuery + request = postQuery sDB response = receiveXMLWrapper "DomainMetadataResult" (\ s h x -> diff --git a/gen/Network/AWS/SDB/GetAttributes.hs b/gen/Network/AWS/SDB/GetAttributes.hs --- a/gen/Network/AWS/SDB/GetAttributes.hs +++ b/gen/Network/AWS/SDB/GetAttributes.hs @@ -104,9 +104,8 @@ gaItemName = lens _gaItemName (\ s a -> s{_gaItemName = a}); instance AWSRequest GetAttributes where - type Sv GetAttributes = SDB type Rs GetAttributes = GetAttributesResponse - request = postQuery + request = postQuery sDB response = receiveXMLWrapper "GetAttributesResult" (\ s h x -> diff --git a/gen/Network/AWS/SDB/ListDomains.hs b/gen/Network/AWS/SDB/ListDomains.hs --- a/gen/Network/AWS/SDB/ListDomains.hs +++ b/gen/Network/AWS/SDB/ListDomains.hs @@ -93,9 +93,8 @@ Just $ rq & ldNextToken .~ rs ^. ldrsNextToken instance AWSRequest ListDomains where - type Sv ListDomains = SDB type Rs ListDomains = ListDomainsResponse - request = postQuery + request = postQuery sDB response = receiveXMLWrapper "ListDomainsResult" (\ s h x -> diff --git a/gen/Network/AWS/SDB/PutAttributes.hs b/gen/Network/AWS/SDB/PutAttributes.hs --- a/gen/Network/AWS/SDB/PutAttributes.hs +++ b/gen/Network/AWS/SDB/PutAttributes.hs @@ -129,9 +129,8 @@ paAttributes = lens _paAttributes (\ s a -> s{_paAttributes = a}) . _Coerce; instance AWSRequest PutAttributes where - type Sv PutAttributes = SDB type Rs PutAttributes = PutAttributesResponse - request = postQuery + request = postQuery sDB response = receiveNull PutAttributesResponse' instance ToHeaders PutAttributes where diff --git a/gen/Network/AWS/SDB/Select.hs b/gen/Network/AWS/SDB/Select.hs --- a/gen/Network/AWS/SDB/Select.hs +++ b/gen/Network/AWS/SDB/Select.hs @@ -112,9 +112,8 @@ Just $ rq & sNextToken .~ rs ^. srsNextToken instance AWSRequest Select where - type Sv Select = SDB type Rs Select = SelectResponse - request = postQuery + request = postQuery sDB response = receiveXMLWrapper "SelectResult" (\ s h x -> diff --git a/gen/Network/AWS/SDB/Types.hs b/gen/Network/AWS/SDB/Types.hs --- a/gen/Network/AWS/SDB/Types.hs +++ b/gen/Network/AWS/SDB/Types.hs @@ -1,5 +1,4 @@ {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies #-} -- Derived from AWS service descriptions, licensed under Apache 2.0. @@ -13,8 +12,8 @@ -- module Network.AWS.SDB.Types ( - -- * Service - SDB + -- * Service Configuration + sDB -- * Errors , _InvalidNumberValueTests @@ -82,39 +81,36 @@ import Network.AWS.SDB.Types.Sum import Network.AWS.Sign.V2 --- | Version @2009-04-15@ of the Amazon SimpleDB SDK. -data SDB - -instance AWSService SDB where - type Sg SDB = V2 - service = const svc - where - svc = - Service - { _svcAbbrev = "SDB" - , _svcPrefix = "sdb" - , _svcVersion = "2009-04-15" - , _svcEndpoint = defaultEndpoint svc - , _svcTimeout = Just 70 - , _svcStatus = statusSuccess - , _svcError = parseXMLError - , _svcRetry = retry - } - retry = - Exponential - { _retryBase = 5.0e-2 - , _retryGrowth = 2 - , _retryAttempts = 5 - , _retryCheck = check - } - check e - | has (hasCode "ThrottlingException" . hasStatus 400) e = - Just "throttling_exception" - | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling" - | has (hasStatus 503) e = Just "service_unavailable" - | has (hasStatus 500) e = Just "general_server_error" - | has (hasStatus 509) e = Just "limit_exceeded" - | otherwise = Nothing +-- | API version '2009-04-15' of the Amazon SimpleDB SDK configuration. +sDB :: Service +sDB = + Service + { _svcAbbrev = "SDB" + , _svcSigner = v2 + , _svcPrefix = "sdb" + , _svcVersion = "2009-04-15" + , _svcEndpoint = defaultEndpoint sDB + , _svcTimeout = Just 70 + , _svcCheck = statusSuccess + , _svcError = parseXMLError + , _svcRetry = retry + } + where + retry = + Exponential + { _retryBase = 5.0e-2 + , _retryGrowth = 2 + , _retryAttempts = 5 + , _retryCheck = check + } + check e + | has (hasCode "ThrottlingException" . hasStatus 400) e = + Just "throttling_exception" + | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling" + | has (hasStatus 503) e = Just "service_unavailable" + | has (hasStatus 500) e = Just "general_server_error" + | has (hasStatus 509) e = Just "limit_exceeded" + | otherwise = Nothing -- | Too many predicates exist in the query expression. _InvalidNumberValueTests :: AsError a => Getting (First ServiceError) a ServiceError diff --git a/gen/Network/AWS/SDB/Types/Product.hs b/gen/Network/AWS/SDB/Types/Product.hs --- a/gen/Network/AWS/SDB/Types/Product.hs +++ b/gen/Network/AWS/SDB/Types/Product.hs @@ -2,7 +2,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeFamilies #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-} diff --git a/test/Test/AWS/Gen/SDB.hs b/test/Test/AWS/Gen/SDB.hs --- a/test/Test/AWS/Gen/SDB.hs +++ b/test/Test/AWS/Gen/SDB.hs @@ -152,58 +152,68 @@ testBatchDeleteAttributesResponse = res "BatchDeleteAttributesResponse" "fixture/BatchDeleteAttributesResponse" + sDB (Proxy :: Proxy BatchDeleteAttributes) testBatchPutAttributesResponse :: BatchPutAttributesResponse -> TestTree testBatchPutAttributesResponse = res "BatchPutAttributesResponse" "fixture/BatchPutAttributesResponse" + sDB (Proxy :: Proxy BatchPutAttributes) testGetAttributesResponse :: GetAttributesResponse -> TestTree testGetAttributesResponse = res "GetAttributesResponse" "fixture/GetAttributesResponse" + sDB (Proxy :: Proxy GetAttributes) testCreateDomainResponse :: CreateDomainResponse -> TestTree testCreateDomainResponse = res "CreateDomainResponse" "fixture/CreateDomainResponse" + sDB (Proxy :: Proxy CreateDomain) testDomainMetadataResponse :: DomainMetadataResponse -> TestTree testDomainMetadataResponse = res "DomainMetadataResponse" "fixture/DomainMetadataResponse" + sDB (Proxy :: Proxy DomainMetadata) testSelectResponse :: SelectResponse -> TestTree testSelectResponse = res "SelectResponse" "fixture/SelectResponse" + sDB (Proxy :: Proxy Select) testPutAttributesResponse :: PutAttributesResponse -> TestTree testPutAttributesResponse = res "PutAttributesResponse" "fixture/PutAttributesResponse" + sDB (Proxy :: Proxy PutAttributes) testDeleteAttributesResponse :: DeleteAttributesResponse -> TestTree testDeleteAttributesResponse = res "DeleteAttributesResponse" "fixture/DeleteAttributesResponse" + sDB (Proxy :: Proxy DeleteAttributes) testListDomainsResponse :: ListDomainsResponse -> TestTree testListDomainsResponse = res "ListDomainsResponse" "fixture/ListDomainsResponse" + sDB (Proxy :: Proxy ListDomains) testDeleteDomainResponse :: DeleteDomainResponse -> TestTree testDeleteDomainResponse = res "DeleteDomainResponse" "fixture/DeleteDomainResponse" + sDB (Proxy :: Proxy DeleteDomain)