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-sqs.cabal b/amazonka-sqs.cabal --- a/amazonka-sqs.cabal +++ b/amazonka-sqs.cabal @@ -1,5 +1,5 @@ name: amazonka-sqs -version: 1.1.0 +version: 1.2.0 synopsis: Amazon Simple Queue Service SDK. homepage: https://github.com/brendanhay/amazonka license: OtherLicense @@ -94,7 +94,7 @@ , Network.AWS.SQS.Types.Sum build-depends: - amazonka-core == 1.1.0.* + amazonka-core == 1.2.0.* , base >= 4.7 && < 5 test-suite amazonka-sqs-test @@ -113,9 +113,9 @@ , Test.AWS.SQS.Internal build-depends: - amazonka-core == 1.1.0 - , amazonka-test == 1.1.0 - , amazonka-sqs == 1.1.0 + amazonka-core == 1.2.0 + , amazonka-test == 1.2.0 + , amazonka-sqs == 1.2.0 , base , bytestring , lens 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 @@ -44,8 +44,8 @@ -- /See:/ module Network.AWS.SQS ( - -- * Service - SQS + -- * Service Configuration + sQS -- * Errors -- $errors @@ -156,6 +156,9 @@ , module Network.AWS.SQS.SendMessageBatch -- * Types + + -- ** MessageAttribute + , MessageAttribute (..) -- ** QueueAttributeName , QueueAttributeName (..) diff --git a/gen/Network/AWS/SQS/AddPermission.hs b/gen/Network/AWS/SQS/AddPermission.hs --- a/gen/Network/AWS/SQS/AddPermission.hs +++ b/gen/Network/AWS/SQS/AddPermission.hs @@ -131,9 +131,8 @@ apActions = lens _apActions (\ s a -> s{_apActions = a}) . _Coerce; instance AWSRequest AddPermission where - type Sv AddPermission = SQS type Rs AddPermission = AddPermissionResponse - request = postQuery + request = postQuery sQS response = receiveNull AddPermissionResponse' instance ToHeaders AddPermission where diff --git a/gen/Network/AWS/SQS/ChangeMessageVisibility.hs b/gen/Network/AWS/SQS/ChangeMessageVisibility.hs --- a/gen/Network/AWS/SQS/ChangeMessageVisibility.hs +++ b/gen/Network/AWS/SQS/ChangeMessageVisibility.hs @@ -119,10 +119,9 @@ cmvVisibilityTimeout = lens _cmvVisibilityTimeout (\ s a -> s{_cmvVisibilityTimeout = a}); instance AWSRequest ChangeMessageVisibility where - type Sv ChangeMessageVisibility = SQS type Rs ChangeMessageVisibility = ChangeMessageVisibilityResponse - request = postQuery + request = postQuery sQS response = receiveNull ChangeMessageVisibilityResponse' 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 @@ -94,10 +94,9 @@ instance AWSRequest ChangeMessageVisibilityBatch where - type Sv ChangeMessageVisibilityBatch = SQS type Rs ChangeMessageVisibilityBatch = ChangeMessageVisibilityBatchResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "ChangeMessageVisibilityBatchResult" 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 @@ -130,9 +130,8 @@ cqQueueName = lens _cqQueueName (\ s a -> s{_cqQueueName = a}); instance AWSRequest CreateQueue where - type Sv CreateQueue = SQS type Rs CreateQueue = CreateQueueResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "CreateQueueResult" (\ s h x -> diff --git a/gen/Network/AWS/SQS/DeleteMessage.hs b/gen/Network/AWS/SQS/DeleteMessage.hs --- a/gen/Network/AWS/SQS/DeleteMessage.hs +++ b/gen/Network/AWS/SQS/DeleteMessage.hs @@ -94,9 +94,8 @@ dmReceiptHandle = lens _dmReceiptHandle (\ s a -> s{_dmReceiptHandle = a}); instance AWSRequest DeleteMessage where - type Sv DeleteMessage = SQS type Rs DeleteMessage = DeleteMessageResponse - request = postQuery + request = postQuery sQS response = receiveNull DeleteMessageResponse' instance ToHeaders DeleteMessage where 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 @@ -90,10 +90,9 @@ dmbEntries = lens _dmbEntries (\ s a -> s{_dmbEntries = a}) . _Coerce; instance AWSRequest DeleteMessageBatch where - type Sv DeleteMessageBatch = SQS type Rs DeleteMessageBatch = DeleteMessageBatchResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "DeleteMessageBatchResult" (\ s h x -> diff --git a/gen/Network/AWS/SQS/DeleteQueue.hs b/gen/Network/AWS/SQS/DeleteQueue.hs --- a/gen/Network/AWS/SQS/DeleteQueue.hs +++ b/gen/Network/AWS/SQS/DeleteQueue.hs @@ -80,9 +80,8 @@ dqQueueURL = lens _dqQueueURL (\ s a -> s{_dqQueueURL = a}); instance AWSRequest DeleteQueue where - type Sv DeleteQueue = SQS type Rs DeleteQueue = DeleteQueueResponse - request = postQuery + request = postQuery sQS response = receiveNull DeleteQueueResponse' instance ToHeaders DeleteQueue where 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 @@ -123,10 +123,9 @@ gqaQueueURL = lens _gqaQueueURL (\ s a -> s{_gqaQueueURL = a}); instance AWSRequest GetQueueAttributes where - type Sv GetQueueAttributes = SQS type Rs GetQueueAttributes = GetQueueAttributesResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "GetQueueAttributesResult" (\ s h x -> 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 @@ -85,9 +85,8 @@ gquQueueName = lens _gquQueueName (\ s a -> s{_gquQueueName = a}); instance AWSRequest GetQueueURL where - type Sv GetQueueURL = SQS type Rs GetQueueURL = GetQueueURLResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "GetQueueUrlResult" (\ s h x -> 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 @@ -70,10 +70,9 @@ ldlsqQueueURL = lens _ldlsqQueueURL (\ s a -> s{_ldlsqQueueURL = a}); instance AWSRequest ListDeadLetterSourceQueues where - type Sv ListDeadLetterSourceQueues = SQS type Rs ListDeadLetterSourceQueues = ListDeadLetterSourceQueuesResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "ListDeadLetterSourceQueuesResult" 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 @@ -69,9 +69,8 @@ lqQueueNamePrefix = lens _lqQueueNamePrefix (\ s a -> s{_lqQueueNamePrefix = a}); instance AWSRequest ListQueues where - type Sv ListQueues = SQS type Rs ListQueues = ListQueuesResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "ListQueuesResult" (\ s h x -> diff --git a/gen/Network/AWS/SQS/PurgeQueue.hs b/gen/Network/AWS/SQS/PurgeQueue.hs --- a/gen/Network/AWS/SQS/PurgeQueue.hs +++ b/gen/Network/AWS/SQS/PurgeQueue.hs @@ -74,9 +74,8 @@ pqQueueURL = lens _pqQueueURL (\ s a -> s{_pqQueueURL = a}); instance AWSRequest PurgeQueue where - type Sv PurgeQueue = SQS type Rs PurgeQueue = PurgeQueueResponse - request = postQuery + request = postQuery sQS response = receiveNull PurgeQueueResponse' instance ToHeaders PurgeQueue where 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 @@ -97,7 +97,7 @@ { _rmVisibilityTimeout :: !(Maybe Int) , _rmMessageAttributeNames :: !(Maybe [Text]) , _rmWaitTimeSeconds :: !(Maybe Int) - , _rmAttributeNames :: !(Maybe [QueueAttributeName]) + , _rmAttributeNames :: !(Maybe [MessageAttribute]) , _rmMaxNumberOfMessages :: !(Maybe Int) , _rmQueueURL :: !Text } deriving (Eq,Read,Show,Data,Typeable,Generic) @@ -173,7 +173,7 @@ -- anonymous access is allowed) of the sender. -- - 'SentTimestamp' - returns the time when the message was sent to the -- queue (epoch time in milliseconds). -rmAttributeNames :: Lens' ReceiveMessage [QueueAttributeName] +rmAttributeNames :: Lens' ReceiveMessage [MessageAttribute] rmAttributeNames = lens _rmAttributeNames (\ s a -> s{_rmAttributeNames = a}) . _Default . _Coerce; -- | The maximum number of messages to return. Amazon SQS never returns more @@ -189,9 +189,8 @@ rmQueueURL = lens _rmQueueURL (\ s a -> s{_rmQueueURL = a}); instance AWSRequest ReceiveMessage where - type Sv ReceiveMessage = SQS type Rs ReceiveMessage = ReceiveMessageResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "ReceiveMessageResult" (\ s h x -> diff --git a/gen/Network/AWS/SQS/RemovePermission.hs b/gen/Network/AWS/SQS/RemovePermission.hs --- a/gen/Network/AWS/SQS/RemovePermission.hs +++ b/gen/Network/AWS/SQS/RemovePermission.hs @@ -75,9 +75,8 @@ rpLabel = lens _rpLabel (\ s a -> s{_rpLabel = a}); instance AWSRequest RemovePermission where - type Sv RemovePermission = SQS type Rs RemovePermission = RemovePermissionResponse - request = postQuery + request = postQuery sQS response = receiveNull RemovePermissionResponse' instance ToHeaders RemovePermission where 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 @@ -114,9 +114,8 @@ smMessageBody = lens _smMessageBody (\ s a -> s{_smMessageBody = a}); instance AWSRequest SendMessage where - type Sv SendMessage = SQS type Rs SendMessage = SendMessageResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "SendMessageResult" (\ s h x -> 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 @@ -106,9 +106,8 @@ smbEntries = lens _smbEntries (\ s a -> s{_smbEntries = a}) . _Coerce; instance AWSRequest SendMessageBatch where - type Sv SendMessageBatch = SQS type Rs SendMessageBatch = SendMessageBatchResponse - request = postQuery + request = postQuery sQS response = receiveXMLWrapper "SendMessageBatchResult" (\ s h x -> diff --git a/gen/Network/AWS/SQS/SetQueueAttributes.hs b/gen/Network/AWS/SQS/SetQueueAttributes.hs --- a/gen/Network/AWS/SQS/SetQueueAttributes.hs +++ b/gen/Network/AWS/SQS/SetQueueAttributes.hs @@ -109,10 +109,9 @@ sqaAttributes = lens _sqaAttributes (\ s a -> s{_sqaAttributes = a}) . _Map; instance AWSRequest SetQueueAttributes where - type Sv SetQueueAttributes = SQS type Rs SetQueueAttributes = SetQueueAttributesResponse - request = postQuery + request = postQuery sQS response = receiveNull SetQueueAttributesResponse' instance ToHeaders SetQueueAttributes where 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 @@ -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.SQS.Types ( - -- * Service - SQS + -- * Service Configuration + sQS -- * Errors , _InvalidBatchEntryId @@ -34,6 +33,9 @@ , _MessageNotInflight , _BatchEntryIdsNotDistinct + -- * MessageAttribute + , MessageAttribute (..) + -- * QueueAttributeName , QueueAttributeName (..) @@ -110,41 +112,38 @@ import Network.AWS.SQS.Types.Product import Network.AWS.SQS.Types.Sum --- | Version @2012-11-05@ of the Amazon Simple Queue Service SDK. -data SQS - -instance AWSService SQS where - type Sg SQS = V4 - service = const svc - where - svc = - Service - { _svcAbbrev = "SQS" - , _svcPrefix = "sqs" - , _svcVersion = "2012-11-05" - , _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 "RequestThrottled" . hasStatus 403) e = - Just "request_limit_exceeded" - | 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 '2012-11-05' of the Amazon Simple Queue Service SDK configuration. +sQS :: Service +sQS = + Service + { _svcAbbrev = "SQS" + , _svcSigner = v4 + , _svcPrefix = "sqs" + , _svcVersion = "2012-11-05" + , _svcEndpoint = defaultEndpoint sQS + , _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 "RequestThrottled" . hasStatus 403) e = + Just "request_limit_exceeded" + | 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 -- | The 'Id' of a batch entry in a batch request does not abide by the -- specification. 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 @@ -2,7 +2,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeFamilies #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-} 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 @@ -19,6 +19,37 @@ import Network.AWS.Prelude +data MessageAttribute + = All + | ApproximateFirstReceiveTimestamp + | ApproximateReceiveCount + | SenderId + | SentTimestamp + deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic) + +instance FromText MessageAttribute where + parser = takeLowerText >>= \case + "all" -> pure All + "approximatefirstreceivetimestamp" -> pure ApproximateFirstReceiveTimestamp + "approximatereceivecount" -> pure ApproximateReceiveCount + "senderid" -> pure SenderId + "senttimestamp" -> pure SentTimestamp + e -> fromTextError $ "Failure parsing MessageAttribute from value: '" <> e + <> "'. Accepted values: All, ApproximateFirstReceiveTimestamp, ApproximateReceiveCount, SenderId, SentTimestamp" + +instance ToText MessageAttribute where + toText = \case + All -> "All" + ApproximateFirstReceiveTimestamp -> "ApproximateFirstReceiveTimestamp" + ApproximateReceiveCount -> "ApproximateReceiveCount" + SenderId -> "SenderId" + SentTimestamp -> "SentTimestamp" + +instance Hashable MessageAttribute +instance ToByteString MessageAttribute +instance ToQuery MessageAttribute +instance ToHeader 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 @@ -229,100 +229,117 @@ testGetQueueURLResponse = res "GetQueueURLResponse" "fixture/GetQueueURLResponse" + sQS (Proxy :: Proxy GetQueueURL) testPurgeQueueResponse :: PurgeQueueResponse -> TestTree testPurgeQueueResponse = res "PurgeQueueResponse" "fixture/PurgeQueueResponse" + sQS (Proxy :: Proxy PurgeQueue) testSendMessageResponse :: SendMessageResponse -> TestTree testSendMessageResponse = res "SendMessageResponse" "fixture/SendMessageResponse" + sQS (Proxy :: Proxy SendMessage) testChangeMessageVisibilityBatchResponse :: ChangeMessageVisibilityBatchResponse -> TestTree testChangeMessageVisibilityBatchResponse = res "ChangeMessageVisibilityBatchResponse" "fixture/ChangeMessageVisibilityBatchResponse" + sQS (Proxy :: Proxy ChangeMessageVisibilityBatch) testRemovePermissionResponse :: RemovePermissionResponse -> TestTree testRemovePermissionResponse = res "RemovePermissionResponse" "fixture/RemovePermissionResponse" + sQS (Proxy :: Proxy RemovePermission) testGetQueueAttributesResponse :: GetQueueAttributesResponse -> TestTree testGetQueueAttributesResponse = res "GetQueueAttributesResponse" "fixture/GetQueueAttributesResponse" + sQS (Proxy :: Proxy GetQueueAttributes) testListQueuesResponse :: ListQueuesResponse -> TestTree testListQueuesResponse = res "ListQueuesResponse" "fixture/ListQueuesResponse" + sQS (Proxy :: Proxy ListQueues) testReceiveMessageResponse :: ReceiveMessageResponse -> TestTree testReceiveMessageResponse = res "ReceiveMessageResponse" "fixture/ReceiveMessageResponse" + sQS (Proxy :: Proxy ReceiveMessage) testDeleteQueueResponse :: DeleteQueueResponse -> TestTree testDeleteQueueResponse = res "DeleteQueueResponse" "fixture/DeleteQueueResponse" + sQS (Proxy :: Proxy DeleteQueue) testDeleteMessageBatchResponse :: DeleteMessageBatchResponse -> TestTree testDeleteMessageBatchResponse = res "DeleteMessageBatchResponse" "fixture/DeleteMessageBatchResponse" + sQS (Proxy :: Proxy DeleteMessageBatch) testSetQueueAttributesResponse :: SetQueueAttributesResponse -> TestTree testSetQueueAttributesResponse = res "SetQueueAttributesResponse" "fixture/SetQueueAttributesResponse" + sQS (Proxy :: Proxy SetQueueAttributes) testListDeadLetterSourceQueuesResponse :: ListDeadLetterSourceQueuesResponse -> TestTree testListDeadLetterSourceQueuesResponse = res "ListDeadLetterSourceQueuesResponse" "fixture/ListDeadLetterSourceQueuesResponse" + sQS (Proxy :: Proxy ListDeadLetterSourceQueues) testAddPermissionResponse :: AddPermissionResponse -> TestTree testAddPermissionResponse = res "AddPermissionResponse" "fixture/AddPermissionResponse" + sQS (Proxy :: Proxy AddPermission) testDeleteMessageResponse :: DeleteMessageResponse -> TestTree testDeleteMessageResponse = res "DeleteMessageResponse" "fixture/DeleteMessageResponse" + sQS (Proxy :: Proxy DeleteMessage) testCreateQueueResponse :: CreateQueueResponse -> TestTree testCreateQueueResponse = res "CreateQueueResponse" "fixture/CreateQueueResponse" + sQS (Proxy :: Proxy CreateQueue) testChangeMessageVisibilityResponse :: ChangeMessageVisibilityResponse -> TestTree testChangeMessageVisibilityResponse = res "ChangeMessageVisibilityResponse" "fixture/ChangeMessageVisibilityResponse" + sQS (Proxy :: Proxy ChangeMessageVisibility) testSendMessageBatchResponse :: SendMessageBatchResponse -> TestTree testSendMessageBatchResponse = res "SendMessageBatchResponse" "fixture/SendMessageBatchResponse" + sQS (Proxy :: Proxy SendMessageBatch)