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-sqs.cabal b/amazonka-sqs.cabal --- a/amazonka-sqs.cabal +++ b/amazonka-sqs.cabal @@ -1,5 +1,5 @@ name: amazonka-sqs -version: 1.2.0.2 +version: 1.3.0 synopsis: Amazon Simple Queue Service SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -94,7 +94,7 @@ , Network.AWS.SQS.Types.Sum build-depends: - amazonka-core == 1.2.0.* + amazonka-core == 1.3.0.* , base >= 4.7 && < 5 test-suite amazonka-sqs-test @@ -114,9 +114,9 @@ , Test.AWS.SQS.Internal build-depends: - amazonka-core == 1.2.0.* - , amazonka-test == 1.2.0.* - , amazonka-sqs == 1.2.0.* + amazonka-core == 1.3.0.* + , amazonka-test == 1.3.0.* + , amazonka-sqs == 1.3.0.* , base , bytestring , lens diff --git a/fixture/ReceiveMessageResponse.proto b/fixture/ReceiveMessageResponse.proto --- a/fixture/ReceiveMessageResponse.proto +++ b/fixture/ReceiveMessageResponse.proto @@ -1,17 +1,9 @@ - - 5fea7756-0ea4-451a-a703-a558b933e274 - - - MbZj6wDWli+JvwwJaBV+3dcjk2YW2vA3+STFFljTM8tJJg6HRG6PYSasuWXPJB+Cw - Lj1FjgXUv1uSj1gUPAWV66FU/WeR4mq2OKpEGYWbnLmpRCJVAyeMjeU5ZBdtcQ+QE - auMZc8ZRv37sIW2iJKq3M9MFx1YvV11A2x/KSbkJ0= - - - fafb00f5732ab283681e124bf8747ed1 - + 5fea7756-0ea4-451a-a703-a558b933e274 + MbZj6wDWli+JvwwJaBV+3dcjk2YW2vA3+STFFljTM8tJJg6HRG6PYSasuWXPJB+CwLj1FjgXUv1uSj1gUPAWV66FU/WeR4mq2OKpEGYWbnLmpRCJVAyeMjeU5ZBdtcQ+QEauMZc8ZRv37sIW2iJKq3M9MFx1YvV11A2x/KSbkJ0= + fafb00f5732ab283681e124bf8747ed1 This is a test message SenderId @@ -32,9 +24,6 @@ - - b6633655-283d-45b4-aee4-4e84e0ae6afa - + b6633655-283d-45b4-aee4-4e84e0ae6afa - diff --git a/gen/Network/AWS/SQS.hs b/gen/Network/AWS/SQS.hs --- a/gen/Network/AWS/SQS.hs +++ b/gen/Network/AWS/SQS.hs @@ -56,15 +56,15 @@ -- ** TooManyEntriesInBatchRequest , _TooManyEntriesInBatchRequest - -- ** InvalidAttributeName - , _InvalidAttributeName - -- ** QueueDeletedRecently , _QueueDeletedRecently -- ** QueueDoesNotExist , _QueueDoesNotExist + -- ** InvalidAttributeName + , _InvalidAttributeName + -- ** UnsupportedOperation , _UnsupportedOperation @@ -77,12 +77,12 @@ -- ** OverLimit , _OverLimit - -- ** PurgeQueueInProgress - , _PurgeQueueInProgress - -- ** QueueNameExists , _QueueNameExists + -- ** PurgeQueueInProgress + , _PurgeQueueInProgress + -- ** InvalidIdFormat , _InvalidIdFormat @@ -92,12 +92,12 @@ -- ** EmptyBatchRequest , _EmptyBatchRequest - -- ** MessageNotInflight - , _MessageNotInflight - -- ** BatchEntryIdsNotDistinct , _BatchEntryIdsNotDistinct + -- ** MessageNotInflight + , _MessageNotInflight + -- * Waiters -- $waiters @@ -110,12 +110,12 @@ -- ** PurgeQueue , module Network.AWS.SQS.PurgeQueue - -- ** SendMessage - , module Network.AWS.SQS.SendMessage - -- ** ChangeMessageVisibilityBatch , module Network.AWS.SQS.ChangeMessageVisibilityBatch + -- ** SendMessage + , module Network.AWS.SQS.SendMessage + -- ** RemovePermission , module Network.AWS.SQS.RemovePermission @@ -149,12 +149,12 @@ -- ** CreateQueue , module Network.AWS.SQS.CreateQueue - -- ** ChangeMessageVisibility - , module Network.AWS.SQS.ChangeMessageVisibility - -- ** SendMessageBatch , module Network.AWS.SQS.SendMessageBatch + -- ** ChangeMessageVisibility + , module Network.AWS.SQS.ChangeMessageVisibility + -- * Types -- ** MessageAttribute @@ -201,8 +201,8 @@ , mMD5OfBody , mBody , mAttributes - , mMessageId , mReceiptHandle + , mMessageId , mMD5OfMessageAttributes -- ** MessageAttributeValue diff --git a/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs b/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs --- a/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs +++ b/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs @@ -50,7 +50,7 @@ , changeMessageVisibilityBatchResponse , ChangeMessageVisibilityBatchResponse -- * Response Lenses - , cmvbrsStatus + , cmvbrsResponseStatus , cmvbrsSuccessful , cmvbrsFailed ) where @@ -131,33 +131,33 @@ -- -- /See:/ 'changeMessageVisibilityBatchResponse' smart constructor. data ChangeMessageVisibilityBatchResponse = ChangeMessageVisibilityBatchResponse' - { _cmvbrsStatus :: !Int - , _cmvbrsSuccessful :: ![ChangeMessageVisibilityBatchResultEntry] - , _cmvbrsFailed :: ![BatchResultErrorEntry] + { _cmvbrsResponseStatus :: !Int + , _cmvbrsSuccessful :: ![ChangeMessageVisibilityBatchResultEntry] + , _cmvbrsFailed :: ![BatchResultErrorEntry] } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ChangeMessageVisibilityBatchResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'cmvbrsStatus' +-- * 'cmvbrsResponseStatus' -- -- * 'cmvbrsSuccessful' -- -- * 'cmvbrsFailed' changeMessageVisibilityBatchResponse - :: Int -- ^ 'cmvbrsStatus' + :: Int -- ^ 'cmvbrsResponseStatus' -> ChangeMessageVisibilityBatchResponse -changeMessageVisibilityBatchResponse pStatus_ = +changeMessageVisibilityBatchResponse pResponseStatus_ = ChangeMessageVisibilityBatchResponse' - { _cmvbrsStatus = pStatus_ + { _cmvbrsResponseStatus = pResponseStatus_ , _cmvbrsSuccessful = mempty , _cmvbrsFailed = mempty } -- | The response status code. -cmvbrsStatus :: Lens' ChangeMessageVisibilityBatchResponse Int -cmvbrsStatus = lens _cmvbrsStatus (\ s a -> s{_cmvbrsStatus = a}); +cmvbrsResponseStatus :: Lens' ChangeMessageVisibilityBatchResponse Int +cmvbrsResponseStatus = lens _cmvbrsResponseStatus (\ s a -> s{_cmvbrsResponseStatus = a}); -- | A list of ChangeMessageVisibilityBatchResultEntry items. cmvbrsSuccessful :: Lens' ChangeMessageVisibilityBatchResponse [ChangeMessageVisibilityBatchResultEntry] diff --git a/gen/Network/AWS/SQS/CreateQueue.hs b/gen/Network/AWS/SQS/CreateQueue.hs --- a/gen/Network/AWS/SQS/CreateQueue.hs +++ b/gen/Network/AWS/SQS/CreateQueue.hs @@ -63,7 +63,7 @@ , CreateQueueResponse -- * Response Lenses , cqrsQueueURL - , cqrsStatus + , cqrsResponseStatus ) where import Network.AWS.Prelude @@ -158,8 +158,8 @@ -- -- /See:/ 'createQueueResponse' smart constructor. data CreateQueueResponse = CreateQueueResponse' - { _cqrsQueueURL :: !(Maybe Text) - , _cqrsStatus :: !Int + { _cqrsQueueURL :: !(Maybe Text) + , _cqrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'CreateQueueResponse' with the minimum fields required to make a request. @@ -168,14 +168,14 @@ -- -- * 'cqrsQueueURL' -- --- * 'cqrsStatus' +-- * 'cqrsResponseStatus' createQueueResponse - :: Int -- ^ 'cqrsStatus' + :: Int -- ^ 'cqrsResponseStatus' -> CreateQueueResponse -createQueueResponse pStatus_ = +createQueueResponse pResponseStatus_ = CreateQueueResponse' { _cqrsQueueURL = Nothing - , _cqrsStatus = pStatus_ + , _cqrsResponseStatus = pResponseStatus_ } -- | The URL for the created Amazon SQS queue. @@ -183,5 +183,5 @@ cqrsQueueURL = lens _cqrsQueueURL (\ s a -> s{_cqrsQueueURL = a}); -- | The response status code. -cqrsStatus :: Lens' CreateQueueResponse Int -cqrsStatus = lens _cqrsStatus (\ s a -> s{_cqrsStatus = a}); +cqrsResponseStatus :: Lens' CreateQueueResponse Int +cqrsResponseStatus = lens _cqrsResponseStatus (\ s a -> s{_cqrsResponseStatus = a}); diff --git a/gen/Network/AWS/SQS/DeleteMessageBatch.hs b/gen/Network/AWS/SQS/DeleteMessageBatch.hs --- a/gen/Network/AWS/SQS/DeleteMessageBatch.hs +++ b/gen/Network/AWS/SQS/DeleteMessageBatch.hs @@ -48,7 +48,7 @@ , deleteMessageBatchResponse , DeleteMessageBatchResponse -- * Response Lenses - , dmbrsStatus + , dmbrsResponseStatus , dmbrsSuccessful , dmbrsFailed ) where @@ -122,33 +122,33 @@ -- -- /See:/ 'deleteMessageBatchResponse' smart constructor. data DeleteMessageBatchResponse = DeleteMessageBatchResponse' - { _dmbrsStatus :: !Int - , _dmbrsSuccessful :: ![DeleteMessageBatchResultEntry] - , _dmbrsFailed :: ![BatchResultErrorEntry] + { _dmbrsResponseStatus :: !Int + , _dmbrsSuccessful :: ![DeleteMessageBatchResultEntry] + , _dmbrsFailed :: ![BatchResultErrorEntry] } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'DeleteMessageBatchResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'dmbrsStatus' +-- * 'dmbrsResponseStatus' -- -- * 'dmbrsSuccessful' -- -- * 'dmbrsFailed' deleteMessageBatchResponse - :: Int -- ^ 'dmbrsStatus' + :: Int -- ^ 'dmbrsResponseStatus' -> DeleteMessageBatchResponse -deleteMessageBatchResponse pStatus_ = +deleteMessageBatchResponse pResponseStatus_ = DeleteMessageBatchResponse' - { _dmbrsStatus = pStatus_ + { _dmbrsResponseStatus = pResponseStatus_ , _dmbrsSuccessful = mempty , _dmbrsFailed = mempty } -- | The response status code. -dmbrsStatus :: Lens' DeleteMessageBatchResponse Int -dmbrsStatus = lens _dmbrsStatus (\ s a -> s{_dmbrsStatus = a}); +dmbrsResponseStatus :: Lens' DeleteMessageBatchResponse Int +dmbrsResponseStatus = lens _dmbrsResponseStatus (\ s a -> s{_dmbrsResponseStatus = a}); -- | A list of DeleteMessageBatchResultEntry items. dmbrsSuccessful :: Lens' DeleteMessageBatchResponse [DeleteMessageBatchResultEntry] diff --git a/gen/Network/AWS/SQS/GetQueueAttributes.hs b/gen/Network/AWS/SQS/GetQueueAttributes.hs --- a/gen/Network/AWS/SQS/GetQueueAttributes.hs +++ b/gen/Network/AWS/SQS/GetQueueAttributes.hs @@ -83,7 +83,7 @@ , GetQueueAttributesResponse -- * Response Lenses , gqarsAttributes - , gqarsStatus + , gqarsResponseStatus ) where import Network.AWS.Prelude @@ -152,8 +152,8 @@ -- -- /See:/ 'getQueueAttributesResponse' smart constructor. data GetQueueAttributesResponse = GetQueueAttributesResponse' - { _gqarsAttributes :: !(Maybe (Map QueueAttributeName Text)) - , _gqarsStatus :: !Int + { _gqarsAttributes :: !(Maybe (Map QueueAttributeName Text)) + , _gqarsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetQueueAttributesResponse' with the minimum fields required to make a request. @@ -162,14 +162,14 @@ -- -- * 'gqarsAttributes' -- --- * 'gqarsStatus' +-- * 'gqarsResponseStatus' getQueueAttributesResponse - :: Int -- ^ 'gqarsStatus' + :: Int -- ^ 'gqarsResponseStatus' -> GetQueueAttributesResponse -getQueueAttributesResponse pStatus_ = +getQueueAttributesResponse pResponseStatus_ = GetQueueAttributesResponse' { _gqarsAttributes = Nothing - , _gqarsStatus = pStatus_ + , _gqarsResponseStatus = pResponseStatus_ } -- | A map of attributes to the respective values. @@ -177,5 +177,5 @@ gqarsAttributes = lens _gqarsAttributes (\ s a -> s{_gqarsAttributes = a}) . _Default . _Map; -- | The response status code. -gqarsStatus :: Lens' GetQueueAttributesResponse Int -gqarsStatus = lens _gqarsStatus (\ s a -> s{_gqarsStatus = a}); +gqarsResponseStatus :: Lens' GetQueueAttributesResponse Int +gqarsResponseStatus = lens _gqarsResponseStatus (\ s a -> s{_gqarsResponseStatus = a}); diff --git a/gen/Network/AWS/SQS/GetQueueURL.hs b/gen/Network/AWS/SQS/GetQueueURL.hs --- a/gen/Network/AWS/SQS/GetQueueURL.hs +++ b/gen/Network/AWS/SQS/GetQueueURL.hs @@ -43,7 +43,7 @@ , getQueueURLResponse , GetQueueURLResponse -- * Response Lenses - , gqursStatus + , gqursResponseStatus , gqursQueueURL ) where @@ -114,30 +114,30 @@ -- -- /See:/ 'getQueueURLResponse' smart constructor. data GetQueueURLResponse = GetQueueURLResponse' - { _gqursStatus :: !Int - , _gqursQueueURL :: !Text + { _gqursResponseStatus :: !Int + , _gqursQueueURL :: !Text } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetQueueURLResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'gqursStatus' +-- * 'gqursResponseStatus' -- -- * 'gqursQueueURL' getQueueURLResponse - :: Int -- ^ 'gqursStatus' + :: Int -- ^ 'gqursResponseStatus' -> Text -- ^ 'gqursQueueURL' -> GetQueueURLResponse -getQueueURLResponse pStatus_ pQueueURL_ = +getQueueURLResponse pResponseStatus_ pQueueURL_ = GetQueueURLResponse' - { _gqursStatus = pStatus_ + { _gqursResponseStatus = pResponseStatus_ , _gqursQueueURL = pQueueURL_ } -- | The response status code. -gqursStatus :: Lens' GetQueueURLResponse Int -gqursStatus = lens _gqursStatus (\ s a -> s{_gqursStatus = a}); +gqursResponseStatus :: Lens' GetQueueURLResponse Int +gqursResponseStatus = lens _gqursResponseStatus (\ s a -> s{_gqursResponseStatus = a}); -- | The URL for the queue. gqursQueueURL :: Lens' GetQueueURLResponse Text diff --git a/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs b/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs --- a/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs +++ b/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs @@ -37,7 +37,7 @@ , listDeadLetterSourceQueuesResponse , ListDeadLetterSourceQueuesResponse -- * Response Lenses - , ldlsqrsStatus + , ldlsqrsResponseStatus , ldlsqrsQueueURLs ) where @@ -98,29 +98,29 @@ -- -- /See:/ 'listDeadLetterSourceQueuesResponse' smart constructor. data ListDeadLetterSourceQueuesResponse = ListDeadLetterSourceQueuesResponse' - { _ldlsqrsStatus :: !Int - , _ldlsqrsQueueURLs :: ![Text] + { _ldlsqrsResponseStatus :: !Int + , _ldlsqrsQueueURLs :: ![Text] } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListDeadLetterSourceQueuesResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'ldlsqrsStatus' +-- * 'ldlsqrsResponseStatus' -- -- * 'ldlsqrsQueueURLs' listDeadLetterSourceQueuesResponse - :: Int -- ^ 'ldlsqrsStatus' + :: Int -- ^ 'ldlsqrsResponseStatus' -> ListDeadLetterSourceQueuesResponse -listDeadLetterSourceQueuesResponse pStatus_ = +listDeadLetterSourceQueuesResponse pResponseStatus_ = ListDeadLetterSourceQueuesResponse' - { _ldlsqrsStatus = pStatus_ + { _ldlsqrsResponseStatus = pResponseStatus_ , _ldlsqrsQueueURLs = mempty } -- | The response status code. -ldlsqrsStatus :: Lens' ListDeadLetterSourceQueuesResponse Int -ldlsqrsStatus = lens _ldlsqrsStatus (\ s a -> s{_ldlsqrsStatus = a}); +ldlsqrsResponseStatus :: Lens' ListDeadLetterSourceQueuesResponse Int +ldlsqrsResponseStatus = lens _ldlsqrsResponseStatus (\ s a -> s{_ldlsqrsResponseStatus = a}); -- | A list of source queue URLs that have the RedrivePolicy queue attribute -- configured with a dead letter queue. diff --git a/gen/Network/AWS/SQS/ListQueues.hs b/gen/Network/AWS/SQS/ListQueues.hs --- a/gen/Network/AWS/SQS/ListQueues.hs +++ b/gen/Network/AWS/SQS/ListQueues.hs @@ -37,7 +37,7 @@ , ListQueuesResponse -- * Response Lenses , lqrsQueueURLs - , lqrsStatus + , lqrsResponseStatus ) where import Network.AWS.Prelude @@ -95,8 +95,8 @@ -- -- /See:/ 'listQueuesResponse' smart constructor. data ListQueuesResponse = ListQueuesResponse' - { _lqrsQueueURLs :: !(Maybe [Text]) - , _lqrsStatus :: !Int + { _lqrsQueueURLs :: !(Maybe [Text]) + , _lqrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListQueuesResponse' with the minimum fields required to make a request. @@ -105,14 +105,14 @@ -- -- * 'lqrsQueueURLs' -- --- * 'lqrsStatus' +-- * 'lqrsResponseStatus' listQueuesResponse - :: Int -- ^ 'lqrsStatus' + :: Int -- ^ 'lqrsResponseStatus' -> ListQueuesResponse -listQueuesResponse pStatus_ = +listQueuesResponse pResponseStatus_ = ListQueuesResponse' { _lqrsQueueURLs = Nothing - , _lqrsStatus = pStatus_ + , _lqrsResponseStatus = pResponseStatus_ } -- | A list of queue URLs, up to 1000 entries. @@ -120,5 +120,5 @@ lqrsQueueURLs = lens _lqrsQueueURLs (\ s a -> s{_lqrsQueueURLs = a}) . _Default . _Coerce; -- | The response status code. -lqrsStatus :: Lens' ListQueuesResponse Int -lqrsStatus = lens _lqrsStatus (\ s a -> s{_lqrsStatus = a}); +lqrsResponseStatus :: Lens' ListQueuesResponse Int +lqrsResponseStatus = lens _lqrsResponseStatus (\ s a -> s{_lqrsResponseStatus = a}); diff --git a/gen/Network/AWS/SQS/ReceiveMessage.hs b/gen/Network/AWS/SQS/ReceiveMessage.hs --- a/gen/Network/AWS/SQS/ReceiveMessage.hs +++ b/gen/Network/AWS/SQS/ReceiveMessage.hs @@ -83,7 +83,7 @@ , ReceiveMessageResponse -- * Response Lenses , rmrsMessages - , rmrsStatus + , rmrsResponseStatus ) where import Network.AWS.Prelude @@ -223,8 +223,8 @@ -- -- /See:/ 'receiveMessageResponse' smart constructor. data ReceiveMessageResponse = ReceiveMessageResponse' - { _rmrsMessages :: !(Maybe [Message]) - , _rmrsStatus :: !Int + { _rmrsMessages :: !(Maybe [Message]) + , _rmrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ReceiveMessageResponse' with the minimum fields required to make a request. @@ -233,14 +233,14 @@ -- -- * 'rmrsMessages' -- --- * 'rmrsStatus' +-- * 'rmrsResponseStatus' receiveMessageResponse - :: Int -- ^ 'rmrsStatus' + :: Int -- ^ 'rmrsResponseStatus' -> ReceiveMessageResponse -receiveMessageResponse pStatus_ = +receiveMessageResponse pResponseStatus_ = ReceiveMessageResponse' { _rmrsMessages = Nothing - , _rmrsStatus = pStatus_ + , _rmrsResponseStatus = pResponseStatus_ } -- | A list of messages. @@ -248,5 +248,5 @@ rmrsMessages = lens _rmrsMessages (\ s a -> s{_rmrsMessages = a}) . _Default . _Coerce; -- | The response status code. -rmrsStatus :: Lens' ReceiveMessageResponse Int -rmrsStatus = lens _rmrsStatus (\ s a -> s{_rmrsStatus = a}); +rmrsResponseStatus :: Lens' ReceiveMessageResponse Int +rmrsResponseStatus = lens _rmrsResponseStatus (\ s a -> s{_rmrsResponseStatus = a}); diff --git a/gen/Network/AWS/SQS/SendMessage.hs b/gen/Network/AWS/SQS/SendMessage.hs --- a/gen/Network/AWS/SQS/SendMessage.hs +++ b/gen/Network/AWS/SQS/SendMessage.hs @@ -51,7 +51,7 @@ , smrsMessageId , smrsMD5OfMessageBody , smrsMD5OfMessageAttributes - , smrsStatus + , smrsResponseStatus ) where import Network.AWS.Prelude @@ -149,7 +149,7 @@ { _smrsMessageId :: !(Maybe Text) , _smrsMD5OfMessageBody :: !(Maybe Text) , _smrsMD5OfMessageAttributes :: !(Maybe Text) - , _smrsStatus :: !Int + , _smrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'SendMessageResponse' with the minimum fields required to make a request. @@ -162,16 +162,16 @@ -- -- * 'smrsMD5OfMessageAttributes' -- --- * 'smrsStatus' +-- * 'smrsResponseStatus' sendMessageResponse - :: Int -- ^ 'smrsStatus' + :: Int -- ^ 'smrsResponseStatus' -> SendMessageResponse -sendMessageResponse pStatus_ = +sendMessageResponse pResponseStatus_ = SendMessageResponse' { _smrsMessageId = Nothing , _smrsMD5OfMessageBody = Nothing , _smrsMD5OfMessageAttributes = Nothing - , _smrsStatus = pStatus_ + , _smrsResponseStatus = pResponseStatus_ } -- | An element containing the message ID of the message sent to the queue. @@ -196,5 +196,5 @@ smrsMD5OfMessageAttributes = lens _smrsMD5OfMessageAttributes (\ s a -> s{_smrsMD5OfMessageAttributes = a}); -- | The response status code. -smrsStatus :: Lens' SendMessageResponse Int -smrsStatus = lens _smrsStatus (\ s a -> s{_smrsStatus = a}); +smrsResponseStatus :: Lens' SendMessageResponse Int +smrsResponseStatus = lens _smrsResponseStatus (\ s a -> s{_smrsResponseStatus = a}); diff --git a/gen/Network/AWS/SQS/SendMessageBatch.hs b/gen/Network/AWS/SQS/SendMessageBatch.hs --- a/gen/Network/AWS/SQS/SendMessageBatch.hs +++ b/gen/Network/AWS/SQS/SendMessageBatch.hs @@ -64,7 +64,7 @@ , sendMessageBatchResponse , SendMessageBatchResponse -- * Response Lenses - , smbrsStatus + , smbrsResponseStatus , smbrsSuccessful , smbrsFailed ) where @@ -137,33 +137,33 @@ -- -- /See:/ 'sendMessageBatchResponse' smart constructor. data SendMessageBatchResponse = SendMessageBatchResponse' - { _smbrsStatus :: !Int - , _smbrsSuccessful :: ![SendMessageBatchResultEntry] - , _smbrsFailed :: ![BatchResultErrorEntry] + { _smbrsResponseStatus :: !Int + , _smbrsSuccessful :: ![SendMessageBatchResultEntry] + , _smbrsFailed :: ![BatchResultErrorEntry] } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'SendMessageBatchResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'smbrsStatus' +-- * 'smbrsResponseStatus' -- -- * 'smbrsSuccessful' -- -- * 'smbrsFailed' sendMessageBatchResponse - :: Int -- ^ 'smbrsStatus' + :: Int -- ^ 'smbrsResponseStatus' -> SendMessageBatchResponse -sendMessageBatchResponse pStatus_ = +sendMessageBatchResponse pResponseStatus_ = SendMessageBatchResponse' - { _smbrsStatus = pStatus_ + { _smbrsResponseStatus = pResponseStatus_ , _smbrsSuccessful = mempty , _smbrsFailed = mempty } -- | The response status code. -smbrsStatus :: Lens' SendMessageBatchResponse Int -smbrsStatus = lens _smbrsStatus (\ s a -> s{_smbrsStatus = a}); +smbrsResponseStatus :: Lens' SendMessageBatchResponse Int +smbrsResponseStatus = lens _smbrsResponseStatus (\ s a -> s{_smbrsResponseStatus = a}); -- | A list of SendMessageBatchResultEntry items. smbrsSuccessful :: Lens' SendMessageBatchResponse [SendMessageBatchResultEntry] diff --git a/gen/Network/AWS/SQS/Types.hs b/gen/Network/AWS/SQS/Types.hs --- a/gen/Network/AWS/SQS/Types.hs +++ b/gen/Network/AWS/SQS/Types.hs @@ -18,20 +18,20 @@ -- * Errors , _InvalidBatchEntryId , _TooManyEntriesInBatchRequest - , _InvalidAttributeName , _QueueDeletedRecently , _QueueDoesNotExist + , _InvalidAttributeName , _UnsupportedOperation , _InvalidMessageContents , _BatchRequestTooLong , _OverLimit - , _PurgeQueueInProgress , _QueueNameExists + , _PurgeQueueInProgress , _InvalidIdFormat , _ReceiptHandleIsInvalid , _EmptyBatchRequest - , _MessageNotInflight , _BatchEntryIdsNotDistinct + , _MessageNotInflight -- * MessageAttribute , MessageAttribute (..) @@ -77,8 +77,8 @@ , mMD5OfBody , mBody , mAttributes - , mMessageId , mReceiptHandle + , mMessageId , mMD5OfMessageAttributes -- * MessageAttributeValue @@ -159,10 +159,6 @@ hasStatus 400 . hasCode "AWS.SimpleQueueService.TooManyEntriesInBatchRequest" --- | The attribute referred to does not exist. -_InvalidAttributeName :: AsError a => Getting (First ServiceError) a ServiceError -_InvalidAttributeName = _ServiceError . hasCode "InvalidAttributeName" - -- | You must wait 60 seconds after deleting a queue before you can create -- another with the same name. _QueueDeletedRecently :: AsError a => Getting (First ServiceError) a ServiceError @@ -176,6 +172,10 @@ _ServiceError . hasStatus 400 . hasCode "AWS.SimpleQueueService.NonExistentQueue" +-- | The attribute referred to does not exist. +_InvalidAttributeName :: AsError a => Getting (First ServiceError) a ServiceError +_InvalidAttributeName = _ServiceError . hasCode "InvalidAttributeName" + -- | Error code 400. Unsupported operation. _UnsupportedOperation :: AsError a => Getting (First ServiceError) a ServiceError _UnsupportedOperation = @@ -200,6 +200,12 @@ _OverLimit :: AsError a => Getting (First ServiceError) a ServiceError _OverLimit = _ServiceError . hasStatus 403 . hasCode "OverLimit" +-- | A queue already exists with this name. Amazon SQS returns this error +-- only if the request includes attributes whose values differ from those +-- of the existing queue. +_QueueNameExists :: AsError a => Getting (First ServiceError) a ServiceError +_QueueNameExists = _ServiceError . hasStatus 400 . hasCode "QueueAlreadyExists" + -- | Indicates that the specified queue previously received a 'PurgeQueue' -- request within the last 60 seconds, the time it can take to delete the -- messages in the queue. @@ -208,12 +214,6 @@ _ServiceError . hasStatus 403 . hasCode "AWS.SimpleQueueService.PurgeQueueInProgress" --- | A queue already exists with this name. Amazon SQS returns this error --- only if the request includes attributes whose values differ from those --- of the existing queue. -_QueueNameExists :: AsError a => Getting (First ServiceError) a ServiceError -_QueueNameExists = _ServiceError . hasStatus 400 . hasCode "QueueAlreadyExists" - -- | The receipt handle is not valid for the current version. _InvalidIdFormat :: AsError a => Getting (First ServiceError) a ServiceError _InvalidIdFormat = _ServiceError . hasCode "InvalidIdFormat" @@ -228,14 +228,14 @@ _ServiceError . hasStatus 400 . hasCode "AWS.SimpleQueueService.EmptyBatchRequest" --- | The message referred to is not in flight. -_MessageNotInflight :: AsError a => Getting (First ServiceError) a ServiceError -_MessageNotInflight = - _ServiceError . - hasStatus 400 . hasCode "AWS.SimpleQueueService.MessageNotInflight" - -- | Two or more batch entries have the same 'Id' in the request. _BatchEntryIdsNotDistinct :: AsError a => Getting (First ServiceError) a ServiceError _BatchEntryIdsNotDistinct = _ServiceError . hasStatus 400 . hasCode "AWS.SimpleQueueService.BatchEntryIdsNotDistinct" + +-- | The message referred to is not in flight. +_MessageNotInflight :: AsError a => Getting (First ServiceError) a ServiceError +_MessageNotInflight = + _ServiceError . + hasStatus 400 . hasCode "AWS.SimpleQueueService.MessageNotInflight" diff --git a/gen/Network/AWS/SQS/Types/Product.hs b/gen/Network/AWS/SQS/Types/Product.hs --- a/gen/Network/AWS/SQS/Types/Product.hs +++ b/gen/Network/AWS/SQS/Types/Product.hs @@ -247,9 +247,9 @@ { _mMessageAttributes :: !(Maybe (Map Text MessageAttributeValue)) , _mMD5OfBody :: !(Maybe Text) , _mBody :: !(Maybe Text) - , _mAttributes :: !(Maybe (Map QueueAttributeName Text)) - , _mMessageId :: !(Maybe Text) + , _mAttributes :: !(Maybe (Map MessageAttribute Text)) , _mReceiptHandle :: !(Maybe Text) + , _mMessageId :: !(Maybe Text) , _mMD5OfMessageAttributes :: !(Maybe Text) } deriving (Eq,Read,Show,Data,Typeable,Generic) @@ -265,10 +265,10 @@ -- -- * 'mAttributes' -- --- * 'mMessageId' --- -- * 'mReceiptHandle' -- +-- * 'mMessageId' +-- -- * 'mMD5OfMessageAttributes' message :: Message @@ -278,8 +278,8 @@ , _mMD5OfBody = Nothing , _mBody = Nothing , _mAttributes = Nothing - , _mMessageId = Nothing , _mReceiptHandle = Nothing + , _mMessageId = Nothing , _mMD5OfMessageAttributes = Nothing } @@ -302,14 +302,9 @@ -- 'ApproximateFirstReceiveTimestamp' are each returned as an integer -- representing the in -- milliseconds. -mAttributes :: Lens' Message (HashMap QueueAttributeName Text) +mAttributes :: Lens' Message (HashMap MessageAttribute Text) mAttributes = lens _mAttributes (\ s a -> s{_mAttributes = a}) . _Default . _Map; --- | A unique identifier for the message. Message IDs are considered unique --- across all AWS accounts for an extended period of time. -mMessageId :: Lens' Message (Maybe Text) -mMessageId = lens _mMessageId (\ s a -> s{_mMessageId = a}); - -- | An identifier associated with the act of receiving the message. A new -- receipt handle is returned every time you receive a message. When -- deleting a message, you provide the last received receipt handle to @@ -317,6 +312,11 @@ mReceiptHandle :: Lens' Message (Maybe Text) mReceiptHandle = lens _mReceiptHandle (\ s a -> s{_mReceiptHandle = a}); +-- | A unique identifier for the message. Message IDs are considered unique +-- across all AWS accounts for an extended period of time. +mMessageId :: Lens' Message (Maybe Text) +mMessageId = lens _mMessageId (\ s a -> s{_mMessageId = a}); + -- | An MD5 digest of the non-URL-encoded message attribute string. This can -- be used to verify that Amazon SQS received the message correctly. Amazon -- SQS first URL decodes the message before creating the MD5 digest. For @@ -332,8 +332,8 @@ <*> (x .@? "MD5OfBody") <*> (x .@? "Body") <*> (may (parseXMLMap "Attribute" "Name" "Value") x) - <*> (x .@? "MessageId") <*> (x .@? "ReceiptHandle") + <*> (x .@? "MessageId") <*> (x .@? "MD5OfMessageAttributes") -- | The user-specified message attribute value. For string data types, the diff --git a/gen/Network/AWS/SQS/Types/Sum.hs b/gen/Network/AWS/SQS/Types/Sum.hs --- a/gen/Network/AWS/SQS/Types/Sum.hs +++ b/gen/Network/AWS/SQS/Types/Sum.hs @@ -50,6 +50,9 @@ instance ToQuery MessageAttribute instance ToHeader MessageAttribute +instance FromXML MessageAttribute where + parseXML = parseXMLText "MessageAttribute" + data QueueAttributeName = ApproximateNumberOfMessages | ApproximateNumberOfMessagesDelayed diff --git a/test/Test/AWS/Gen/SQS.hs b/test/Test/AWS/Gen/SQS.hs --- a/test/Test/AWS/Gen/SQS.hs +++ b/test/Test/AWS/Gen/SQS.hs @@ -34,12 +34,12 @@ -- , testPurgeQueue $ -- purgeQueue -- --- , testSendMessage $ --- sendMessage --- -- , testChangeMessageVisibilityBatch $ -- changeMessageVisibilityBatch -- +-- , testSendMessage $ +-- sendMessage +-- -- , testRemovePermission $ -- removePermission -- @@ -73,12 +73,12 @@ -- , testCreateQueue $ -- createQueue -- --- , testChangeMessageVisibility $ --- changeMessageVisibility --- -- , testSendMessageBatch $ -- sendMessageBatch -- +-- , testChangeMessageVisibility $ +-- changeMessageVisibility +-- -- ] -- , testGroup "response" @@ -88,12 +88,12 @@ -- , testPurgeQueueResponse $ -- purgeQueueResponse -- --- , testSendMessageResponse $ --- sendMessageResponse --- -- , testChangeMessageVisibilityBatchResponse $ -- changeMessageVisibilityBatchResponse -- +-- , testSendMessageResponse $ +-- sendMessageResponse +-- -- , testRemovePermissionResponse $ -- removePermissionResponse -- @@ -127,12 +127,12 @@ -- , testCreateQueueResponse $ -- createQueueResponse -- --- , testChangeMessageVisibilityResponse $ --- changeMessageVisibilityResponse --- -- , testSendMessageBatchResponse $ -- sendMessageBatchResponse -- +-- , testChangeMessageVisibilityResponse $ +-- changeMessageVisibilityResponse +-- -- ] -- ] @@ -148,16 +148,16 @@ "PurgeQueue" "fixture/PurgeQueue.yaml" -testSendMessage :: SendMessage -> TestTree -testSendMessage = req - "SendMessage" - "fixture/SendMessage.yaml" - testChangeMessageVisibilityBatch :: ChangeMessageVisibilityBatch -> TestTree testChangeMessageVisibilityBatch = req "ChangeMessageVisibilityBatch" "fixture/ChangeMessageVisibilityBatch.yaml" +testSendMessage :: SendMessage -> TestTree +testSendMessage = req + "SendMessage" + "fixture/SendMessage.yaml" + testRemovePermission :: RemovePermission -> TestTree testRemovePermission = req "RemovePermission" @@ -213,16 +213,16 @@ "CreateQueue" "fixture/CreateQueue.yaml" -testChangeMessageVisibility :: ChangeMessageVisibility -> TestTree -testChangeMessageVisibility = req - "ChangeMessageVisibility" - "fixture/ChangeMessageVisibility.yaml" - testSendMessageBatch :: SendMessageBatch -> TestTree testSendMessageBatch = req "SendMessageBatch" "fixture/SendMessageBatch.yaml" +testChangeMessageVisibility :: ChangeMessageVisibility -> TestTree +testChangeMessageVisibility = req + "ChangeMessageVisibility" + "fixture/ChangeMessageVisibility.yaml" + -- Responses testGetQueueURLResponse :: GetQueueURLResponse -> TestTree @@ -239,13 +239,6 @@ sQS (Proxy :: Proxy PurgeQueue) -testSendMessageResponse :: SendMessageResponse -> TestTree -testSendMessageResponse = res - "SendMessageResponse" - "fixture/SendMessageResponse.proto" - sQS - (Proxy :: Proxy SendMessage) - testChangeMessageVisibilityBatchResponse :: ChangeMessageVisibilityBatchResponse -> TestTree testChangeMessageVisibilityBatchResponse = res "ChangeMessageVisibilityBatchResponse" @@ -253,6 +246,13 @@ sQS (Proxy :: Proxy ChangeMessageVisibilityBatch) +testSendMessageResponse :: SendMessageResponse -> TestTree +testSendMessageResponse = res + "SendMessageResponse" + "fixture/SendMessageResponse.proto" + sQS + (Proxy :: Proxy SendMessage) + testRemovePermissionResponse :: RemovePermissionResponse -> TestTree testRemovePermissionResponse = res "RemovePermissionResponse" @@ -330,16 +330,16 @@ sQS (Proxy :: Proxy CreateQueue) -testChangeMessageVisibilityResponse :: ChangeMessageVisibilityResponse -> TestTree -testChangeMessageVisibilityResponse = res - "ChangeMessageVisibilityResponse" - "fixture/ChangeMessageVisibilityResponse.proto" - sQS - (Proxy :: Proxy ChangeMessageVisibility) - testSendMessageBatchResponse :: SendMessageBatchResponse -> TestTree testSendMessageBatchResponse = res "SendMessageBatchResponse" "fixture/SendMessageBatchResponse.proto" sQS (Proxy :: Proxy SendMessageBatch) + +testChangeMessageVisibilityResponse :: ChangeMessageVisibilityResponse -> TestTree +testChangeMessageVisibilityResponse = res + "ChangeMessageVisibilityResponse" + "fixture/ChangeMessageVisibilityResponse.proto" + sQS + (Proxy :: Proxy ChangeMessageVisibility) diff --git a/test/Test/AWS/SQS.hs b/test/Test/AWS/SQS.hs --- a/test/Test/AWS/SQS.hs +++ b/test/Test/AWS/SQS.hs @@ -15,6 +15,7 @@ import Control.Lens import qualified Data.HashMap.Strict as Map +import Data.Monoid import Data.Text (Text) import Network.AWS.SQS import Test.AWS.Gen.SQS @@ -60,19 +61,21 @@ & smrsMD5OfMessageBody ?~ "fafb00f5732ab283681e124bf8747ed1" & smrsMD5OfMessageAttributes ?~ "3ae8f24a165a8cedc005670c81a27295" - -- FIXME: waiting on response to https://github.com/boto/botocore/issues/602 - -- , testReceiveMessageResponse $ - -- receiveMessageResponse 200 & rmrMessages .~ message - -- & mesMessageId ?~ "5fea7756-0ea4-451a-a703-a558b933e274" - -- & mesReceiptHandle ?~ "MbZj6wDWli+JvwwJaBV+3dcjk2YW2vA3+STFFljTM8tJJg6HRG6PYSasuWXPJB+CwLj1FjgXUv1uSj1gUPAWV66FU/WeR4mq2OKpEGYWbnLmpRCJVAyeMjeU5ZBdtcQ+QEauMZc8ZRv37sIW2iJKq3M9MFx1YvV11A2x/KSbkJ0=" - -- & mesMD5OfBody ?~ "fafb00f5732ab283681e124bf8747ed1" - -- & mesBody ?~ "This is a test message" - -- & mesAttributes .~ Map.fromList - -- [ (SenderId, 195004372649) - -- , (SentTimestamp, 1238099229000) - -- , (ApproximateReceiveCount, 5) - -- , (ApproximateFirstReceiveTimestamp, 1250700979248) - -- ] + , testReceiveMessageResponse $ + receiveMessageResponse 200 & rmrsMessages .~ + [ message + & mMessageId ?~ "5fea7756-0ea4-451a-a703-a558b933e274" + & mReceiptHandle ?~ "MbZj6wDWli+JvwwJaBV+3dcjk2YW2vA3+STFFljTM8tJJg6HRG6PYSasuWXPJB+CwLj1FjgXUv1uSj1gUPAWV66FU/WeR4mq2OKpEGYWbnLmpRCJVAyeMjeU5ZBdtcQ+QEauMZc8ZRv37sIW2iJKq3M9MFx1YvV11A2x/KSbkJ0=" + & mMD5OfBody ?~ "fafb00f5732ab283681e124bf8747ed1" + & mBody ?~ "This is a test message" + & mMessageAttributes .~ mempty + & mAttributes .~ Map.fromList + [ (SenderId, "195004372649") + , (SentTimestamp, "1238099229000") + , (ApproximateReceiveCount, "5") + , (ApproximateFirstReceiveTimestamp, "1250700979248") + ] + ] ] ]