diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Version -`1.2.0.2` +`1.3.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.2.0.2 +version: 1.3.0 synopsis: Amazon SimpleDB SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -75,7 +75,7 @@ , Network.AWS.SDB.Types.Sum build-depends: - amazonka-core == 1.2.0.* + amazonka-core == 1.3.0.* , base >= 4.7 && < 5 test-suite amazonka-sdb-test @@ -95,9 +95,9 @@ , Test.AWS.SDB.Internal build-depends: - amazonka-core == 1.2.0.* - , amazonka-test == 1.2.0.* - , amazonka-sdb == 1.2.0.* + amazonka-core == 1.3.0.* + , amazonka-test == 1.3.0.* + , amazonka-sdb == 1.3.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 @@ -44,23 +44,23 @@ -- ** NoSuchDomain , _NoSuchDomain - -- ** NumberDomainAttributesExceeded - , _NumberDomainAttributesExceeded - -- ** NumberSubmittedItemsExceeded , _NumberSubmittedItemsExceeded -- ** AttributeDoesNotExist , _AttributeDoesNotExist - -- ** InvalidNextToken - , _InvalidNextToken + -- ** NumberDomainAttributesExceeded + , _NumberDomainAttributesExceeded + -- ** DuplicateItemName + , _DuplicateItemName + -- ** MissingParameter , _MissingParameter - -- ** DuplicateItemName - , _DuplicateItemName + -- ** InvalidNextToken + , _InvalidNextToken -- ** InvalidParameterValue , _InvalidParameterValue @@ -83,12 +83,12 @@ -- ** NumberSubmittedAttributesExceeded , _NumberSubmittedAttributesExceeded - -- ** InvalidQueryExpression - , _InvalidQueryExpression - -- ** NumberDomainBytesExceeded , _NumberDomainBytesExceeded + -- ** InvalidQueryExpression + , _InvalidQueryExpression + -- * Waiters -- $waiters @@ -113,17 +113,17 @@ -- ** Select (Paginated) , module Network.AWS.SDB.Select - -- ** PutAttributes - , module Network.AWS.SDB.PutAttributes - -- ** DeleteAttributes , module Network.AWS.SDB.DeleteAttributes - -- ** ListDomains (Paginated) - , module Network.AWS.SDB.ListDomains + -- ** PutAttributes + , module Network.AWS.SDB.PutAttributes -- ** DeleteDomain , module Network.AWS.SDB.DeleteDomain + + -- ** ListDomains (Paginated) + , module Network.AWS.SDB.ListDomains -- * Types 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 @@ -36,13 +36,13 @@ , DomainMetadataResponse -- * Response Lenses , dmrsItemNamesSizeBytes - , dmrsAttributeNameCount , dmrsAttributeValuesSizeBytes - , dmrsAttributeValueCount + , dmrsAttributeNameCount , dmrsAttributeNamesSizeBytes - , dmrsTimestamp + , dmrsAttributeValueCount , dmrsItemCount - , dmrsStatus + , dmrsTimestamp + , dmrsResponseStatus ) where import Network.AWS.Prelude @@ -81,12 +81,12 @@ (\ s h x -> DomainMetadataResponse' <$> (x .@? "ItemNamesSizeBytes") <*> - (x .@? "AttributeNameCount") - <*> (x .@? "AttributeValuesSizeBytes") - <*> (x .@? "AttributeValueCount") + (x .@? "AttributeValuesSizeBytes") + <*> (x .@? "AttributeNameCount") <*> (x .@? "AttributeNamesSizeBytes") - <*> (x .@? "Timestamp") + <*> (x .@? "AttributeValueCount") <*> (x .@? "ItemCount") + <*> (x .@? "Timestamp") <*> (pure (fromEnum s))) instance ToHeaders DomainMetadata where @@ -105,13 +105,13 @@ -- | /See:/ 'domainMetadataResponse' smart constructor. data DomainMetadataResponse = DomainMetadataResponse' { _dmrsItemNamesSizeBytes :: !(Maybe Integer) - , _dmrsAttributeNameCount :: !(Maybe Int) , _dmrsAttributeValuesSizeBytes :: !(Maybe Integer) - , _dmrsAttributeValueCount :: !(Maybe Int) + , _dmrsAttributeNameCount :: !(Maybe Int) , _dmrsAttributeNamesSizeBytes :: !(Maybe Integer) - , _dmrsTimestamp :: !(Maybe Int) + , _dmrsAttributeValueCount :: !(Maybe Int) , _dmrsItemCount :: !(Maybe Int) - , _dmrsStatus :: !Int + , _dmrsTimestamp :: !(Maybe Int) + , _dmrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'DomainMetadataResponse' with the minimum fields required to make a request. @@ -120,62 +120,62 @@ -- -- * 'dmrsItemNamesSizeBytes' -- --- * 'dmrsAttributeNameCount' --- -- * 'dmrsAttributeValuesSizeBytes' -- --- * 'dmrsAttributeValueCount' +-- * 'dmrsAttributeNameCount' -- -- * 'dmrsAttributeNamesSizeBytes' -- --- * 'dmrsTimestamp' +-- * 'dmrsAttributeValueCount' -- -- * 'dmrsItemCount' -- --- * 'dmrsStatus' +-- * 'dmrsTimestamp' +-- +-- * 'dmrsResponseStatus' domainMetadataResponse - :: Int -- ^ 'dmrsStatus' + :: Int -- ^ 'dmrsResponseStatus' -> DomainMetadataResponse -domainMetadataResponse pStatus_ = +domainMetadataResponse pResponseStatus_ = DomainMetadataResponse' { _dmrsItemNamesSizeBytes = Nothing - , _dmrsAttributeNameCount = Nothing , _dmrsAttributeValuesSizeBytes = Nothing - , _dmrsAttributeValueCount = Nothing + , _dmrsAttributeNameCount = Nothing , _dmrsAttributeNamesSizeBytes = Nothing - , _dmrsTimestamp = Nothing + , _dmrsAttributeValueCount = Nothing , _dmrsItemCount = Nothing - , _dmrsStatus = pStatus_ + , _dmrsTimestamp = Nothing + , _dmrsResponseStatus = pResponseStatus_ } -- | The total size of all item names in the domain, in bytes. dmrsItemNamesSizeBytes :: Lens' DomainMetadataResponse (Maybe Integer) dmrsItemNamesSizeBytes = lens _dmrsItemNamesSizeBytes (\ s a -> s{_dmrsItemNamesSizeBytes = a}); --- | The number of unique attribute names in the domain. -dmrsAttributeNameCount :: Lens' DomainMetadataResponse (Maybe Int) -dmrsAttributeNameCount = lens _dmrsAttributeNameCount (\ s a -> s{_dmrsAttributeNameCount = a}); - -- | The total size of all attribute values in the domain, in bytes. dmrsAttributeValuesSizeBytes :: Lens' DomainMetadataResponse (Maybe Integer) dmrsAttributeValuesSizeBytes = lens _dmrsAttributeValuesSizeBytes (\ s a -> s{_dmrsAttributeValuesSizeBytes = a}); --- | The number of all attribute name\/value pairs in the domain. -dmrsAttributeValueCount :: Lens' DomainMetadataResponse (Maybe Int) -dmrsAttributeValueCount = lens _dmrsAttributeValueCount (\ s a -> s{_dmrsAttributeValueCount = a}); +-- | The number of unique attribute names in the domain. +dmrsAttributeNameCount :: Lens' DomainMetadataResponse (Maybe Int) +dmrsAttributeNameCount = lens _dmrsAttributeNameCount (\ s a -> s{_dmrsAttributeNameCount = a}); -- | The total size of all unique attribute names in the domain, in bytes. dmrsAttributeNamesSizeBytes :: Lens' DomainMetadataResponse (Maybe Integer) dmrsAttributeNamesSizeBytes = lens _dmrsAttributeNamesSizeBytes (\ s a -> s{_dmrsAttributeNamesSizeBytes = a}); --- | The data and time when metadata was calculated, in Epoch (UNIX) seconds. -dmrsTimestamp :: Lens' DomainMetadataResponse (Maybe Int) -dmrsTimestamp = lens _dmrsTimestamp (\ s a -> s{_dmrsTimestamp = a}); +-- | The number of all attribute name\/value pairs in the domain. +dmrsAttributeValueCount :: Lens' DomainMetadataResponse (Maybe Int) +dmrsAttributeValueCount = lens _dmrsAttributeValueCount (\ s a -> s{_dmrsAttributeValueCount = a}); -- | The number of all items in the domain. dmrsItemCount :: Lens' DomainMetadataResponse (Maybe Int) dmrsItemCount = lens _dmrsItemCount (\ s a -> s{_dmrsItemCount = a}); +-- | The data and time when metadata was calculated, in Epoch (UNIX) seconds. +dmrsTimestamp :: Lens' DomainMetadataResponse (Maybe Int) +dmrsTimestamp = lens _dmrsTimestamp (\ s a -> s{_dmrsTimestamp = a}); + -- | The response status code. -dmrsStatus :: Lens' DomainMetadataResponse Int -dmrsStatus = lens _dmrsStatus (\ s a -> s{_dmrsStatus = a}); +dmrsResponseStatus :: Lens' DomainMetadataResponse Int +dmrsResponseStatus = lens _dmrsResponseStatus (\ s a -> s{_dmrsResponseStatus = a}); 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 @@ -43,7 +43,7 @@ , GetAttributesResponse -- * Response Lenses , garsAttributes - , garsStatus + , garsResponseStatus ) where import Network.AWS.Prelude @@ -132,8 +132,8 @@ -- | /See:/ 'getAttributesResponse' smart constructor. data GetAttributesResponse = GetAttributesResponse' - { _garsAttributes :: !(Maybe [Attribute]) - , _garsStatus :: !Int + { _garsAttributes :: !(Maybe [Attribute]) + , _garsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetAttributesResponse' with the minimum fields required to make a request. @@ -142,14 +142,14 @@ -- -- * 'garsAttributes' -- --- * 'garsStatus' +-- * 'garsResponseStatus' getAttributesResponse - :: Int -- ^ 'garsStatus' + :: Int -- ^ 'garsResponseStatus' -> GetAttributesResponse -getAttributesResponse pStatus_ = +getAttributesResponse pResponseStatus_ = GetAttributesResponse' { _garsAttributes = Nothing - , _garsStatus = pStatus_ + , _garsResponseStatus = pResponseStatus_ } -- | The list of attributes returned by the operation. @@ -157,5 +157,5 @@ garsAttributes = lens _garsAttributes (\ s a -> s{_garsAttributes = a}) . _Default . _Coerce; -- | The response status code. -garsStatus :: Lens' GetAttributesResponse Int -garsStatus = lens _garsStatus (\ s a -> s{_garsStatus = a}); +garsResponseStatus :: Lens' GetAttributesResponse Int +garsResponseStatus = lens _garsResponseStatus (\ s a -> s{_garsResponseStatus = a}); 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 @@ -44,7 +44,7 @@ -- * Response Lenses , ldrsDomainNames , ldrsNextToken - , ldrsStatus + , ldrsResponseStatus ) where import Network.AWS.Pager @@ -119,9 +119,9 @@ -- | /See:/ 'listDomainsResponse' smart constructor. data ListDomainsResponse = ListDomainsResponse' - { _ldrsDomainNames :: !(Maybe [Text]) - , _ldrsNextToken :: !(Maybe Text) - , _ldrsStatus :: !Int + { _ldrsDomainNames :: !(Maybe [Text]) + , _ldrsNextToken :: !(Maybe Text) + , _ldrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListDomainsResponse' with the minimum fields required to make a request. @@ -132,15 +132,15 @@ -- -- * 'ldrsNextToken' -- --- * 'ldrsStatus' +-- * 'ldrsResponseStatus' listDomainsResponse - :: Int -- ^ 'ldrsStatus' + :: Int -- ^ 'ldrsResponseStatus' -> ListDomainsResponse -listDomainsResponse pStatus_ = +listDomainsResponse pResponseStatus_ = ListDomainsResponse' { _ldrsDomainNames = Nothing , _ldrsNextToken = Nothing - , _ldrsStatus = pStatus_ + , _ldrsResponseStatus = pResponseStatus_ } -- | A list of domain names that match the expression. @@ -153,5 +153,5 @@ ldrsNextToken = lens _ldrsNextToken (\ s a -> s{_ldrsNextToken = a}); -- | The response status code. -ldrsStatus :: Lens' ListDomainsResponse Int -ldrsStatus = lens _ldrsStatus (\ s a -> s{_ldrsStatus = a}); +ldrsResponseStatus :: Lens' ListDomainsResponse Int +ldrsResponseStatus = lens _ldrsResponseStatus (\ s a -> s{_ldrsResponseStatus = a}); 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 @@ -51,7 +51,7 @@ -- * Response Lenses , srsItems , srsNextToken - , srsStatus + , srsResponseStatus ) where import Network.AWS.Pager @@ -138,9 +138,9 @@ -- | /See:/ 'selectResponse' smart constructor. data SelectResponse = SelectResponse' - { _srsItems :: !(Maybe [Item]) - , _srsNextToken :: !(Maybe Text) - , _srsStatus :: !Int + { _srsItems :: !(Maybe [Item]) + , _srsNextToken :: !(Maybe Text) + , _srsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'SelectResponse' with the minimum fields required to make a request. @@ -151,15 +151,15 @@ -- -- * 'srsNextToken' -- --- * 'srsStatus' +-- * 'srsResponseStatus' selectResponse - :: Int -- ^ 'srsStatus' + :: Int -- ^ 'srsResponseStatus' -> SelectResponse -selectResponse pStatus_ = +selectResponse pResponseStatus_ = SelectResponse' { _srsItems = Nothing , _srsNextToken = Nothing - , _srsStatus = pStatus_ + , _srsResponseStatus = pResponseStatus_ } -- | A list of items that match the select expression. @@ -173,5 +173,5 @@ srsNextToken = lens _srsNextToken (\ s a -> s{_srsNextToken = a}); -- | The response status code. -srsStatus :: Lens' SelectResponse Int -srsStatus = lens _srsStatus (\ s a -> s{_srsStatus = a}); +srsResponseStatus :: Lens' SelectResponse Int +srsResponseStatus = lens _srsResponseStatus (\ s a -> s{_srsResponseStatus = a}); 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 @@ -18,12 +18,12 @@ -- * Errors , _InvalidNumberValueTests , _NoSuchDomain - , _NumberDomainAttributesExceeded , _NumberSubmittedItemsExceeded , _AttributeDoesNotExist - , _InvalidNextToken - , _MissingParameter + , _NumberDomainAttributesExceeded , _DuplicateItemName + , _MissingParameter + , _InvalidNextToken , _InvalidParameterValue , _NumberItemAttributesExceeded , _RequestTimeout @@ -31,8 +31,8 @@ , _InvalidNumberPredicates , _NumberDomainsExceeded , _NumberSubmittedAttributesExceeded - , _InvalidQueryExpression , _NumberDomainBytesExceeded + , _InvalidQueryExpression -- * Attribute , Attribute @@ -121,11 +121,6 @@ _NoSuchDomain :: AsError a => Getting (First ServiceError) a ServiceError _NoSuchDomain = _ServiceError . hasStatus 400 . hasCode "NoSuchDomain" --- | Too many attributes in this domain. -_NumberDomainAttributesExceeded :: AsError a => Getting (First ServiceError) a ServiceError -_NumberDomainAttributesExceeded = - _ServiceError . hasStatus 409 . hasCode "NumberDomainAttributesExceeded" - -- | Too many items exist in a single call. _NumberSubmittedItemsExceeded :: AsError a => Getting (First ServiceError) a ServiceError _NumberSubmittedItemsExceeded = @@ -136,19 +131,24 @@ _AttributeDoesNotExist = _ServiceError . hasStatus 404 . hasCode "AttributeDoesNotExist" --- | The specified NextToken is not valid. -_InvalidNextToken :: AsError a => Getting (First ServiceError) a ServiceError -_InvalidNextToken = _ServiceError . hasStatus 400 . hasCode "InvalidNextToken" - --- | The request must contain the specified missing parameter. -_MissingParameter :: AsError a => Getting (First ServiceError) a ServiceError -_MissingParameter = _ServiceError . hasStatus 400 . hasCode "MissingParameter" +-- | Too many attributes in this domain. +_NumberDomainAttributesExceeded :: AsError a => Getting (First ServiceError) a ServiceError +_NumberDomainAttributesExceeded = + _ServiceError . hasStatus 409 . hasCode "NumberDomainAttributesExceeded" -- | The item name was specified more than once. _DuplicateItemName :: AsError a => Getting (First ServiceError) a ServiceError _DuplicateItemName = _ServiceError . hasStatus 400 . hasCode "DuplicateItemName" +-- | The request must contain the specified missing parameter. +_MissingParameter :: AsError a => Getting (First ServiceError) a ServiceError +_MissingParameter = _ServiceError . hasStatus 400 . hasCode "MissingParameter" + +-- | The specified NextToken is not valid. +_InvalidNextToken :: AsError a => Getting (First ServiceError) a ServiceError +_InvalidNextToken = _ServiceError . hasStatus 400 . hasCode "InvalidNextToken" + -- | The value for a parameter is invalid. _InvalidParameterValue :: AsError a => Getting (First ServiceError) a ServiceError _InvalidParameterValue = @@ -184,12 +184,12 @@ _NumberSubmittedAttributesExceeded = _ServiceError . hasStatus 409 . hasCode "NumberSubmittedAttributesExceeded" --- | The specified query expression syntax is not valid. -_InvalidQueryExpression :: AsError a => Getting (First ServiceError) a ServiceError -_InvalidQueryExpression = - _ServiceError . hasStatus 400 . hasCode "InvalidQueryExpression" - -- | Too many bytes in this domain. _NumberDomainBytesExceeded :: AsError a => Getting (First ServiceError) a ServiceError _NumberDomainBytesExceeded = _ServiceError . hasStatus 409 . hasCode "NumberDomainBytesExceeded" + +-- | The specified query expression syntax is not valid. +_InvalidQueryExpression :: AsError a => Getting (First ServiceError) a ServiceError +_InvalidQueryExpression = + _ServiceError . hasStatus 400 . hasCode "InvalidQueryExpression" 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 @@ -46,18 +46,18 @@ -- , testSelect $ -- select -- --- , testPutAttributes $ --- putAttributes --- -- , testDeleteAttributes $ -- deleteAttributes -- --- , testListDomains $ --- listDomains +-- , testPutAttributes $ +-- putAttributes -- -- , testDeleteDomain $ -- deleteDomain -- +-- , testListDomains $ +-- listDomains +-- -- ] -- , testGroup "response" @@ -79,18 +79,18 @@ -- , testSelectResponse $ -- selectResponse -- --- , testPutAttributesResponse $ --- putAttributesResponse --- -- , testDeleteAttributesResponse $ -- deleteAttributesResponse -- --- , testListDomainsResponse $ --- listDomainsResponse +-- , testPutAttributesResponse $ +-- putAttributesResponse -- -- , testDeleteDomainResponse $ -- deleteDomainResponse -- +-- , testListDomainsResponse $ +-- listDomainsResponse +-- -- ] -- ] @@ -126,26 +126,26 @@ "Select" "fixture/Select.yaml" -testPutAttributes :: PutAttributes -> TestTree -testPutAttributes = req - "PutAttributes" - "fixture/PutAttributes.yaml" - testDeleteAttributes :: DeleteAttributes -> TestTree testDeleteAttributes = req "DeleteAttributes" "fixture/DeleteAttributes.yaml" -testListDomains :: ListDomains -> TestTree -testListDomains = req - "ListDomains" - "fixture/ListDomains.yaml" +testPutAttributes :: PutAttributes -> TestTree +testPutAttributes = req + "PutAttributes" + "fixture/PutAttributes.yaml" testDeleteDomain :: DeleteDomain -> TestTree testDeleteDomain = req "DeleteDomain" "fixture/DeleteDomain.yaml" +testListDomains :: ListDomains -> TestTree +testListDomains = req + "ListDomains" + "fixture/ListDomains.yaml" + -- Responses testBatchDeleteAttributesResponse :: BatchDeleteAttributesResponse -> TestTree @@ -190,13 +190,6 @@ sDB (Proxy :: Proxy Select) -testPutAttributesResponse :: PutAttributesResponse -> TestTree -testPutAttributesResponse = res - "PutAttributesResponse" - "fixture/PutAttributesResponse.proto" - sDB - (Proxy :: Proxy PutAttributes) - testDeleteAttributesResponse :: DeleteAttributesResponse -> TestTree testDeleteAttributesResponse = res "DeleteAttributesResponse" @@ -204,12 +197,12 @@ sDB (Proxy :: Proxy DeleteAttributes) -testListDomainsResponse :: ListDomainsResponse -> TestTree -testListDomainsResponse = res - "ListDomainsResponse" - "fixture/ListDomainsResponse.proto" +testPutAttributesResponse :: PutAttributesResponse -> TestTree +testPutAttributesResponse = res + "PutAttributesResponse" + "fixture/PutAttributesResponse.proto" sDB - (Proxy :: Proxy ListDomains) + (Proxy :: Proxy PutAttributes) testDeleteDomainResponse :: DeleteDomainResponse -> TestTree testDeleteDomainResponse = res @@ -217,3 +210,10 @@ "fixture/DeleteDomainResponse.proto" sDB (Proxy :: Proxy DeleteDomain) + +testListDomainsResponse :: ListDomainsResponse -> TestTree +testListDomainsResponse = res + "ListDomainsResponse" + "fixture/ListDomainsResponse.proto" + sDB + (Proxy :: Proxy ListDomains)