Skip to content

Commit

Permalink
Regenerting S3 and SQS with upstream service definition fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
brendanhay committed Dec 9, 2014
1 parent b3b8aae commit ffc11b1
Show file tree
Hide file tree
Showing 22 changed files with 369 additions and 123 deletions.
5 changes: 1 addition & 4 deletions amazonka-s3/examples/amazonka-s3-examples.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ library

build-depends:
amazonka == 0.0.7.*
, amazonka-core == 0.0.7.1
, amazonka-core == 0.0.7.*
, amazonka-s3 == 0.0.7.*
, base >= 4.7 && < 5
, bytestring >= 0.9
Expand All @@ -31,6 +31,3 @@ library
, text >= 1.1
, time >= 1.4
, transformers == 0.4.*

, http-conduit
, http-client
8 changes: 4 additions & 4 deletions amazonka-s3/gen/Network/AWS/S3/CompleteMultipartUpload.hs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ cmu1UploadId = lens _cmu1UploadId (\s a -> s { _cmu1UploadId = a })
data CompleteMultipartUploadResponse = CompleteMultipartUploadResponse
{ _cmur1Bucket :: Maybe Text
, _cmur1ETag :: Maybe Text
, _cmur1Expiration :: Maybe RFC822
, _cmur1Expiration :: Maybe Text
, _cmur1Key :: Maybe Text
, _cmur1Location :: Maybe Text
, _cmur1SSEKMSKeyId :: Maybe (Sensitive Text)
Expand All @@ -119,7 +119,7 @@ data CompleteMultipartUploadResponse = CompleteMultipartUploadResponse
--
-- * 'cmur1ETag' @::@ 'Maybe' 'Text'
--
-- * 'cmur1Expiration' @::@ 'Maybe' 'UTCTime'
-- * 'cmur1Expiration' @::@ 'Maybe' 'Text'
--
-- * 'cmur1Key' @::@ 'Maybe' 'Text'
--
Expand Down Expand Up @@ -152,8 +152,8 @@ cmur1ETag = lens _cmur1ETag (\s a -> s { _cmur1ETag = a })

-- | If the object expiration is configured, this will contain the expiration date
-- (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.
cmur1Expiration :: Lens' CompleteMultipartUploadResponse (Maybe UTCTime)
cmur1Expiration = lens _cmur1Expiration (\s a -> s { _cmur1Expiration = a }) . mapping _Time
cmur1Expiration :: Lens' CompleteMultipartUploadResponse (Maybe Text)
cmur1Expiration = lens _cmur1Expiration (\s a -> s { _cmur1Expiration = a })

cmur1Key :: Lens' CompleteMultipartUploadResponse (Maybe Text)
cmur1Key = lens _cmur1Key (\s a -> s { _cmur1Key = a })
Expand Down
8 changes: 4 additions & 4 deletions amazonka-s3/gen/Network/AWS/S3/CopyObject.hs
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ coWebsiteRedirectLocation =
data CopyObjectResponse = CopyObjectResponse
{ _corCopyObjectResult :: Maybe CopyObjectResult
, _corCopySourceVersionId :: Maybe Text
, _corExpiration :: Maybe RFC822
, _corExpiration :: Maybe Text
, _corSSECustomerAlgorithm :: Maybe Text
, _corSSECustomerKeyMD5 :: Maybe Text
, _corSSEKMSKeyId :: Maybe (Sensitive Text)
Expand All @@ -401,7 +401,7 @@ data CopyObjectResponse = CopyObjectResponse
--
-- * 'corCopySourceVersionId' @::@ 'Maybe' 'Text'
--
-- * 'corExpiration' @::@ 'Maybe' 'UTCTime'
-- * 'corExpiration' @::@ 'Maybe' 'Text'
--
-- * 'corSSECustomerAlgorithm' @::@ 'Maybe' 'Text'
--
Expand Down Expand Up @@ -431,8 +431,8 @@ corCopySourceVersionId =
lens _corCopySourceVersionId (\s a -> s { _corCopySourceVersionId = a })

-- | If the object expiration is configured, the response includes this header.
corExpiration :: Lens' CopyObjectResponse (Maybe UTCTime)
corExpiration = lens _corExpiration (\s a -> s { _corExpiration = a }) . mapping _Time
corExpiration :: Lens' CopyObjectResponse (Maybe Text)
corExpiration = lens _corExpiration (\s a -> s { _corExpiration = a })

-- | If server-side encryption with a customer-provided encryption key was
-- requested, the response will include this header confirming the encryption
Expand Down
8 changes: 4 additions & 4 deletions amazonka-s3/gen/Network/AWS/S3/GetObject.hs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ data GetObjectResponse = GetObjectResponse
, _gorContentType :: Maybe Text
, _gorDeleteMarker :: Maybe Bool
, _gorETag :: Maybe Text
, _gorExpiration :: Maybe RFC822
, _gorExpiration :: Maybe Text
, _gorExpires :: Maybe RFC822
, _gorLastModified :: Maybe RFC822
, _gorMetadata :: Map (CI Text) Text
Expand Down Expand Up @@ -309,7 +309,7 @@ data GetObjectResponse = GetObjectResponse
--
-- * 'gorETag' @::@ 'Maybe' 'Text'
--
-- * 'gorExpiration' @::@ 'Maybe' 'UTCTime'
-- * 'gorExpiration' @::@ 'Maybe' 'Text'
--
-- * 'gorExpires' @::@ 'Maybe' 'UTCTime'
--
Expand Down Expand Up @@ -410,8 +410,8 @@ gorETag = lens _gorETag (\s a -> s { _gorETag = a })
-- response includes this header. It includes the expiry-date and rule-id key
-- value pairs providing object expiration information. The value of the rule-id
-- is URL encoded.
gorExpiration :: Lens' GetObjectResponse (Maybe UTCTime)
gorExpiration = lens _gorExpiration (\s a -> s { _gorExpiration = a }) . mapping _Time
gorExpiration :: Lens' GetObjectResponse (Maybe Text)
gorExpiration = lens _gorExpiration (\s a -> s { _gorExpiration = a })

-- | The date and time at which the object is no longer cacheable.
gorExpires :: Lens' GetObjectResponse (Maybe UTCTime)
Expand Down
8 changes: 4 additions & 4 deletions amazonka-s3/gen/Network/AWS/S3/HeadObject.hs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ data HeadObjectResponse = HeadObjectResponse
, _horContentType :: Maybe Text
, _horDeleteMarker :: Maybe Bool
, _horETag :: Maybe Text
, _horExpiration :: Maybe RFC822
, _horExpiration :: Maybe Text
, _horExpires :: Maybe RFC822
, _horLastModified :: Maybe RFC822
, _horMetadata :: Map (CI Text) Text
Expand Down Expand Up @@ -243,7 +243,7 @@ data HeadObjectResponse = HeadObjectResponse
--
-- * 'horETag' @::@ 'Maybe' 'Text'
--
-- * 'horExpiration' @::@ 'Maybe' 'UTCTime'
-- * 'horExpiration' @::@ 'Maybe' 'Text'
--
-- * 'horExpires' @::@ 'Maybe' 'UTCTime'
--
Expand Down Expand Up @@ -338,8 +338,8 @@ horETag = lens _horETag (\s a -> s { _horETag = a })
-- response includes this header. It includes the expiry-date and rule-id key
-- value pairs providing object expiration information. The value of the rule-id
-- is URL encoded.
horExpiration :: Lens' HeadObjectResponse (Maybe UTCTime)
horExpiration = lens _horExpiration (\s a -> s { _horExpiration = a }) . mapping _Time
horExpiration :: Lens' HeadObjectResponse (Maybe Text)
horExpiration = lens _horExpiration (\s a -> s { _horExpiration = a })

-- | The date and time at which the object is no longer cacheable.
horExpires :: Lens' HeadObjectResponse (Maybe UTCTime)
Expand Down
8 changes: 4 additions & 4 deletions amazonka-s3/gen/Network/AWS/S3/PutObject.hs
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ poWebsiteRedirectLocation =

data PutObjectResponse = PutObjectResponse
{ _porETag :: Maybe Text
, _porExpiration :: Maybe RFC822
, _porExpiration :: Maybe Text
, _porSSECustomerAlgorithm :: Maybe Text
, _porSSECustomerKeyMD5 :: Maybe Text
, _porSSEKMSKeyId :: Maybe (Sensitive Text)
Expand All @@ -321,7 +321,7 @@ data PutObjectResponse = PutObjectResponse
--
-- * 'porETag' @::@ 'Maybe' 'Text'
--
-- * 'porExpiration' @::@ 'Maybe' 'UTCTime'
-- * 'porExpiration' @::@ 'Maybe' 'Text'
--
-- * 'porSSECustomerAlgorithm' @::@ 'Maybe' 'Text'
--
Expand Down Expand Up @@ -350,8 +350,8 @@ porETag = lens _porETag (\s a -> s { _porETag = a })

-- | If the object expiration is configured, this will contain the expiration date
-- (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.
porExpiration :: Lens' PutObjectResponse (Maybe UTCTime)
porExpiration = lens _porExpiration (\s a -> s { _porExpiration = a }) . mapping _Time
porExpiration :: Lens' PutObjectResponse (Maybe Text)
porExpiration = lens _porExpiration (\s a -> s { _porExpiration = a })

-- | If server-side encryption with a customer-provided encryption key was
-- requested, the response will include this header confirming the encryption
Expand Down
1 change: 1 addition & 0 deletions amazonka-sqs/amazonka-sqs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ library
, Network.AWS.SQS.GetQueueUrl
, Network.AWS.SQS.ListDeadLetterSourceQueues
, Network.AWS.SQS.ListQueues
, Network.AWS.SQS.PurgeQueue
, Network.AWS.SQS.ReceiveMessage
, Network.AWS.SQS.RemovePermission
, Network.AWS.SQS.SendMessage
Expand Down
2 changes: 2 additions & 0 deletions amazonka-sqs/gen/Network/AWS/SQS.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ module Network.AWS.SQS
, module Network.AWS.SQS.GetQueueUrl
, module Network.AWS.SQS.ListDeadLetterSourceQueues
, module Network.AWS.SQS.ListQueues
, module Network.AWS.SQS.PurgeQueue
, module Network.AWS.SQS.ReceiveMessage
, module Network.AWS.SQS.RemovePermission
, module Network.AWS.SQS.SendMessage
Expand All @@ -48,6 +49,7 @@ import Network.AWS.SQS.GetQueueAttributes
import Network.AWS.SQS.GetQueueUrl
import Network.AWS.SQS.ListDeadLetterSourceQueues
import Network.AWS.SQS.ListQueues
import Network.AWS.SQS.PurgeQueue
import Network.AWS.SQS.ReceiveMessage
import Network.AWS.SQS.RemovePermission
import Network.AWS.SQS.SendMessage
Expand Down
8 changes: 7 additions & 1 deletion amazonka-sqs/gen/Network/AWS/SQS/AddPermission.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@
-- Only you (as owner of the queue) can grant or deny permissions to the queue.
-- For more information about these permissions, see <http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/acp-overview.html Shared Queues> in the /AmazonSQS Developer Guide/.
--
-- '&Attribute.1=this'
-- 'AddPermission' writes an Amazon SQS-generated policy. If you want to write
-- your own policy, use 'SetQueueAttributes' to upload your policy. For more
-- information about writing your own policy, see <http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/AccessPolicyLanguage.html Using The Access PolicyLanguage> in the /Amazon SQS Developer Guide/.
--
-- Some API actions take lists of parameters. These lists are specified using
-- the 'param.n' notation. Values of 'n' are integers starting from 1. For example,
-- a parameter list with two elements looks like this: '&Attribute.1=this'
--
-- '&Attribute.2=that'
--
Expand Down
8 changes: 8 additions & 0 deletions amazonka-sqs/gen/Network/AWS/SQS/ChangeMessageVisibility.hs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@
-- ChangeMessageVisiblity, but this time the maximum allowed timeout would be 9
-- hours and 30 minutes.
--
-- There is a 120,000 limit for the number of inflight messages per queue.
-- Messages are inflight after they have been received from the queue by a
-- consuming component, but have not yet been deleted from the queue. If you
-- reach the 120,000 limit, you will receive an OverLimit error message from
-- Amazon SQS. To help avoid reaching the limit, you should delete the messages
-- from the queue after they have been processed. You can also increase the
-- number of queues you use to process the messages.
--
-- If you attempt to set the 'VisibilityTimeout' to an amount more than the
-- maximum time left, Amazon SQS returns an error. It will not automatically
-- recalculate and increase the timeout to the maximum time remaining. Unlike
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
--
-- Because the batch request can result in a combination of successful and
-- unsuccessful actions, you should check for batch errors even when the call
-- returns an HTTP status code of 200. '&Attribute.1=this'
-- returns an HTTP status code of 200. Some API actions take lists of
-- parameters. These lists are specified using the 'param.n' notation. Values of 'n'
-- are integers starting from 1. For example, a parameter list with two elements
-- looks like this: '&Attribute.1=this'
--
-- '&Attribute.2=that'
--
Expand Down
21 changes: 14 additions & 7 deletions amazonka-sqs/gen/Network/AWS/SQS/CreateQueue.hs
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,24 @@
-- | Creates a new queue, or returns the URL of an existing one. When you request 'CreateQueue', you provide a name for the queue. To successfully create a new queue, you
-- must provide a name that is unique within the scope of your own queues.
--
-- If you delete a queue, you must wait at least 60 seconds before creating a
-- queue with the same name.
--
-- You may pass one or more attributes in the request. If you do not provide a
-- value for any attribute, the queue will have the default value for that
-- attribute. Permitted attributes are the same that can be set using 'SetQueueAttributes'.
--
-- Use 'GetQueueUrl' to get a queue's URL. 'GetQueueUrl' requires only the 'QueueName'
-- parameter.
--
-- If you provide the name of an existing queue, along with the exact names and
-- values of all the queue's attributes, 'CreateQueue' returns the queue URL for
-- the existing queue. If the queue name, attribute names, or attribute values
-- do not match an existing queue, 'CreateQueue' returns an error.
--
-- '&Attribute.1=this'
-- Some API actions take lists of parameters. These lists are specified using
-- the 'param.n' notation. Values of 'n' are integers starting from 1. For example,
-- a parameter list with two elements looks like this: '&Attribute.1=this'
--
-- '&Attribute.2=that'
--
Expand Down Expand Up @@ -95,12 +103,11 @@ createQueue p1 = CreateQueue
-- attribute is 262144 (256 KiB). 'MessageRetentionPeriod' - The number of
-- seconds Amazon SQS retains a message. Integer representing seconds, from 60
-- (1 minute) to 1209600 (14 days). The default for this attribute is 345600 (4
-- days). 'Policy' - The queue's policy. A valid form-url-encoded policy. For
-- more information about policy structure, see <http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/BasicStructure.html Basic Policy Structure> in the /Amazon SQS Developer Guide/. For more information about form-url-encoding, see <http://www.w3.org/MarkUp/html-spec/html-spec_8.html#SEC8.2.1 http://www.w3.org/MarkUp/html-spec/html-spec_8.html#SEC8.2.1>. 'ReceiveMessageWaitTimeSeconds' - The time for which a 'ReceiveMessage' call
-- will wait for a message to arrive. An integer from 0 to 20 (seconds). The
-- default for this attribute is 0. 'VisibilityTimeout' - The visibility timeout
-- for the queue. An integer from 0 to 43200 (12 hours). The default for this
-- attribute is 30. For more information about visibility timeout, see <http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/AboutVT.html Visibility Timeout> in the /Amazon SQS Developer Guide/.
-- days). 'Policy' - The queue's policy. A valid AWS policy. For more information
-- about policy structure, see <http://docs.aws.amazon.com/IAM/latest/UserGuide/PoliciesOverview.html Overview of AWS IAM Policies> in the /Amazon IAMUser Guide/. 'ReceiveMessageWaitTimeSeconds' - The time for which a 'ReceiveMessage' call will wait for a message to arrive. An integer from 0 to 20 (seconds).
-- The default for this attribute is 0. 'VisibilityTimeout' - The visibility
-- timeout for the queue. An integer from 0 to 43200 (12 hours). The default for
-- this attribute is 30. For more information about visibility timeout, see <http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/AboutVT.html Visibility Timeout> in the /Amazon SQS Developer Guide/.
cqAttributes :: Lens' CreateQueue (HashMap Text Text)
cqAttributes = lens _cqAttributes (\s a -> s { _cqAttributes = a }) . _EMap

Expand Down
7 changes: 7 additions & 0 deletions amazonka-sqs/gen/Network/AWS/SQS/DeleteMessage.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
-- queue. If you leave a message in the queue for longer than the queue's
-- configured retention period, Amazon SQS automatically deletes it.
--
-- The receipt handle is associated with a specific instance of receiving the
-- message. If you receive a message more than once, the receipt handle you get
-- each time you receive the message is different. When you request 'DeleteMessage'
-- , if you don't provide the most recently received receipt handle for the
-- message, the request will still succeed, but the message might not be
-- deleted.
--
-- It is possible you will receive a message even after you have deleted it.
-- This might happen on rare occasions if one of the servers storing a copy of
-- the message is unavailable when you request to delete the message. The copy
Expand Down
10 changes: 6 additions & 4 deletions amazonka-sqs/gen/Network/AWS/SQS/DeleteMessageBatch.hs
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@
--
-- Derived from AWS service descriptions, licensed under Apache 2.0.

-- | Deletes multiple messages. This is a batch version of 'DeleteMessage'. The
-- result of the delete action on each message is reported individually in the
-- response.
-- | Deletes up to ten messages from the specified queue. This is a batch version
-- of 'DeleteMessage'. The result of the delete action on each message is reported
-- individually in the response.
--
-- Because the batch request can result in a combination of successful and
-- unsuccessful actions, you should check for batch errors even when the call
-- returns an HTTP status code of 200.
--
-- '&Attribute.1=this'
-- Some API actions take lists of parameters. These lists are specified using
-- the 'param.n' notation. Values of 'n' are integers starting from 1. For example,
-- a parameter list with two elements looks like this: '&Attribute.1=this'
--
-- '&Attribute.2=that'
--
Expand Down
7 changes: 6 additions & 1 deletion amazonka-sqs/gen/Network/AWS/SQS/GetQueueAttributes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@
-- parameters for dead letter queue functionality of the source queue. For more
-- information about RedrivePolicy and dead letter queues, see <http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/SQSDeadLetterQueue.html Using Amazon SQSDead Letter Queues> in the /Amazon SQS Developer Guide/.
--
-- '&Attribute.1=this'
-- Going forward, new attributes might be added. If you are writing code that
-- calls this action, we recommend that you structure your code so that it can
-- handle new attributes gracefully. Some API actions take lists of parameters.
-- These lists are specified using the 'param.n' notation. Values of 'n' are
-- integers starting from 1. For example, a parameter list with two elements
-- looks like this: '&Attribute.1=this'
--
-- '&Attribute.2=that'
--
Expand Down
35 changes: 25 additions & 10 deletions amazonka-sqs/gen/Network/AWS/SQS/ReceiveMessage.hs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@
-- used for the returned messages. For more information, see <http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/AboutVT.html Visibility Timeout>
-- in the /Amazon SQS Developer Guide/.
--
-- Going forward, new attributes might be added. If you are writing code that
-- calls this action, we recommend that you structure your code so that it can
-- handle new attributes gracefully.
--
--
--
-- <http://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_ReceiveMessage.html>
module Network.AWS.SQS.ReceiveMessage
(
Expand Down Expand Up @@ -126,9 +132,12 @@ receiveMessage p1 = ReceiveMessage
-- be returned:
--
-- 'All' - returns all values. 'ApproximateFirstReceiveTimestamp' - returns the
-- time when the message was first received (epoch time in milliseconds). 'ApproximateReceiveCount' - returns the number of times a message has been received but not deleted. 'SenderId' - returns the AWS account number (or the IP address, if anonymous access is
-- allowed) of the sender. 'SentTimestamp' - returns the time when the message
-- was sent (epoch time in milliseconds).
-- time when the message was first received from the queue (epoch time in
-- milliseconds). 'ApproximateReceiveCount' - returns the number of times a
-- message has been received from the queue but not deleted. 'SenderId' - returns
-- the AWS account number (or the IP address, if 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 [Text]
rmAttributeNames = lens _rmAttributeNames (\s a -> s { _rmAttributeNames = a }) . _List

Expand All @@ -141,13 +150,19 @@ rmMaxNumberOfMessages :: Lens' ReceiveMessage (Maybe Int)
rmMaxNumberOfMessages =
lens _rmMaxNumberOfMessages (\s a -> s { _rmMaxNumberOfMessages = a })

-- | The message attribute Name can contain the following characters: A-Z, a-z,
-- 0-9, underscore(_), hyphen(-), and period (.). The message attribute name
-- must not start or end with a period, and it should not have successive
-- periods. The message attribute name is case sensitive and must be unique
-- among all attribute names for the message. The message attribute name can be
-- up to 256 characters long. Attribute names cannot start with "AWS." or
-- "Amazon." because these prefixes are reserved for use by Amazon Web Services.
-- | The name of the message attribute, where /N/ is the index. The message
-- attribute name can contain the following characters: A-Z, a-z, 0-9,
-- underscore (_), hyphen (-), and period (.). The name must not start or end
-- with a period, and it should not have successive periods. The name is case
-- sensitive and must be unique among all attribute names for the message. The
-- name can be up to 256 characters long. The name cannot start with "AWS." or
-- "Amazon." (or any variations in casing), because these prefixes are reserved
-- for use by Amazon Web Services.
--
-- When using 'ReceiveMessage', you can send a list of attribute names to
-- receive, or you can return all of the attributes by specifying "All" or ".*"
-- in your request. You can also use "foo.*" to return all message attributes
-- starting with the "foo" prefix.
rmMessageAttributeNames :: Lens' ReceiveMessage [Text]
rmMessageAttributeNames =
lens _rmMessageAttributeNames (\s a -> s { _rmMessageAttributeNames = a })
Expand Down
Loading

0 comments on commit ffc11b1

Please sign in to comment.