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-s3.cabal b/amazonka-s3.cabal --- a/amazonka-s3.cabal +++ b/amazonka-s3.cabal @@ -1,5 +1,5 @@ name: amazonka-s3 -version: 1.2.0.2 +version: 1.3.0 synopsis: Amazon Simple Storage Service SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -108,7 +108,7 @@ , Network.AWS.S3.Types.Sum build-depends: - amazonka-core == 1.2.0.* + amazonka-core == 1.3.0.* , base >= 4.7 && < 5 , lens >= 4.4 , text >= 1.1 @@ -130,9 +130,9 @@ , Test.AWS.S3.Internal build-depends: - amazonka-core == 1.2.0.* - , amazonka-test == 1.2.0.* - , amazonka-s3 == 1.2.0.* + amazonka-core == 1.3.0.* + , amazonka-test == 1.3.0.* + , amazonka-s3 == 1.3.0.* , base , bytestring , lens diff --git a/gen/Network/AWS/S3.hs b/gen/Network/AWS/S3.hs --- a/gen/Network/AWS/S3.hs +++ b/gen/Network/AWS/S3.hs @@ -70,68 +70,71 @@ -- ** PutObject , module Network.AWS.S3.PutObject - -- ** PutBucketLogging - , module Network.AWS.S3.PutBucketLogging - -- ** DeleteObject , module Network.AWS.S3.DeleteObject - -- ** DeleteBucket - , module Network.AWS.S3.DeleteBucket + -- ** PutBucketLogging + , module Network.AWS.S3.PutBucketLogging -- ** ListBuckets , module Network.AWS.S3.ListBuckets + -- ** DeleteBucket + , module Network.AWS.S3.DeleteBucket + -- ** CreateBucket , module Network.AWS.S3.CreateBucket - -- ** PutBucketTagging - , module Network.AWS.S3.PutBucketTagging - -- ** DeleteBucketTagging , module Network.AWS.S3.DeleteBucketTagging -- ** PutObjectACL , module Network.AWS.S3.PutObjectACL - -- ** GetBucketNotificationConfiguration - , module Network.AWS.S3.GetBucketNotificationConfiguration + -- ** PutBucketTagging + , module Network.AWS.S3.PutBucketTagging -- ** GetBucketLocation , module Network.AWS.S3.GetBucketLocation + -- ** GetBucketNotificationConfiguration + , module Network.AWS.S3.GetBucketNotificationConfiguration + + -- ** GetObject + , module Network.AWS.S3.GetObject + -- ** PutBucketReplication , module Network.AWS.S3.PutBucketReplication -- ** GetBucketWebsite , module Network.AWS.S3.GetBucketWebsite - -- ** GetObject - , module Network.AWS.S3.GetObject + -- ** GetBucketRequestPayment + , module Network.AWS.S3.GetBucketRequestPayment -- ** DeleteBucketReplication , module Network.AWS.S3.DeleteBucketReplication - -- ** GetBucketRequestPayment - , module Network.AWS.S3.GetBucketRequestPayment + -- ** GetBucketLifecycle + , module Network.AWS.S3.GetBucketLifecycle -- ** ListObjectVersions (Paginated) , module Network.AWS.S3.ListObjectVersions - -- ** GetBucketLifecycle - , module Network.AWS.S3.GetBucketLifecycle - -- ** HeadBucket , module Network.AWS.S3.HeadBucket -- ** PutBucketLifecycle , module Network.AWS.S3.PutBucketLifecycle + -- ** DeleteBucketLifecycle + , module Network.AWS.S3.DeleteBucketLifecycle + -- ** CreateMultipartUpload , module Network.AWS.S3.CreateMultipartUpload - -- ** DeleteBucketLifecycle - , module Network.AWS.S3.DeleteBucketLifecycle + -- ** UploadPart + , module Network.AWS.S3.UploadPart -- ** GetBucketReplication , module Network.AWS.S3.GetBucketReplication @@ -139,56 +142,47 @@ -- ** PutBucketWebsite , module Network.AWS.S3.PutBucketWebsite + -- ** DeleteBucketWebsite + , module Network.AWS.S3.DeleteBucketWebsite + -- ** CompleteMultipartUpload , module Network.AWS.S3.CompleteMultipartUpload - -- ** UploadPart - , module Network.AWS.S3.UploadPart - -- ** ListMultipartUploads (Paginated) , module Network.AWS.S3.ListMultipartUploads - -- ** DeleteBucketWebsite - , module Network.AWS.S3.DeleteBucketWebsite - -- ** ListObjects (Paginated) , module Network.AWS.S3.ListObjects - -- ** DeleteObjects - , module Network.AWS.S3.DeleteObjects - - -- ** PutBucketPolicy - , module Network.AWS.S3.PutBucketPolicy - -- ** DeleteBucketPolicy , module Network.AWS.S3.DeleteBucketPolicy -- ** AbortMultipartUpload , module Network.AWS.S3.AbortMultipartUpload + -- ** PutBucketPolicy + , module Network.AWS.S3.PutBucketPolicy + -- ** GetObjectTorrent , module Network.AWS.S3.GetObjectTorrent - -- ** PutBucketCORS - , module Network.AWS.S3.PutBucketCORS + -- ** DeleteObjects + , module Network.AWS.S3.DeleteObjects - -- ** DeleteBucketCORS - , module Network.AWS.S3.DeleteBucketCORS + -- ** PutBucketNotificationConfiguration + , module Network.AWS.S3.PutBucketNotificationConfiguration -- ** GetBucketVersioning , module Network.AWS.S3.GetBucketVersioning - -- ** PutBucketNotificationConfiguration - , module Network.AWS.S3.PutBucketNotificationConfiguration - - -- ** GetBucketTagging - , module Network.AWS.S3.GetBucketTagging + -- ** DeleteBucketCORS + , module Network.AWS.S3.DeleteBucketCORS - -- ** HeadObject - , module Network.AWS.S3.HeadObject + -- ** PutBucketCORS + , module Network.AWS.S3.PutBucketCORS - -- ** PutBucketVersioning - , module Network.AWS.S3.PutBucketVersioning + -- ** GetBucketCORS + , module Network.AWS.S3.GetBucketCORS -- ** GetObjectACL , module Network.AWS.S3.GetObjectACL @@ -196,9 +190,15 @@ -- ** RestoreObject , module Network.AWS.S3.RestoreObject - -- ** GetBucketCORS - , module Network.AWS.S3.GetBucketCORS + -- ** HeadObject + , module Network.AWS.S3.HeadObject + -- ** PutBucketVersioning + , module Network.AWS.S3.PutBucketVersioning + + -- ** GetBucketTagging + , module Network.AWS.S3.GetBucketTagging + -- ** CopyObject , module Network.AWS.S3.CopyObject @@ -208,18 +208,18 @@ -- ** GetBucketLogging , module Network.AWS.S3.GetBucketLogging - -- ** ListParts (Paginated) - , module Network.AWS.S3.ListParts - -- ** GetBucketACL , module Network.AWS.S3.GetBucketACL - -- ** PutBucketACL - , module Network.AWS.S3.PutBucketACL + -- ** ListParts (Paginated) + , module Network.AWS.S3.ListParts -- ** UploadPartCopy , module Network.AWS.S3.UploadPartCopy + -- ** PutBucketACL + , module Network.AWS.S3.PutBucketACL + -- * Types -- ** Re-exported Types @@ -417,8 +417,8 @@ , grantee , gURI , gEmailAddress - , gId , gDisplayName + , gId , gType -- ** IndexDocument @@ -429,8 +429,8 @@ -- ** Initiator , Initiator , initiator - , iId , iDisplayName + , iId -- ** LambdaFunctionConfiguration , LambdaFunctionConfiguration @@ -510,8 +510,8 @@ -- ** ObjectVersion , ObjectVersion , objectVersion - , ovVersionId , ovETag + , ovVersionId , ovSize , ovIsLatest , ovOwner @@ -522,8 +522,8 @@ -- ** Owner , Owner , owner - , oId , oDisplayName + , oId -- ** Part , Part @@ -653,8 +653,8 @@ , websiteConfiguration , wcRedirectAllRequestsTo , wcErrorDocument - , wcRoutingRules , wcIndexDocument + , wcRoutingRules ) where import Network.AWS.S3.AbortMultipartUpload diff --git a/gen/Network/AWS/S3/AbortMultipartUpload.hs b/gen/Network/AWS/S3/AbortMultipartUpload.hs --- a/gen/Network/AWS/S3/AbortMultipartUpload.hs +++ b/gen/Network/AWS/S3/AbortMultipartUpload.hs @@ -41,7 +41,7 @@ , AbortMultipartUploadResponse -- * Response Lenses , amursRequestCharged - , amursStatus + , amursResponseStatus ) where import Network.AWS.Prelude @@ -124,7 +124,7 @@ -- | /See:/ 'abortMultipartUploadResponse' smart constructor. data AbortMultipartUploadResponse = AbortMultipartUploadResponse' { _amursRequestCharged :: !(Maybe RequestCharged) - , _amursStatus :: !Int + , _amursResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'AbortMultipartUploadResponse' with the minimum fields required to make a request. @@ -133,14 +133,14 @@ -- -- * 'amursRequestCharged' -- --- * 'amursStatus' +-- * 'amursResponseStatus' abortMultipartUploadResponse - :: Int -- ^ 'amursStatus' + :: Int -- ^ 'amursResponseStatus' -> AbortMultipartUploadResponse -abortMultipartUploadResponse pStatus_ = +abortMultipartUploadResponse pResponseStatus_ = AbortMultipartUploadResponse' { _amursRequestCharged = Nothing - , _amursStatus = pStatus_ + , _amursResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -148,5 +148,5 @@ amursRequestCharged = lens _amursRequestCharged (\ s a -> s{_amursRequestCharged = a}); -- | The response status code. -amursStatus :: Lens' AbortMultipartUploadResponse Int -amursStatus = lens _amursStatus (\ s a -> s{_amursStatus = a}); +amursResponseStatus :: Lens' AbortMultipartUploadResponse Int +amursResponseStatus = lens _amursResponseStatus (\ s a -> s{_amursResponseStatus = a}); diff --git a/gen/Network/AWS/S3/CompleteMultipartUpload.hs b/gen/Network/AWS/S3/CompleteMultipartUpload.hs --- a/gen/Network/AWS/S3/CompleteMultipartUpload.hs +++ b/gen/Network/AWS/S3/CompleteMultipartUpload.hs @@ -37,16 +37,16 @@ , completeMultipartUploadResponse , CompleteMultipartUploadResponse -- * Response Lenses - , crsVersionId - , crsETag , crsRequestCharged + , crsETag + , crsVersionId , crsLocation , crsExpiration , crsBucket , crsKey , crsSSEKMSKeyId , crsServerSideEncryption - , crsStatus + , crsResponseStatus ) where import Network.AWS.Prelude @@ -119,8 +119,8 @@ = receiveXML (\ s h x -> CompleteMultipartUploadResponse' <$> - (h .#? "x-amz-version-id") <*> (x .@? "ETag") <*> - (h .#? "x-amz-request-charged") + (h .#? "x-amz-request-charged") <*> (x .@? "ETag") + <*> (h .#? "x-amz-version-id") <*> (x .@? "Location") <*> (h .#? "x-amz-expiration") <*> (x .@? "Bucket") @@ -151,27 +151,27 @@ -- | /See:/ 'completeMultipartUploadResponse' smart constructor. data CompleteMultipartUploadResponse = CompleteMultipartUploadResponse' - { _crsVersionId :: !(Maybe ObjectVersionId) + { _crsRequestCharged :: !(Maybe RequestCharged) , _crsETag :: !(Maybe ETag) - , _crsRequestCharged :: !(Maybe RequestCharged) + , _crsVersionId :: !(Maybe ObjectVersionId) , _crsLocation :: !(Maybe Text) , _crsExpiration :: !(Maybe Text) , _crsBucket :: !(Maybe BucketName) , _crsKey :: !(Maybe ObjectKey) , _crsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _crsServerSideEncryption :: !(Maybe ServerSideEncryption) - , _crsStatus :: !Int + , _crsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'CompleteMultipartUploadResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'crsVersionId' +-- * 'crsRequestCharged' -- -- * 'crsETag' -- --- * 'crsRequestCharged' +-- * 'crsVersionId' -- -- * 'crsLocation' -- @@ -185,35 +185,35 @@ -- -- * 'crsServerSideEncryption' -- --- * 'crsStatus' +-- * 'crsResponseStatus' completeMultipartUploadResponse - :: Int -- ^ 'crsStatus' + :: Int -- ^ 'crsResponseStatus' -> CompleteMultipartUploadResponse -completeMultipartUploadResponse pStatus_ = +completeMultipartUploadResponse pResponseStatus_ = CompleteMultipartUploadResponse' - { _crsVersionId = Nothing + { _crsRequestCharged = Nothing , _crsETag = Nothing - , _crsRequestCharged = Nothing + , _crsVersionId = Nothing , _crsLocation = Nothing , _crsExpiration = Nothing , _crsBucket = Nothing , _crsKey = Nothing , _crsSSEKMSKeyId = Nothing , _crsServerSideEncryption = Nothing - , _crsStatus = pStatus_ + , _crsResponseStatus = pResponseStatus_ } --- | Version of the object. -crsVersionId :: Lens' CompleteMultipartUploadResponse (Maybe ObjectVersionId) -crsVersionId = lens _crsVersionId (\ s a -> s{_crsVersionId = a}); +-- | Undocumented member. +crsRequestCharged :: Lens' CompleteMultipartUploadResponse (Maybe RequestCharged) +crsRequestCharged = lens _crsRequestCharged (\ s a -> s{_crsRequestCharged = a}); -- | Entity tag of the object. crsETag :: Lens' CompleteMultipartUploadResponse (Maybe ETag) crsETag = lens _crsETag (\ s a -> s{_crsETag = a}); --- | Undocumented member. -crsRequestCharged :: Lens' CompleteMultipartUploadResponse (Maybe RequestCharged) -crsRequestCharged = lens _crsRequestCharged (\ s a -> s{_crsRequestCharged = a}); +-- | Version of the object. +crsVersionId :: Lens' CompleteMultipartUploadResponse (Maybe ObjectVersionId) +crsVersionId = lens _crsVersionId (\ s a -> s{_crsVersionId = a}); -- | Undocumented member. crsLocation :: Lens' CompleteMultipartUploadResponse (Maybe Text) @@ -244,5 +244,5 @@ crsServerSideEncryption = lens _crsServerSideEncryption (\ s a -> s{_crsServerSideEncryption = a}); -- | The response status code. -crsStatus :: Lens' CompleteMultipartUploadResponse Int -crsStatus = lens _crsStatus (\ s a -> s{_crsStatus = a}); +crsResponseStatus :: Lens' CompleteMultipartUploadResponse Int +crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/CopyObject.hs b/gen/Network/AWS/S3/CopyObject.hs --- a/gen/Network/AWS/S3/CopyObject.hs +++ b/gen/Network/AWS/S3/CopyObject.hs @@ -32,27 +32,27 @@ , coCopySourceSSECustomerKeyMD5 , coMetadataDirective , coExpires - , coSSECustomerAlgorithm - , coCopySourceIfNoneMatch , coGrantReadACP + , coCopySourceIfNoneMatch + , coSSECustomerAlgorithm , coSSECustomerKey , coRequestPayer , coGrantWriteACP - , coWebsiteRedirectLocation , coCopySourceIfMatch + , coWebsiteRedirectLocation , coGrantRead , coStorageClass - , coContentEncoding + , coSSECustomerKeyMD5 , coSSEKMSKeyId , coGrantFullControl - , coSSECustomerKeyMD5 + , coContentEncoding , coMetadata , coCacheControl , coContentLanguage - , coACL , coCopySourceSSECustomerKey - , coContentDisposition , coCopySourceSSECustomerAlgorithm + , coACL + , coContentDisposition , coServerSideEncryption , coContentType , coBucket @@ -67,11 +67,11 @@ , corsExpiration , corsSSECustomerAlgorithm , corsCopySourceVersionId - , corsSSEKMSKeyId , corsSSECustomerKeyMD5 + , corsSSEKMSKeyId , corsServerSideEncryption , corsCopyObjectResult - , corsStatus + , corsResponseStatus ) where import Network.AWS.Prelude @@ -87,27 +87,27 @@ , _coCopySourceSSECustomerKeyMD5 :: !(Maybe Text) , _coMetadataDirective :: !(Maybe MetadataDirective) , _coExpires :: !(Maybe RFC822) - , _coSSECustomerAlgorithm :: !(Maybe Text) - , _coCopySourceIfNoneMatch :: !(Maybe Text) , _coGrantReadACP :: !(Maybe Text) + , _coCopySourceIfNoneMatch :: !(Maybe Text) + , _coSSECustomerAlgorithm :: !(Maybe Text) , _coSSECustomerKey :: !(Maybe (Sensitive Text)) , _coRequestPayer :: !(Maybe RequestPayer) , _coGrantWriteACP :: !(Maybe Text) - , _coWebsiteRedirectLocation :: !(Maybe Text) , _coCopySourceIfMatch :: !(Maybe Text) + , _coWebsiteRedirectLocation :: !(Maybe Text) , _coGrantRead :: !(Maybe Text) , _coStorageClass :: !(Maybe StorageClass) - , _coContentEncoding :: !(Maybe Text) + , _coSSECustomerKeyMD5 :: !(Maybe Text) , _coSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _coGrantFullControl :: !(Maybe Text) - , _coSSECustomerKeyMD5 :: !(Maybe Text) + , _coContentEncoding :: !(Maybe Text) , _coMetadata :: !(Map Text Text) , _coCacheControl :: !(Maybe Text) , _coContentLanguage :: !(Maybe Text) - , _coACL :: !(Maybe ObjectCannedACL) , _coCopySourceSSECustomerKey :: !(Maybe (Sensitive Text)) - , _coContentDisposition :: !(Maybe Text) , _coCopySourceSSECustomerAlgorithm :: !(Maybe Text) + , _coACL :: !(Maybe ObjectCannedACL) + , _coContentDisposition :: !(Maybe Text) , _coServerSideEncryption :: !(Maybe ServerSideEncryption) , _coContentType :: !(Maybe Text) , _coBucket :: !BucketName @@ -129,11 +129,11 @@ -- -- * 'coExpires' -- --- * 'coSSECustomerAlgorithm' +-- * 'coGrantReadACP' -- -- * 'coCopySourceIfNoneMatch' -- --- * 'coGrantReadACP' +-- * 'coSSECustomerAlgorithm' -- -- * 'coSSECustomerKey' -- @@ -141,21 +141,21 @@ -- -- * 'coGrantWriteACP' -- --- * 'coWebsiteRedirectLocation' --- -- * 'coCopySourceIfMatch' -- +-- * 'coWebsiteRedirectLocation' +-- -- * 'coGrantRead' -- -- * 'coStorageClass' -- --- * 'coContentEncoding' +-- * 'coSSECustomerKeyMD5' -- -- * 'coSSEKMSKeyId' -- -- * 'coGrantFullControl' -- --- * 'coSSECustomerKeyMD5' +-- * 'coContentEncoding' -- -- * 'coMetadata' -- @@ -163,14 +163,14 @@ -- -- * 'coContentLanguage' -- --- * 'coACL' --- -- * 'coCopySourceSSECustomerKey' -- --- * 'coContentDisposition' --- -- * 'coCopySourceSSECustomerAlgorithm' -- +-- * 'coACL' +-- +-- * 'coContentDisposition' +-- -- * 'coServerSideEncryption' -- -- * 'coContentType' @@ -192,27 +192,27 @@ , _coCopySourceSSECustomerKeyMD5 = Nothing , _coMetadataDirective = Nothing , _coExpires = Nothing - , _coSSECustomerAlgorithm = Nothing - , _coCopySourceIfNoneMatch = Nothing , _coGrantReadACP = Nothing + , _coCopySourceIfNoneMatch = Nothing + , _coSSECustomerAlgorithm = Nothing , _coSSECustomerKey = Nothing , _coRequestPayer = Nothing , _coGrantWriteACP = Nothing - , _coWebsiteRedirectLocation = Nothing , _coCopySourceIfMatch = Nothing + , _coWebsiteRedirectLocation = Nothing , _coGrantRead = Nothing , _coStorageClass = Nothing - , _coContentEncoding = Nothing + , _coSSECustomerKeyMD5 = Nothing , _coSSEKMSKeyId = Nothing , _coGrantFullControl = Nothing - , _coSSECustomerKeyMD5 = Nothing + , _coContentEncoding = Nothing , _coMetadata = mempty , _coCacheControl = Nothing , _coContentLanguage = Nothing - , _coACL = Nothing , _coCopySourceSSECustomerKey = Nothing - , _coContentDisposition = Nothing , _coCopySourceSSECustomerAlgorithm = Nothing + , _coACL = Nothing + , _coContentDisposition = Nothing , _coServerSideEncryption = Nothing , _coContentType = Nothing , _coBucket = pBucket_ @@ -243,19 +243,19 @@ coExpires :: Lens' CopyObject (Maybe UTCTime) coExpires = lens _coExpires (\ s a -> s{_coExpires = a}) . mapping _Time; --- | Specifies the algorithm to use to when encrypting the object (e.g., --- AES256). -coSSECustomerAlgorithm :: Lens' CopyObject (Maybe Text) -coSSECustomerAlgorithm = lens _coSSECustomerAlgorithm (\ s a -> s{_coSSECustomerAlgorithm = a}); +-- | Allows grantee to read the object ACL. +coGrantReadACP :: Lens' CopyObject (Maybe Text) +coGrantReadACP = lens _coGrantReadACP (\ s a -> s{_coGrantReadACP = a}); -- | Copies the object if its entity tag (ETag) is different than the -- specified ETag. coCopySourceIfNoneMatch :: Lens' CopyObject (Maybe Text) coCopySourceIfNoneMatch = lens _coCopySourceIfNoneMatch (\ s a -> s{_coCopySourceIfNoneMatch = a}); --- | Allows grantee to read the object ACL. -coGrantReadACP :: Lens' CopyObject (Maybe Text) -coGrantReadACP = lens _coGrantReadACP (\ s a -> s{_coGrantReadACP = a}); +-- | Specifies the algorithm to use to when encrypting the object (e.g., +-- AES256). +coSSECustomerAlgorithm :: Lens' CopyObject (Maybe Text) +coSSECustomerAlgorithm = lens _coSSECustomerAlgorithm (\ s a -> s{_coSSECustomerAlgorithm = a}); -- | Specifies the customer-provided encryption key for Amazon S3 to use in -- encrypting data. This value is used to store the object and then it is @@ -273,16 +273,16 @@ coGrantWriteACP :: Lens' CopyObject (Maybe Text) coGrantWriteACP = lens _coGrantWriteACP (\ s a -> s{_coGrantWriteACP = a}); +-- | Copies the object if its entity tag (ETag) matches the specified tag. +coCopySourceIfMatch :: Lens' CopyObject (Maybe Text) +coCopySourceIfMatch = lens _coCopySourceIfMatch (\ s a -> s{_coCopySourceIfMatch = a}); + -- | If the bucket is configured as a website, redirects requests for this -- object to another object in the same bucket or to an external URL. -- Amazon S3 stores the value of this header in the object metadata. coWebsiteRedirectLocation :: Lens' CopyObject (Maybe Text) coWebsiteRedirectLocation = lens _coWebsiteRedirectLocation (\ s a -> s{_coWebsiteRedirectLocation = a}); --- | Copies the object if its entity tag (ETag) matches the specified tag. -coCopySourceIfMatch :: Lens' CopyObject (Maybe Text) -coCopySourceIfMatch = lens _coCopySourceIfMatch (\ s a -> s{_coCopySourceIfMatch = a}); - -- | Allows grantee to read the object data and its metadata. coGrantRead :: Lens' CopyObject (Maybe Text) coGrantRead = lens _coGrantRead (\ s a -> s{_coGrantRead = a}); @@ -291,11 +291,11 @@ coStorageClass :: Lens' CopyObject (Maybe StorageClass) coStorageClass = lens _coStorageClass (\ s a -> s{_coStorageClass = a}); --- | Specifies what content encodings have been applied to the object and --- thus what decoding mechanisms must be applied to obtain the media-type --- referenced by the Content-Type header field. -coContentEncoding :: Lens' CopyObject (Maybe Text) -coContentEncoding = lens _coContentEncoding (\ s a -> s{_coContentEncoding = a}); +-- | Specifies the 128-bit MD5 digest of the encryption key according to RFC +-- 1321. Amazon S3 uses this header for a message integrity check to ensure +-- the encryption key was transmitted without error. +coSSECustomerKeyMD5 :: Lens' CopyObject (Maybe Text) +coSSECustomerKeyMD5 = lens _coSSECustomerKeyMD5 (\ s a -> s{_coSSECustomerKeyMD5 = a}); -- | Specifies the AWS KMS key ID to use for object encryption. All GET and -- PUT requests for an object protected by AWS KMS will fail if not made @@ -310,11 +310,11 @@ coGrantFullControl :: Lens' CopyObject (Maybe Text) coGrantFullControl = lens _coGrantFullControl (\ s a -> s{_coGrantFullControl = a}); --- | Specifies the 128-bit MD5 digest of the encryption key according to RFC --- 1321. Amazon S3 uses this header for a message integrity check to ensure --- the encryption key was transmitted without error. -coSSECustomerKeyMD5 :: Lens' CopyObject (Maybe Text) -coSSECustomerKeyMD5 = lens _coSSECustomerKeyMD5 (\ s a -> s{_coSSECustomerKeyMD5 = a}); +-- | Specifies what content encodings have been applied to the object and +-- thus what decoding mechanisms must be applied to obtain the media-type +-- referenced by the Content-Type header field. +coContentEncoding :: Lens' CopyObject (Maybe Text) +coContentEncoding = lens _coContentEncoding (\ s a -> s{_coContentEncoding = a}); -- | A map of metadata to store with the object in S3. coMetadata :: Lens' CopyObject (HashMap Text Text) @@ -328,25 +328,25 @@ coContentLanguage :: Lens' CopyObject (Maybe Text) coContentLanguage = lens _coContentLanguage (\ s a -> s{_coContentLanguage = a}); --- | The canned ACL to apply to the object. -coACL :: Lens' CopyObject (Maybe ObjectCannedACL) -coACL = lens _coACL (\ s a -> s{_coACL = a}); - -- | Specifies the customer-provided encryption key for Amazon S3 to use to -- decrypt the source object. The encryption key provided in this header -- must be one that was used when the source object was created. coCopySourceSSECustomerKey :: Lens' CopyObject (Maybe Text) coCopySourceSSECustomerKey = lens _coCopySourceSSECustomerKey (\ s a -> s{_coCopySourceSSECustomerKey = a}) . mapping _Sensitive; --- | Specifies presentational information for the object. -coContentDisposition :: Lens' CopyObject (Maybe Text) -coContentDisposition = lens _coContentDisposition (\ s a -> s{_coContentDisposition = a}); - -- | Specifies the algorithm to use when decrypting the source object (e.g., -- AES256). coCopySourceSSECustomerAlgorithm :: Lens' CopyObject (Maybe Text) coCopySourceSSECustomerAlgorithm = lens _coCopySourceSSECustomerAlgorithm (\ s a -> s{_coCopySourceSSECustomerAlgorithm = a}); +-- | The canned ACL to apply to the object. +coACL :: Lens' CopyObject (Maybe ObjectCannedACL) +coACL = lens _coACL (\ s a -> s{_coACL = a}); + +-- | Specifies presentational information for the object. +coContentDisposition :: Lens' CopyObject (Maybe Text) +coContentDisposition = lens _coContentDisposition (\ s a -> s{_coContentDisposition = a}); + -- | The Server-side encryption algorithm used when storing this object in S3 -- (e.g., AES256, aws:kms). coServerSideEncryption :: Lens' CopyObject (Maybe ServerSideEncryption) @@ -383,10 +383,10 @@ "x-amz-server-side-encryption-customer-algorithm") <*> (h .#? "x-amz-copy-source-version-id") <*> - (h .#? "x-amz-server-side-encryption-aws-kms-key-id") - <*> (h .#? "x-amz-server-side-encryption-customer-key-MD5") + <*> + (h .#? "x-amz-server-side-encryption-aws-kms-key-id") <*> (h .#? "x-amz-server-side-encryption") <*> (parseXML x) <*> (pure (fromEnum s))) @@ -402,35 +402,35 @@ =# _coCopySourceSSECustomerKeyMD5, "x-amz-metadata-directive" =# _coMetadataDirective, "Expires" =# _coExpires, - "x-amz-server-side-encryption-customer-algorithm" =# - _coSSECustomerAlgorithm, + "x-amz-grant-read-acp" =# _coGrantReadACP, "x-amz-copy-source-if-none-match" =# _coCopySourceIfNoneMatch, - "x-amz-grant-read-acp" =# _coGrantReadACP, + "x-amz-server-side-encryption-customer-algorithm" =# + _coSSECustomerAlgorithm, "x-amz-server-side-encryption-customer-key" =# _coSSECustomerKey, "x-amz-request-payer" =# _coRequestPayer, "x-amz-grant-write-acp" =# _coGrantWriteACP, + "x-amz-copy-source-if-match" =# _coCopySourceIfMatch, "x-amz-website-redirect-location" =# _coWebsiteRedirectLocation, - "x-amz-copy-source-if-match" =# _coCopySourceIfMatch, "x-amz-grant-read" =# _coGrantRead, "x-amz-storage-class" =# _coStorageClass, - "Content-Encoding" =# _coContentEncoding, + "x-amz-server-side-encryption-customer-key-MD5" =# + _coSSECustomerKeyMD5, "x-amz-server-side-encryption-aws-kms-key-id" =# _coSSEKMSKeyId, "x-amz-grant-full-control" =# _coGrantFullControl, - "x-amz-server-side-encryption-customer-key-MD5" =# - _coSSECustomerKeyMD5, + "Content-Encoding" =# _coContentEncoding, "x-amz-meta-" =# _coMetadata, "Cache-Control" =# _coCacheControl, "Content-Language" =# _coContentLanguage, - "x-amz-acl" =# _coACL, "x-amz-copy-source-server-side-encryption-customer-key" =# _coCopySourceSSECustomerKey, - "Content-Disposition" =# _coContentDisposition, "x-amz-copy-source-server-side-encryption-customer-algorithm" =# _coCopySourceSSECustomerAlgorithm, + "x-amz-acl" =# _coACL, + "Content-Disposition" =# _coContentDisposition, "x-amz-server-side-encryption" =# _coServerSideEncryption, "Content-Type" =# _coContentType, @@ -449,11 +449,11 @@ , _corsExpiration :: !(Maybe Text) , _corsSSECustomerAlgorithm :: !(Maybe Text) , _corsCopySourceVersionId :: !(Maybe Text) - , _corsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _corsSSECustomerKeyMD5 :: !(Maybe Text) + , _corsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _corsServerSideEncryption :: !(Maybe ServerSideEncryption) , _corsCopyObjectResult :: !(Maybe CopyObjectResult) - , _corsStatus :: !Int + , _corsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'CopyObjectResponse' with the minimum fields required to make a request. @@ -468,29 +468,29 @@ -- -- * 'corsCopySourceVersionId' -- --- * 'corsSSEKMSKeyId' --- -- * 'corsSSECustomerKeyMD5' -- +-- * 'corsSSEKMSKeyId' +-- -- * 'corsServerSideEncryption' -- -- * 'corsCopyObjectResult' -- --- * 'corsStatus' +-- * 'corsResponseStatus' copyObjectResponse - :: Int -- ^ 'corsStatus' + :: Int -- ^ 'corsResponseStatus' -> CopyObjectResponse -copyObjectResponse pStatus_ = +copyObjectResponse pResponseStatus_ = CopyObjectResponse' { _corsRequestCharged = Nothing , _corsExpiration = Nothing , _corsSSECustomerAlgorithm = Nothing , _corsCopySourceVersionId = Nothing - , _corsSSEKMSKeyId = Nothing , _corsSSECustomerKeyMD5 = Nothing + , _corsSSEKMSKeyId = Nothing , _corsServerSideEncryption = Nothing , _corsCopyObjectResult = Nothing - , _corsStatus = pStatus_ + , _corsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -512,17 +512,17 @@ corsCopySourceVersionId :: Lens' CopyObjectResponse (Maybe Text) corsCopySourceVersionId = lens _corsCopySourceVersionId (\ s a -> s{_corsCopySourceVersionId = a}); --- | If present, specifies the ID of the AWS Key Management Service (KMS) --- master encryption key that was used for the object. -corsSSEKMSKeyId :: Lens' CopyObjectResponse (Maybe Text) -corsSSEKMSKeyId = lens _corsSSEKMSKeyId (\ s a -> s{_corsSSEKMSKeyId = a}) . mapping _Sensitive; - -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header to provide round trip -- message integrity verification of the customer-provided encryption key. corsSSECustomerKeyMD5 :: Lens' CopyObjectResponse (Maybe Text) corsSSECustomerKeyMD5 = lens _corsSSECustomerKeyMD5 (\ s a -> s{_corsSSECustomerKeyMD5 = a}); +-- | If present, specifies the ID of the AWS Key Management Service (KMS) +-- master encryption key that was used for the object. +corsSSEKMSKeyId :: Lens' CopyObjectResponse (Maybe Text) +corsSSEKMSKeyId = lens _corsSSEKMSKeyId (\ s a -> s{_corsSSEKMSKeyId = a}) . mapping _Sensitive; + -- | The Server-side encryption algorithm used when storing this object in S3 -- (e.g., AES256, aws:kms). corsServerSideEncryption :: Lens' CopyObjectResponse (Maybe ServerSideEncryption) @@ -533,5 +533,5 @@ corsCopyObjectResult = lens _corsCopyObjectResult (\ s a -> s{_corsCopyObjectResult = a}); -- | The response status code. -corsStatus :: Lens' CopyObjectResponse Int -corsStatus = lens _corsStatus (\ s a -> s{_corsStatus = a}); +corsResponseStatus :: Lens' CopyObjectResponse Int +corsResponseStatus = lens _corsResponseStatus (\ s a -> s{_corsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/CreateBucket.hs b/gen/Network/AWS/S3/CreateBucket.hs --- a/gen/Network/AWS/S3/CreateBucket.hs +++ b/gen/Network/AWS/S3/CreateBucket.hs @@ -41,7 +41,7 @@ , CreateBucketResponse -- * Response Lenses , cbrsLocation - , cbrsStatus + , cbrsResponseStatus ) where import Network.AWS.Prelude @@ -165,8 +165,8 @@ -- | /See:/ 'createBucketResponse' smart constructor. data CreateBucketResponse = CreateBucketResponse' - { _cbrsLocation :: !(Maybe Text) - , _cbrsStatus :: !Int + { _cbrsLocation :: !(Maybe Text) + , _cbrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'CreateBucketResponse' with the minimum fields required to make a request. @@ -175,14 +175,14 @@ -- -- * 'cbrsLocation' -- --- * 'cbrsStatus' +-- * 'cbrsResponseStatus' createBucketResponse - :: Int -- ^ 'cbrsStatus' + :: Int -- ^ 'cbrsResponseStatus' -> CreateBucketResponse -createBucketResponse pStatus_ = +createBucketResponse pResponseStatus_ = CreateBucketResponse' { _cbrsLocation = Nothing - , _cbrsStatus = pStatus_ + , _cbrsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -190,5 +190,5 @@ cbrsLocation = lens _cbrsLocation (\ s a -> s{_cbrsLocation = a}); -- | The response status code. -cbrsStatus :: Lens' CreateBucketResponse Int -cbrsStatus = lens _cbrsStatus (\ s a -> s{_cbrsStatus = a}); +cbrsResponseStatus :: Lens' CreateBucketResponse Int +cbrsResponseStatus = lens _cbrsResponseStatus (\ s a -> s{_cbrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/CreateMultipartUpload.hs b/gen/Network/AWS/S3/CreateMultipartUpload.hs --- a/gen/Network/AWS/S3/CreateMultipartUpload.hs +++ b/gen/Network/AWS/S3/CreateMultipartUpload.hs @@ -34,18 +34,18 @@ , CreateMultipartUpload -- * Request Lenses , cmuExpires - , cmuSSECustomerAlgorithm , cmuGrantReadACP + , cmuSSECustomerAlgorithm , cmuSSECustomerKey , cmuRequestPayer , cmuGrantWriteACP , cmuWebsiteRedirectLocation , cmuGrantRead , cmuStorageClass - , cmuContentEncoding + , cmuSSECustomerKeyMD5 , cmuSSEKMSKeyId , cmuGrantFullControl - , cmuSSECustomerKeyMD5 + , cmuContentEncoding , cmuMetadata , cmuCacheControl , cmuContentLanguage @@ -61,14 +61,14 @@ , CreateMultipartUploadResponse -- * Response Lenses , cmursRequestCharged - , cmursSSECustomerAlgorithm , cmursBucket + , cmursSSECustomerAlgorithm , cmursKey - , cmursSSEKMSKeyId , cmursSSECustomerKeyMD5 + , cmursSSEKMSKeyId , cmursUploadId , cmursServerSideEncryption - , cmursStatus + , cmursResponseStatus ) where import Network.AWS.Prelude @@ -80,18 +80,18 @@ -- | /See:/ 'createMultipartUpload' smart constructor. data CreateMultipartUpload = CreateMultipartUpload' { _cmuExpires :: !(Maybe RFC822) - , _cmuSSECustomerAlgorithm :: !(Maybe Text) , _cmuGrantReadACP :: !(Maybe Text) + , _cmuSSECustomerAlgorithm :: !(Maybe Text) , _cmuSSECustomerKey :: !(Maybe (Sensitive Text)) , _cmuRequestPayer :: !(Maybe RequestPayer) , _cmuGrantWriteACP :: !(Maybe Text) , _cmuWebsiteRedirectLocation :: !(Maybe Text) , _cmuGrantRead :: !(Maybe Text) , _cmuStorageClass :: !(Maybe StorageClass) - , _cmuContentEncoding :: !(Maybe Text) + , _cmuSSECustomerKeyMD5 :: !(Maybe Text) , _cmuSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _cmuGrantFullControl :: !(Maybe Text) - , _cmuSSECustomerKeyMD5 :: !(Maybe Text) + , _cmuContentEncoding :: !(Maybe Text) , _cmuMetadata :: !(Map Text Text) , _cmuCacheControl :: !(Maybe Text) , _cmuContentLanguage :: !(Maybe Text) @@ -109,10 +109,10 @@ -- -- * 'cmuExpires' -- --- * 'cmuSSECustomerAlgorithm' --- -- * 'cmuGrantReadACP' -- +-- * 'cmuSSECustomerAlgorithm' +-- -- * 'cmuSSECustomerKey' -- -- * 'cmuRequestPayer' @@ -125,13 +125,13 @@ -- -- * 'cmuStorageClass' -- --- * 'cmuContentEncoding' +-- * 'cmuSSECustomerKeyMD5' -- -- * 'cmuSSEKMSKeyId' -- -- * 'cmuGrantFullControl' -- --- * 'cmuSSECustomerKeyMD5' +-- * 'cmuContentEncoding' -- -- * 'cmuMetadata' -- @@ -157,18 +157,18 @@ createMultipartUpload pBucket_ pKey_ = CreateMultipartUpload' { _cmuExpires = Nothing - , _cmuSSECustomerAlgorithm = Nothing , _cmuGrantReadACP = Nothing + , _cmuSSECustomerAlgorithm = Nothing , _cmuSSECustomerKey = Nothing , _cmuRequestPayer = Nothing , _cmuGrantWriteACP = Nothing , _cmuWebsiteRedirectLocation = Nothing , _cmuGrantRead = Nothing , _cmuStorageClass = Nothing - , _cmuContentEncoding = Nothing + , _cmuSSECustomerKeyMD5 = Nothing , _cmuSSEKMSKeyId = Nothing , _cmuGrantFullControl = Nothing - , _cmuSSECustomerKeyMD5 = Nothing + , _cmuContentEncoding = Nothing , _cmuMetadata = mempty , _cmuCacheControl = Nothing , _cmuContentLanguage = Nothing @@ -184,15 +184,15 @@ cmuExpires :: Lens' CreateMultipartUpload (Maybe UTCTime) cmuExpires = lens _cmuExpires (\ s a -> s{_cmuExpires = a}) . mapping _Time; +-- | Allows grantee to read the object ACL. +cmuGrantReadACP :: Lens' CreateMultipartUpload (Maybe Text) +cmuGrantReadACP = lens _cmuGrantReadACP (\ s a -> s{_cmuGrantReadACP = a}); + -- | Specifies the algorithm to use to when encrypting the object (e.g., -- AES256). cmuSSECustomerAlgorithm :: Lens' CreateMultipartUpload (Maybe Text) cmuSSECustomerAlgorithm = lens _cmuSSECustomerAlgorithm (\ s a -> s{_cmuSSECustomerAlgorithm = a}); --- | Allows grantee to read the object ACL. -cmuGrantReadACP :: Lens' CreateMultipartUpload (Maybe Text) -cmuGrantReadACP = lens _cmuGrantReadACP (\ s a -> s{_cmuGrantReadACP = a}); - -- | Specifies the customer-provided encryption key for Amazon S3 to use in -- encrypting data. This value is used to store the object and then it is -- discarded; Amazon does not store the encryption key. The key must be @@ -223,11 +223,11 @@ cmuStorageClass :: Lens' CreateMultipartUpload (Maybe StorageClass) cmuStorageClass = lens _cmuStorageClass (\ s a -> s{_cmuStorageClass = a}); --- | Specifies what content encodings have been applied to the object and --- thus what decoding mechanisms must be applied to obtain the media-type --- referenced by the Content-Type header field. -cmuContentEncoding :: Lens' CreateMultipartUpload (Maybe Text) -cmuContentEncoding = lens _cmuContentEncoding (\ s a -> s{_cmuContentEncoding = a}); +-- | Specifies the 128-bit MD5 digest of the encryption key according to RFC +-- 1321. Amazon S3 uses this header for a message integrity check to ensure +-- the encryption key was transmitted without error. +cmuSSECustomerKeyMD5 :: Lens' CreateMultipartUpload (Maybe Text) +cmuSSECustomerKeyMD5 = lens _cmuSSECustomerKeyMD5 (\ s a -> s{_cmuSSECustomerKeyMD5 = a}); -- | Specifies the AWS KMS key ID to use for object encryption. All GET and -- PUT requests for an object protected by AWS KMS will fail if not made @@ -242,11 +242,11 @@ cmuGrantFullControl :: Lens' CreateMultipartUpload (Maybe Text) cmuGrantFullControl = lens _cmuGrantFullControl (\ s a -> s{_cmuGrantFullControl = a}); --- | Specifies the 128-bit MD5 digest of the encryption key according to RFC --- 1321. Amazon S3 uses this header for a message integrity check to ensure --- the encryption key was transmitted without error. -cmuSSECustomerKeyMD5 :: Lens' CreateMultipartUpload (Maybe Text) -cmuSSECustomerKeyMD5 = lens _cmuSSECustomerKeyMD5 (\ s a -> s{_cmuSSECustomerKeyMD5 = a}); +-- | Specifies what content encodings have been applied to the object and +-- thus what decoding mechanisms must be applied to obtain the media-type +-- referenced by the Content-Type header field. +cmuContentEncoding :: Lens' CreateMultipartUpload (Maybe Text) +cmuContentEncoding = lens _cmuContentEncoding (\ s a -> s{_cmuContentEncoding = a}); -- | A map of metadata to store with the object in S3. cmuMetadata :: Lens' CreateMultipartUpload (HashMap Text Text) @@ -293,16 +293,16 @@ = receiveXML (\ s h x -> CreateMultipartUploadResponse' <$> - (h .#? "x-amz-request-charged") <*> + (h .#? "x-amz-request-charged") <*> (x .@? "Bucket") + <*> (h .#? "x-amz-server-side-encryption-customer-algorithm") - <*> (x .@? "Bucket") <*> (x .@? "Key") <*> - (h .#? "x-amz-server-side-encryption-aws-kms-key-id") - <*> (h .#? "x-amz-server-side-encryption-customer-key-MD5") + <*> + (h .#? "x-amz-server-side-encryption-aws-kms-key-id") <*> (x .@? "UploadId") <*> (h .#? "x-amz-server-side-encryption") <*> (pure (fromEnum s))) @@ -311,9 +311,9 @@ toHeaders CreateMultipartUpload'{..} = mconcat ["Expires" =# _cmuExpires, + "x-amz-grant-read-acp" =# _cmuGrantReadACP, "x-amz-server-side-encryption-customer-algorithm" =# _cmuSSECustomerAlgorithm, - "x-amz-grant-read-acp" =# _cmuGrantReadACP, "x-amz-server-side-encryption-customer-key" =# _cmuSSECustomerKey, "x-amz-request-payer" =# _cmuRequestPayer, @@ -322,12 +322,12 @@ _cmuWebsiteRedirectLocation, "x-amz-grant-read" =# _cmuGrantRead, "x-amz-storage-class" =# _cmuStorageClass, - "Content-Encoding" =# _cmuContentEncoding, + "x-amz-server-side-encryption-customer-key-MD5" =# + _cmuSSECustomerKeyMD5, "x-amz-server-side-encryption-aws-kms-key-id" =# _cmuSSEKMSKeyId, "x-amz-grant-full-control" =# _cmuGrantFullControl, - "x-amz-server-side-encryption-customer-key-MD5" =# - _cmuSSECustomerKeyMD5, + "Content-Encoding" =# _cmuContentEncoding, "x-amz-meta-" =# _cmuMetadata, "Cache-Control" =# _cmuCacheControl, "Content-Language" =# _cmuContentLanguage, @@ -347,14 +347,14 @@ -- | /See:/ 'createMultipartUploadResponse' smart constructor. data CreateMultipartUploadResponse = CreateMultipartUploadResponse' { _cmursRequestCharged :: !(Maybe RequestCharged) - , _cmursSSECustomerAlgorithm :: !(Maybe Text) , _cmursBucket :: !(Maybe BucketName) + , _cmursSSECustomerAlgorithm :: !(Maybe Text) , _cmursKey :: !(Maybe ObjectKey) - , _cmursSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _cmursSSECustomerKeyMD5 :: !(Maybe Text) + , _cmursSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _cmursUploadId :: !(Maybe Text) , _cmursServerSideEncryption :: !(Maybe ServerSideEncryption) - , _cmursStatus :: !Int + , _cmursResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'CreateMultipartUploadResponse' with the minimum fields required to make a request. @@ -363,66 +363,66 @@ -- -- * 'cmursRequestCharged' -- --- * 'cmursSSECustomerAlgorithm' --- -- * 'cmursBucket' -- --- * 'cmursKey' +-- * 'cmursSSECustomerAlgorithm' -- --- * 'cmursSSEKMSKeyId' +-- * 'cmursKey' -- -- * 'cmursSSECustomerKeyMD5' -- +-- * 'cmursSSEKMSKeyId' +-- -- * 'cmursUploadId' -- -- * 'cmursServerSideEncryption' -- --- * 'cmursStatus' +-- * 'cmursResponseStatus' createMultipartUploadResponse - :: Int -- ^ 'cmursStatus' + :: Int -- ^ 'cmursResponseStatus' -> CreateMultipartUploadResponse -createMultipartUploadResponse pStatus_ = +createMultipartUploadResponse pResponseStatus_ = CreateMultipartUploadResponse' { _cmursRequestCharged = Nothing - , _cmursSSECustomerAlgorithm = Nothing , _cmursBucket = Nothing + , _cmursSSECustomerAlgorithm = Nothing , _cmursKey = Nothing - , _cmursSSEKMSKeyId = Nothing , _cmursSSECustomerKeyMD5 = Nothing + , _cmursSSEKMSKeyId = Nothing , _cmursUploadId = Nothing , _cmursServerSideEncryption = Nothing - , _cmursStatus = pStatus_ + , _cmursResponseStatus = pResponseStatus_ } -- | Undocumented member. cmursRequestCharged :: Lens' CreateMultipartUploadResponse (Maybe RequestCharged) cmursRequestCharged = lens _cmursRequestCharged (\ s a -> s{_cmursRequestCharged = a}); +-- | Name of the bucket to which the multipart upload was initiated. +cmursBucket :: Lens' CreateMultipartUploadResponse (Maybe BucketName) +cmursBucket = lens _cmursBucket (\ s a -> s{_cmursBucket = a}); + -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header confirming the -- encryption algorithm used. cmursSSECustomerAlgorithm :: Lens' CreateMultipartUploadResponse (Maybe Text) cmursSSECustomerAlgorithm = lens _cmursSSECustomerAlgorithm (\ s a -> s{_cmursSSECustomerAlgorithm = a}); --- | Name of the bucket to which the multipart upload was initiated. -cmursBucket :: Lens' CreateMultipartUploadResponse (Maybe BucketName) -cmursBucket = lens _cmursBucket (\ s a -> s{_cmursBucket = a}); - -- | Object key for which the multipart upload was initiated. cmursKey :: Lens' CreateMultipartUploadResponse (Maybe ObjectKey) cmursKey = lens _cmursKey (\ s a -> s{_cmursKey = a}); --- | If present, specifies the ID of the AWS Key Management Service (KMS) --- master encryption key that was used for the object. -cmursSSEKMSKeyId :: Lens' CreateMultipartUploadResponse (Maybe Text) -cmursSSEKMSKeyId = lens _cmursSSEKMSKeyId (\ s a -> s{_cmursSSEKMSKeyId = a}) . mapping _Sensitive; - -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header to provide round trip -- message integrity verification of the customer-provided encryption key. cmursSSECustomerKeyMD5 :: Lens' CreateMultipartUploadResponse (Maybe Text) cmursSSECustomerKeyMD5 = lens _cmursSSECustomerKeyMD5 (\ s a -> s{_cmursSSECustomerKeyMD5 = a}); +-- | If present, specifies the ID of the AWS Key Management Service (KMS) +-- master encryption key that was used for the object. +cmursSSEKMSKeyId :: Lens' CreateMultipartUploadResponse (Maybe Text) +cmursSSEKMSKeyId = lens _cmursSSEKMSKeyId (\ s a -> s{_cmursSSEKMSKeyId = a}) . mapping _Sensitive; + -- | ID for the initiated multipart upload. cmursUploadId :: Lens' CreateMultipartUploadResponse (Maybe Text) cmursUploadId = lens _cmursUploadId (\ s a -> s{_cmursUploadId = a}); @@ -433,5 +433,5 @@ cmursServerSideEncryption = lens _cmursServerSideEncryption (\ s a -> s{_cmursServerSideEncryption = a}); -- | The response status code. -cmursStatus :: Lens' CreateMultipartUploadResponse Int -cmursStatus = lens _cmursStatus (\ s a -> s{_cmursStatus = a}); +cmursResponseStatus :: Lens' CreateMultipartUploadResponse Int +cmursResponseStatus = lens _cmursResponseStatus (\ s a -> s{_cmursResponseStatus = a}); diff --git a/gen/Network/AWS/S3/DeleteObject.hs b/gen/Network/AWS/S3/DeleteObject.hs --- a/gen/Network/AWS/S3/DeleteObject.hs +++ b/gen/Network/AWS/S3/DeleteObject.hs @@ -39,10 +39,10 @@ , deleteObjectResponse , DeleteObjectResponse -- * Response Lenses - , dorsVersionId , dorsRequestCharged + , dorsVersionId , dorsDeleteMarker - , dorsStatus + , dorsResponseStatus ) where import Network.AWS.Prelude @@ -114,8 +114,8 @@ = receiveEmpty (\ s h x -> DeleteObjectResponse' <$> - (h .#? "x-amz-version-id") <*> - (h .#? "x-amz-request-charged") + (h .#? "x-amz-request-charged") <*> + (h .#? "x-amz-version-id") <*> (h .#? "x-amz-delete-marker") <*> (pure (fromEnum s))) @@ -135,48 +135,48 @@ -- | /See:/ 'deleteObjectResponse' smart constructor. data DeleteObjectResponse = DeleteObjectResponse' - { _dorsVersionId :: !(Maybe ObjectVersionId) - , _dorsRequestCharged :: !(Maybe RequestCharged) + { _dorsRequestCharged :: !(Maybe RequestCharged) + , _dorsVersionId :: !(Maybe ObjectVersionId) , _dorsDeleteMarker :: !(Maybe Bool) - , _dorsStatus :: !Int + , _dorsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'DeleteObjectResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'dorsVersionId' --- -- * 'dorsRequestCharged' -- +-- * 'dorsVersionId' +-- -- * 'dorsDeleteMarker' -- --- * 'dorsStatus' +-- * 'dorsResponseStatus' deleteObjectResponse - :: Int -- ^ 'dorsStatus' + :: Int -- ^ 'dorsResponseStatus' -> DeleteObjectResponse -deleteObjectResponse pStatus_ = +deleteObjectResponse pResponseStatus_ = DeleteObjectResponse' - { _dorsVersionId = Nothing - , _dorsRequestCharged = Nothing + { _dorsRequestCharged = Nothing + , _dorsVersionId = Nothing , _dorsDeleteMarker = Nothing - , _dorsStatus = pStatus_ + , _dorsResponseStatus = pResponseStatus_ } +-- | Undocumented member. +dorsRequestCharged :: Lens' DeleteObjectResponse (Maybe RequestCharged) +dorsRequestCharged = lens _dorsRequestCharged (\ s a -> s{_dorsRequestCharged = a}); + -- | Returns the version ID of the delete marker created as a result of the -- DELETE operation. dorsVersionId :: Lens' DeleteObjectResponse (Maybe ObjectVersionId) dorsVersionId = lens _dorsVersionId (\ s a -> s{_dorsVersionId = a}); --- | Undocumented member. -dorsRequestCharged :: Lens' DeleteObjectResponse (Maybe RequestCharged) -dorsRequestCharged = lens _dorsRequestCharged (\ s a -> s{_dorsRequestCharged = a}); - -- | Specifies whether the versioned object that was permanently deleted was -- (true) or was not (false) a delete marker. dorsDeleteMarker :: Lens' DeleteObjectResponse (Maybe Bool) dorsDeleteMarker = lens _dorsDeleteMarker (\ s a -> s{_dorsDeleteMarker = a}); -- | The response status code. -dorsStatus :: Lens' DeleteObjectResponse Int -dorsStatus = lens _dorsStatus (\ s a -> s{_dorsStatus = a}); +dorsResponseStatus :: Lens' DeleteObjectResponse Int +dorsResponseStatus = lens _dorsResponseStatus (\ s a -> s{_dorsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/DeleteObjects.hs b/gen/Network/AWS/S3/DeleteObjects.hs --- a/gen/Network/AWS/S3/DeleteObjects.hs +++ b/gen/Network/AWS/S3/DeleteObjects.hs @@ -40,7 +40,7 @@ , drsRequestCharged , drsDeleted , drsErrors - , drsStatus + , drsResponseStatus ) where import Network.AWS.Prelude @@ -134,7 +134,7 @@ { _drsRequestCharged :: !(Maybe RequestCharged) , _drsDeleted :: !(Maybe [DeletedObject]) , _drsErrors :: !(Maybe [S3ServiceError]) - , _drsStatus :: !Int + , _drsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'DeleteObjectsResponse' with the minimum fields required to make a request. @@ -147,16 +147,16 @@ -- -- * 'drsErrors' -- --- * 'drsStatus' +-- * 'drsResponseStatus' deleteObjectsResponse - :: Int -- ^ 'drsStatus' + :: Int -- ^ 'drsResponseStatus' -> DeleteObjectsResponse -deleteObjectsResponse pStatus_ = +deleteObjectsResponse pResponseStatus_ = DeleteObjectsResponse' { _drsRequestCharged = Nothing , _drsDeleted = Nothing , _drsErrors = Nothing - , _drsStatus = pStatus_ + , _drsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -172,5 +172,5 @@ drsErrors = lens _drsErrors (\ s a -> s{_drsErrors = a}) . _Default . _Coerce; -- | The response status code. -drsStatus :: Lens' DeleteObjectsResponse Int -drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a}); +drsResponseStatus :: Lens' DeleteObjectsResponse Int +drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketACL.hs b/gen/Network/AWS/S3/GetBucketACL.hs --- a/gen/Network/AWS/S3/GetBucketACL.hs +++ b/gen/Network/AWS/S3/GetBucketACL.hs @@ -35,7 +35,7 @@ -- * Response Lenses , gbarsGrants , gbarsOwner - , gbarsStatus + , gbarsResponseStatus ) where import Network.AWS.Prelude @@ -90,9 +90,9 @@ -- | /See:/ 'getBucketACLResponse' smart constructor. data GetBucketACLResponse = GetBucketACLResponse' - { _gbarsGrants :: !(Maybe [Grant]) - , _gbarsOwner :: !(Maybe Owner) - , _gbarsStatus :: !Int + { _gbarsGrants :: !(Maybe [Grant]) + , _gbarsOwner :: !(Maybe Owner) + , _gbarsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketACLResponse' with the minimum fields required to make a request. @@ -103,15 +103,15 @@ -- -- * 'gbarsOwner' -- --- * 'gbarsStatus' +-- * 'gbarsResponseStatus' getBucketACLResponse - :: Int -- ^ 'gbarsStatus' + :: Int -- ^ 'gbarsResponseStatus' -> GetBucketACLResponse -getBucketACLResponse pStatus_ = +getBucketACLResponse pResponseStatus_ = GetBucketACLResponse' { _gbarsGrants = Nothing , _gbarsOwner = Nothing - , _gbarsStatus = pStatus_ + , _gbarsResponseStatus = pResponseStatus_ } -- | A list of grants. @@ -123,5 +123,5 @@ gbarsOwner = lens _gbarsOwner (\ s a -> s{_gbarsOwner = a}); -- | The response status code. -gbarsStatus :: Lens' GetBucketACLResponse Int -gbarsStatus = lens _gbarsStatus (\ s a -> s{_gbarsStatus = a}); +gbarsResponseStatus :: Lens' GetBucketACLResponse Int +gbarsResponseStatus = lens _gbarsResponseStatus (\ s a -> s{_gbarsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketCORS.hs b/gen/Network/AWS/S3/GetBucketCORS.hs --- a/gen/Network/AWS/S3/GetBucketCORS.hs +++ b/gen/Network/AWS/S3/GetBucketCORS.hs @@ -34,7 +34,7 @@ , GetBucketCORSResponse -- * Response Lenses , gbcrsCORSRules - , gbcrsStatus + , gbcrsResponseStatus ) where import Network.AWS.Prelude @@ -87,8 +87,8 @@ -- | /See:/ 'getBucketCORSResponse' smart constructor. data GetBucketCORSResponse = GetBucketCORSResponse' - { _gbcrsCORSRules :: !(Maybe [CORSRule]) - , _gbcrsStatus :: !Int + { _gbcrsCORSRules :: !(Maybe [CORSRule]) + , _gbcrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketCORSResponse' with the minimum fields required to make a request. @@ -97,14 +97,14 @@ -- -- * 'gbcrsCORSRules' -- --- * 'gbcrsStatus' +-- * 'gbcrsResponseStatus' getBucketCORSResponse - :: Int -- ^ 'gbcrsStatus' + :: Int -- ^ 'gbcrsResponseStatus' -> GetBucketCORSResponse -getBucketCORSResponse pStatus_ = +getBucketCORSResponse pResponseStatus_ = GetBucketCORSResponse' { _gbcrsCORSRules = Nothing - , _gbcrsStatus = pStatus_ + , _gbcrsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -112,5 +112,5 @@ gbcrsCORSRules = lens _gbcrsCORSRules (\ s a -> s{_gbcrsCORSRules = a}) . _Default . _Coerce; -- | The response status code. -gbcrsStatus :: Lens' GetBucketCORSResponse Int -gbcrsStatus = lens _gbcrsStatus (\ s a -> s{_gbcrsStatus = a}); +gbcrsResponseStatus :: Lens' GetBucketCORSResponse Int +gbcrsResponseStatus = lens _gbcrsResponseStatus (\ s a -> s{_gbcrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketLifecycle.hs b/gen/Network/AWS/S3/GetBucketLifecycle.hs --- a/gen/Network/AWS/S3/GetBucketLifecycle.hs +++ b/gen/Network/AWS/S3/GetBucketLifecycle.hs @@ -34,7 +34,7 @@ , GetBucketLifecycleResponse -- * Response Lenses , gblrsRules - , gblrsStatus + , gblrsResponseStatus ) where import Network.AWS.Prelude @@ -88,8 +88,8 @@ -- | /See:/ 'getBucketLifecycleResponse' smart constructor. data GetBucketLifecycleResponse = GetBucketLifecycleResponse' - { _gblrsRules :: !(Maybe [Rule]) - , _gblrsStatus :: !Int + { _gblrsRules :: !(Maybe [Rule]) + , _gblrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketLifecycleResponse' with the minimum fields required to make a request. @@ -98,14 +98,14 @@ -- -- * 'gblrsRules' -- --- * 'gblrsStatus' +-- * 'gblrsResponseStatus' getBucketLifecycleResponse - :: Int -- ^ 'gblrsStatus' + :: Int -- ^ 'gblrsResponseStatus' -> GetBucketLifecycleResponse -getBucketLifecycleResponse pStatus_ = +getBucketLifecycleResponse pResponseStatus_ = GetBucketLifecycleResponse' { _gblrsRules = Nothing - , _gblrsStatus = pStatus_ + , _gblrsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -113,5 +113,5 @@ gblrsRules = lens _gblrsRules (\ s a -> s{_gblrsRules = a}) . _Default . _Coerce; -- | The response status code. -gblrsStatus :: Lens' GetBucketLifecycleResponse Int -gblrsStatus = lens _gblrsStatus (\ s a -> s{_gblrsStatus = a}); +gblrsResponseStatus :: Lens' GetBucketLifecycleResponse Int +gblrsResponseStatus = lens _gblrsResponseStatus (\ s a -> s{_gblrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketLocation.hs b/gen/Network/AWS/S3/GetBucketLocation.hs --- a/gen/Network/AWS/S3/GetBucketLocation.hs +++ b/gen/Network/AWS/S3/GetBucketLocation.hs @@ -34,7 +34,7 @@ , GetBucketLocationResponse -- * Response Lenses , getrsLocationConstraint - , getrsStatus + , getrsResponseStatus ) where import Network.AWS.Prelude @@ -87,7 +87,7 @@ -- | /See:/ 'getBucketLocationResponse' smart constructor. data GetBucketLocationResponse = GetBucketLocationResponse' { _getrsLocationConstraint :: !(Maybe Region) - , _getrsStatus :: !Int + , _getrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketLocationResponse' with the minimum fields required to make a request. @@ -96,14 +96,14 @@ -- -- * 'getrsLocationConstraint' -- --- * 'getrsStatus' +-- * 'getrsResponseStatus' getBucketLocationResponse - :: Int -- ^ 'getrsStatus' + :: Int -- ^ 'getrsResponseStatus' -> GetBucketLocationResponse -getBucketLocationResponse pStatus_ = +getBucketLocationResponse pResponseStatus_ = GetBucketLocationResponse' { _getrsLocationConstraint = Nothing - , _getrsStatus = pStatus_ + , _getrsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -111,5 +111,5 @@ getrsLocationConstraint = lens _getrsLocationConstraint (\ s a -> s{_getrsLocationConstraint = a}); -- | The response status code. -getrsStatus :: Lens' GetBucketLocationResponse Int -getrsStatus = lens _getrsStatus (\ s a -> s{_getrsStatus = a}); +getrsResponseStatus :: Lens' GetBucketLocationResponse Int +getrsResponseStatus = lens _getrsResponseStatus (\ s a -> s{_getrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketLogging.hs b/gen/Network/AWS/S3/GetBucketLogging.hs --- a/gen/Network/AWS/S3/GetBucketLogging.hs +++ b/gen/Network/AWS/S3/GetBucketLogging.hs @@ -35,7 +35,7 @@ , GetBucketLoggingResponse -- * Response Lenses , grsLoggingEnabled - , grsStatus + , grsResponseStatus ) where import Network.AWS.Prelude @@ -88,7 +88,7 @@ -- | /See:/ 'getBucketLoggingResponse' smart constructor. data GetBucketLoggingResponse = GetBucketLoggingResponse' { _grsLoggingEnabled :: !(Maybe LoggingEnabled) - , _grsStatus :: !Int + , _grsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketLoggingResponse' with the minimum fields required to make a request. @@ -97,14 +97,14 @@ -- -- * 'grsLoggingEnabled' -- --- * 'grsStatus' +-- * 'grsResponseStatus' getBucketLoggingResponse - :: Int -- ^ 'grsStatus' + :: Int -- ^ 'grsResponseStatus' -> GetBucketLoggingResponse -getBucketLoggingResponse pStatus_ = +getBucketLoggingResponse pResponseStatus_ = GetBucketLoggingResponse' { _grsLoggingEnabled = Nothing - , _grsStatus = pStatus_ + , _grsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -112,5 +112,5 @@ grsLoggingEnabled = lens _grsLoggingEnabled (\ s a -> s{_grsLoggingEnabled = a}); -- | The response status code. -grsStatus :: Lens' GetBucketLoggingResponse Int -grsStatus = lens _grsStatus (\ s a -> s{_grsStatus = a}); +grsResponseStatus :: Lens' GetBucketLoggingResponse Int +grsResponseStatus = lens _grsResponseStatus (\ s a -> s{_grsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketPolicy.hs b/gen/Network/AWS/S3/GetBucketPolicy.hs --- a/gen/Network/AWS/S3/GetBucketPolicy.hs +++ b/gen/Network/AWS/S3/GetBucketPolicy.hs @@ -34,7 +34,7 @@ , GetBucketPolicyResponse -- * Response Lenses , gbprsPolicy - , gbprsStatus + , gbprsResponseStatus ) where import Network.AWS.Prelude @@ -86,8 +86,8 @@ -- | /See:/ 'getBucketPolicyResponse' smart constructor. data GetBucketPolicyResponse = GetBucketPolicyResponse' - { _gbprsPolicy :: !(Maybe Text) - , _gbprsStatus :: !Int + { _gbprsPolicy :: !(Maybe Text) + , _gbprsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketPolicyResponse' with the minimum fields required to make a request. @@ -96,14 +96,14 @@ -- -- * 'gbprsPolicy' -- --- * 'gbprsStatus' +-- * 'gbprsResponseStatus' getBucketPolicyResponse - :: Int -- ^ 'gbprsStatus' + :: Int -- ^ 'gbprsResponseStatus' -> GetBucketPolicyResponse -getBucketPolicyResponse pStatus_ = +getBucketPolicyResponse pResponseStatus_ = GetBucketPolicyResponse' { _gbprsPolicy = Nothing - , _gbprsStatus = pStatus_ + , _gbprsResponseStatus = pResponseStatus_ } -- | The bucket policy as a JSON document. @@ -111,5 +111,5 @@ gbprsPolicy = lens _gbprsPolicy (\ s a -> s{_gbprsPolicy = a}); -- | The response status code. -gbprsStatus :: Lens' GetBucketPolicyResponse Int -gbprsStatus = lens _gbprsStatus (\ s a -> s{_gbprsStatus = a}); +gbprsResponseStatus :: Lens' GetBucketPolicyResponse Int +gbprsResponseStatus = lens _gbprsResponseStatus (\ s a -> s{_gbprsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketReplication.hs b/gen/Network/AWS/S3/GetBucketReplication.hs --- a/gen/Network/AWS/S3/GetBucketReplication.hs +++ b/gen/Network/AWS/S3/GetBucketReplication.hs @@ -34,7 +34,7 @@ , GetBucketReplicationResponse -- * Response Lenses , gbrrsReplicationConfiguration - , gbrrsStatus + , gbrrsResponseStatus ) where import Network.AWS.Prelude @@ -88,7 +88,7 @@ -- | /See:/ 'getBucketReplicationResponse' smart constructor. data GetBucketReplicationResponse = GetBucketReplicationResponse' { _gbrrsReplicationConfiguration :: !(Maybe ReplicationConfiguration) - , _gbrrsStatus :: !Int + , _gbrrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketReplicationResponse' with the minimum fields required to make a request. @@ -97,14 +97,14 @@ -- -- * 'gbrrsReplicationConfiguration' -- --- * 'gbrrsStatus' +-- * 'gbrrsResponseStatus' getBucketReplicationResponse - :: Int -- ^ 'gbrrsStatus' + :: Int -- ^ 'gbrrsResponseStatus' -> GetBucketReplicationResponse -getBucketReplicationResponse pStatus_ = +getBucketReplicationResponse pResponseStatus_ = GetBucketReplicationResponse' { _gbrrsReplicationConfiguration = Nothing - , _gbrrsStatus = pStatus_ + , _gbrrsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -112,5 +112,5 @@ gbrrsReplicationConfiguration = lens _gbrrsReplicationConfiguration (\ s a -> s{_gbrrsReplicationConfiguration = a}); -- | The response status code. -gbrrsStatus :: Lens' GetBucketReplicationResponse Int -gbrrsStatus = lens _gbrrsStatus (\ s a -> s{_gbrrsStatus = a}); +gbrrsResponseStatus :: Lens' GetBucketReplicationResponse Int +gbrrsResponseStatus = lens _gbrrsResponseStatus (\ s a -> s{_gbrrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketRequestPayment.hs b/gen/Network/AWS/S3/GetBucketRequestPayment.hs --- a/gen/Network/AWS/S3/GetBucketRequestPayment.hs +++ b/gen/Network/AWS/S3/GetBucketRequestPayment.hs @@ -34,7 +34,7 @@ , GetBucketRequestPaymentResponse -- * Response Lenses , gbrprsPayer - , gbrprsStatus + , gbrprsResponseStatus ) where import Network.AWS.Prelude @@ -87,8 +87,8 @@ -- | /See:/ 'getBucketRequestPaymentResponse' smart constructor. data GetBucketRequestPaymentResponse = GetBucketRequestPaymentResponse' - { _gbrprsPayer :: !(Maybe Payer) - , _gbrprsStatus :: !Int + { _gbrprsPayer :: !(Maybe Payer) + , _gbrprsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketRequestPaymentResponse' with the minimum fields required to make a request. @@ -97,14 +97,14 @@ -- -- * 'gbrprsPayer' -- --- * 'gbrprsStatus' +-- * 'gbrprsResponseStatus' getBucketRequestPaymentResponse - :: Int -- ^ 'gbrprsStatus' + :: Int -- ^ 'gbrprsResponseStatus' -> GetBucketRequestPaymentResponse -getBucketRequestPaymentResponse pStatus_ = +getBucketRequestPaymentResponse pResponseStatus_ = GetBucketRequestPaymentResponse' { _gbrprsPayer = Nothing - , _gbrprsStatus = pStatus_ + , _gbrprsResponseStatus = pResponseStatus_ } -- | Specifies who pays for the download and request fees. @@ -112,5 +112,5 @@ gbrprsPayer = lens _gbrprsPayer (\ s a -> s{_gbrprsPayer = a}); -- | The response status code. -gbrprsStatus :: Lens' GetBucketRequestPaymentResponse Int -gbrprsStatus = lens _gbrprsStatus (\ s a -> s{_gbrprsStatus = a}); +gbrprsResponseStatus :: Lens' GetBucketRequestPaymentResponse Int +gbrprsResponseStatus = lens _gbrprsResponseStatus (\ s a -> s{_gbrprsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketTagging.hs b/gen/Network/AWS/S3/GetBucketTagging.hs --- a/gen/Network/AWS/S3/GetBucketTagging.hs +++ b/gen/Network/AWS/S3/GetBucketTagging.hs @@ -33,7 +33,7 @@ , getBucketTaggingResponse , GetBucketTaggingResponse -- * Response Lenses - , gbtrsStatus + , gbtrsResponseStatus , gbtrsTagSet ) where @@ -87,29 +87,29 @@ -- | /See:/ 'getBucketTaggingResponse' smart constructor. data GetBucketTaggingResponse = GetBucketTaggingResponse' - { _gbtrsStatus :: !Int - , _gbtrsTagSet :: ![Tag] + { _gbtrsResponseStatus :: !Int + , _gbtrsTagSet :: ![Tag] } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketTaggingResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'gbtrsStatus' +-- * 'gbtrsResponseStatus' -- -- * 'gbtrsTagSet' getBucketTaggingResponse - :: Int -- ^ 'gbtrsStatus' + :: Int -- ^ 'gbtrsResponseStatus' -> GetBucketTaggingResponse -getBucketTaggingResponse pStatus_ = +getBucketTaggingResponse pResponseStatus_ = GetBucketTaggingResponse' - { _gbtrsStatus = pStatus_ + { _gbtrsResponseStatus = pResponseStatus_ , _gbtrsTagSet = mempty } -- | The response status code. -gbtrsStatus :: Lens' GetBucketTaggingResponse Int -gbtrsStatus = lens _gbtrsStatus (\ s a -> s{_gbtrsStatus = a}); +gbtrsResponseStatus :: Lens' GetBucketTaggingResponse Int +gbtrsResponseStatus = lens _gbtrsResponseStatus (\ s a -> s{_gbtrsResponseStatus = a}); -- | Undocumented member. gbtrsTagSet :: Lens' GetBucketTaggingResponse [Tag] diff --git a/gen/Network/AWS/S3/GetBucketVersioning.hs b/gen/Network/AWS/S3/GetBucketVersioning.hs --- a/gen/Network/AWS/S3/GetBucketVersioning.hs +++ b/gen/Network/AWS/S3/GetBucketVersioning.hs @@ -33,8 +33,9 @@ , getBucketVersioningResponse , GetBucketVersioningResponse -- * Response Lenses - , gbvrsMFADelete , gbvrsStatus + , gbvrsMFADelete + , gbvrsResponseStatus ) where import Network.AWS.Prelude @@ -73,7 +74,8 @@ = receiveXML (\ s h x -> GetBucketVersioningResponse' <$> - (x .@? "MfaDelete") <*> (pure (fromEnum s))) + (x .@? "Status") <*> (x .@? "MfaDelete") <*> + (pure (fromEnum s))) instance ToHeaders GetBucketVersioning where toHeaders = const mempty @@ -87,26 +89,34 @@ -- | /See:/ 'getBucketVersioningResponse' smart constructor. data GetBucketVersioningResponse = GetBucketVersioningResponse' - { _gbvrsMFADelete :: !(Maybe MFADeleteStatus) - , _gbvrsStatus :: !Int + { _gbvrsStatus :: !(Maybe BucketVersioningStatus) + , _gbvrsMFADelete :: !(Maybe MFADeleteStatus) + , _gbvrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketVersioningResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- +-- * 'gbvrsStatus' +-- -- * 'gbvrsMFADelete' -- --- * 'gbvrsStatus' +-- * 'gbvrsResponseStatus' getBucketVersioningResponse - :: Int -- ^ 'gbvrsStatus' + :: Int -- ^ 'gbvrsResponseStatus' -> GetBucketVersioningResponse -getBucketVersioningResponse pStatus_ = +getBucketVersioningResponse pResponseStatus_ = GetBucketVersioningResponse' - { _gbvrsMFADelete = Nothing - , _gbvrsStatus = pStatus_ + { _gbvrsStatus = Nothing + , _gbvrsMFADelete = Nothing + , _gbvrsResponseStatus = pResponseStatus_ } +-- | The versioning state of the bucket. +gbvrsStatus :: Lens' GetBucketVersioningResponse (Maybe BucketVersioningStatus) +gbvrsStatus = lens _gbvrsStatus (\ s a -> s{_gbvrsStatus = a}); + -- | Specifies whether MFA delete is enabled in the bucket versioning -- configuration. This element is only returned if the bucket has been -- configured with MFA delete. If the bucket has never been so configured, @@ -115,5 +125,5 @@ gbvrsMFADelete = lens _gbvrsMFADelete (\ s a -> s{_gbvrsMFADelete = a}); -- | The response status code. -gbvrsStatus :: Lens' GetBucketVersioningResponse Int -gbvrsStatus = lens _gbvrsStatus (\ s a -> s{_gbvrsStatus = a}); +gbvrsResponseStatus :: Lens' GetBucketVersioningResponse Int +gbvrsResponseStatus = lens _gbvrsResponseStatus (\ s a -> s{_gbvrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetBucketWebsite.hs b/gen/Network/AWS/S3/GetBucketWebsite.hs --- a/gen/Network/AWS/S3/GetBucketWebsite.hs +++ b/gen/Network/AWS/S3/GetBucketWebsite.hs @@ -35,9 +35,9 @@ -- * Response Lenses , gbwrsRedirectAllRequestsTo , gbwrsErrorDocument - , gbwrsRoutingRules , gbwrsIndexDocument - , gbwrsStatus + , gbwrsRoutingRules + , gbwrsResponseStatus ) where import Network.AWS.Prelude @@ -77,10 +77,10 @@ GetBucketWebsiteResponse' <$> (x .@? "RedirectAllRequestsTo") <*> (x .@? "ErrorDocument") + <*> (x .@? "IndexDocument") <*> (x .@? "RoutingRules" .!@ mempty >>= may (parseXMLList "RoutingRule")) - <*> (x .@? "IndexDocument") <*> (pure (fromEnum s))) instance ToHeaders GetBucketWebsite where @@ -97,9 +97,9 @@ data GetBucketWebsiteResponse = GetBucketWebsiteResponse' { _gbwrsRedirectAllRequestsTo :: !(Maybe RedirectAllRequestsTo) , _gbwrsErrorDocument :: !(Maybe ErrorDocument) - , _gbwrsRoutingRules :: !(Maybe [RoutingRule]) , _gbwrsIndexDocument :: !(Maybe IndexDocument) - , _gbwrsStatus :: !Int + , _gbwrsRoutingRules :: !(Maybe [RoutingRule]) + , _gbwrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetBucketWebsiteResponse' with the minimum fields required to make a request. @@ -110,21 +110,21 @@ -- -- * 'gbwrsErrorDocument' -- --- * 'gbwrsRoutingRules' --- -- * 'gbwrsIndexDocument' -- --- * 'gbwrsStatus' +-- * 'gbwrsRoutingRules' +-- +-- * 'gbwrsResponseStatus' getBucketWebsiteResponse - :: Int -- ^ 'gbwrsStatus' + :: Int -- ^ 'gbwrsResponseStatus' -> GetBucketWebsiteResponse -getBucketWebsiteResponse pStatus_ = +getBucketWebsiteResponse pResponseStatus_ = GetBucketWebsiteResponse' { _gbwrsRedirectAllRequestsTo = Nothing , _gbwrsErrorDocument = Nothing - , _gbwrsRoutingRules = Nothing , _gbwrsIndexDocument = Nothing - , _gbwrsStatus = pStatus_ + , _gbwrsRoutingRules = Nothing + , _gbwrsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -136,13 +136,13 @@ gbwrsErrorDocument = lens _gbwrsErrorDocument (\ s a -> s{_gbwrsErrorDocument = a}); -- | Undocumented member. -gbwrsRoutingRules :: Lens' GetBucketWebsiteResponse [RoutingRule] -gbwrsRoutingRules = lens _gbwrsRoutingRules (\ s a -> s{_gbwrsRoutingRules = a}) . _Default . _Coerce; - --- | Undocumented member. gbwrsIndexDocument :: Lens' GetBucketWebsiteResponse (Maybe IndexDocument) gbwrsIndexDocument = lens _gbwrsIndexDocument (\ s a -> s{_gbwrsIndexDocument = a}); +-- | Undocumented member. +gbwrsRoutingRules :: Lens' GetBucketWebsiteResponse [RoutingRule] +gbwrsRoutingRules = lens _gbwrsRoutingRules (\ s a -> s{_gbwrsRoutingRules = a}) . _Default . _Coerce; + -- | The response status code. -gbwrsStatus :: Lens' GetBucketWebsiteResponse Int -gbwrsStatus = lens _gbwrsStatus (\ s a -> s{_gbwrsStatus = a}); +gbwrsResponseStatus :: Lens' GetBucketWebsiteResponse Int +gbwrsResponseStatus = lens _gbwrsResponseStatus (\ s a -> s{_gbwrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetObject.hs b/gen/Network/AWS/S3/GetObject.hs --- a/gen/Network/AWS/S3/GetObject.hs +++ b/gen/Network/AWS/S3/GetObject.hs @@ -50,22 +50,22 @@ , getObjectResponse , GetObjectResponse -- * Response Lenses - , gorsVersionId - , gorsETag , gorsRequestCharged + , gorsETag + , gorsVersionId , gorsContentLength - , gorsRestore , gorsExpires - , gorsDeleteMarker + , gorsRestore , gorsExpiration + , gorsDeleteMarker , gorsSSECustomerAlgorithm , gorsMissingMeta , gorsWebsiteRedirectLocation , gorsAcceptRanges , gorsStorageClass - , gorsContentEncoding - , gorsSSEKMSKeyId , gorsSSECustomerKeyMD5 + , gorsSSEKMSKeyId + , gorsContentEncoding , gorsMetadata , gorsReplicationStatus , gorsCacheControl @@ -75,7 +75,7 @@ , gorsContentRange , gorsServerSideEncryption , gorsContentType - , gorsStatus + , gorsResponseStatus , gorsBody ) where @@ -264,13 +264,13 @@ = receiveBody (\ s h x -> GetObjectResponse' <$> - (h .#? "x-amz-version-id") <*> (h .#? "ETag") <*> - (h .#? "x-amz-request-charged") + (h .#? "x-amz-request-charged") <*> (h .#? "ETag") + <*> (h .#? "x-amz-version-id") <*> (h .#? "Content-Length") - <*> (h .#? "x-amz-restore") <*> (h .#? "Expires") - <*> (h .#? "x-amz-delete-marker") + <*> (h .#? "x-amz-restore") <*> (h .#? "x-amz-expiration") + <*> (h .#? "x-amz-delete-marker") <*> (h .#? "x-amz-server-side-encryption-customer-algorithm") @@ -278,12 +278,12 @@ <*> (h .#? "x-amz-website-redirect-location") <*> (h .#? "accept-ranges") <*> (h .#? "x-amz-storage-class") - <*> (h .#? "Content-Encoding") <*> - (h .#? "x-amz-server-side-encryption-aws-kms-key-id") - <*> (h .#? "x-amz-server-side-encryption-customer-key-MD5") + <*> + (h .#? "x-amz-server-side-encryption-aws-kms-key-id") + <*> (h .#? "Content-Encoding") <*> (parseHeadersMap "x-amz-meta-" h) <*> (h .#? "x-amz-replication-status") <*> (h .#? "Cache-Control") @@ -332,22 +332,22 @@ -- | /See:/ 'getObjectResponse' smart constructor. data GetObjectResponse = GetObjectResponse' - { _gorsVersionId :: !(Maybe ObjectVersionId) + { _gorsRequestCharged :: !(Maybe RequestCharged) , _gorsETag :: !(Maybe ETag) - , _gorsRequestCharged :: !(Maybe RequestCharged) + , _gorsVersionId :: !(Maybe ObjectVersionId) , _gorsContentLength :: !(Maybe Int) - , _gorsRestore :: !(Maybe Text) , _gorsExpires :: !(Maybe RFC822) - , _gorsDeleteMarker :: !(Maybe Bool) + , _gorsRestore :: !(Maybe Text) , _gorsExpiration :: !(Maybe Text) + , _gorsDeleteMarker :: !(Maybe Bool) , _gorsSSECustomerAlgorithm :: !(Maybe Text) , _gorsMissingMeta :: !(Maybe Int) , _gorsWebsiteRedirectLocation :: !(Maybe Text) , _gorsAcceptRanges :: !(Maybe Text) , _gorsStorageClass :: !(Maybe StorageClass) - , _gorsContentEncoding :: !(Maybe Text) - , _gorsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _gorsSSECustomerKeyMD5 :: !(Maybe Text) + , _gorsSSEKMSKeyId :: !(Maybe (Sensitive Text)) + , _gorsContentEncoding :: !(Maybe Text) , _gorsMetadata :: !(Map Text Text) , _gorsReplicationStatus :: !(Maybe ReplicationStatus) , _gorsCacheControl :: !(Maybe Text) @@ -357,7 +357,7 @@ , _gorsContentRange :: !(Maybe Text) , _gorsServerSideEncryption :: !(Maybe ServerSideEncryption) , _gorsContentType :: !(Maybe Text) - , _gorsStatus :: !Int + , _gorsResponseStatus :: !Int , _gorsBody :: !RsBody } deriving (Show,Generic) @@ -365,22 +365,22 @@ -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'gorsVersionId' +-- * 'gorsRequestCharged' -- -- * 'gorsETag' -- --- * 'gorsRequestCharged' +-- * 'gorsVersionId' -- -- * 'gorsContentLength' -- --- * 'gorsRestore' --- -- * 'gorsExpires' -- --- * 'gorsDeleteMarker' +-- * 'gorsRestore' -- -- * 'gorsExpiration' -- +-- * 'gorsDeleteMarker' +-- -- * 'gorsSSECustomerAlgorithm' -- -- * 'gorsMissingMeta' @@ -391,11 +391,11 @@ -- -- * 'gorsStorageClass' -- --- * 'gorsContentEncoding' +-- * 'gorsSSECustomerKeyMD5' -- -- * 'gorsSSEKMSKeyId' -- --- * 'gorsSSECustomerKeyMD5' +-- * 'gorsContentEncoding' -- -- * 'gorsMetadata' -- @@ -415,31 +415,31 @@ -- -- * 'gorsContentType' -- --- * 'gorsStatus' +-- * 'gorsResponseStatus' -- -- * 'gorsBody' getObjectResponse - :: Int -- ^ 'gorsStatus' + :: Int -- ^ 'gorsResponseStatus' -> RsBody -- ^ 'gorsBody' -> GetObjectResponse -getObjectResponse pStatus_ pBody_ = +getObjectResponse pResponseStatus_ pBody_ = GetObjectResponse' - { _gorsVersionId = Nothing + { _gorsRequestCharged = Nothing , _gorsETag = Nothing - , _gorsRequestCharged = Nothing + , _gorsVersionId = Nothing , _gorsContentLength = Nothing - , _gorsRestore = Nothing , _gorsExpires = Nothing - , _gorsDeleteMarker = Nothing + , _gorsRestore = Nothing , _gorsExpiration = Nothing + , _gorsDeleteMarker = Nothing , _gorsSSECustomerAlgorithm = Nothing , _gorsMissingMeta = Nothing , _gorsWebsiteRedirectLocation = Nothing , _gorsAcceptRanges = Nothing , _gorsStorageClass = Nothing - , _gorsContentEncoding = Nothing - , _gorsSSEKMSKeyId = Nothing , _gorsSSECustomerKeyMD5 = Nothing + , _gorsSSEKMSKeyId = Nothing + , _gorsContentEncoding = Nothing , _gorsMetadata = mempty , _gorsReplicationStatus = Nothing , _gorsCacheControl = Nothing @@ -449,41 +449,35 @@ , _gorsContentRange = Nothing , _gorsServerSideEncryption = Nothing , _gorsContentType = Nothing - , _gorsStatus = pStatus_ + , _gorsResponseStatus = pResponseStatus_ , _gorsBody = pBody_ } --- | Version of the object. -gorsVersionId :: Lens' GetObjectResponse (Maybe ObjectVersionId) -gorsVersionId = lens _gorsVersionId (\ s a -> s{_gorsVersionId = a}); +-- | Undocumented member. +gorsRequestCharged :: Lens' GetObjectResponse (Maybe RequestCharged) +gorsRequestCharged = lens _gorsRequestCharged (\ s a -> s{_gorsRequestCharged = a}); -- | An ETag is an opaque identifier assigned by a web server to a specific -- version of a resource found at a URL gorsETag :: Lens' GetObjectResponse (Maybe ETag) gorsETag = lens _gorsETag (\ s a -> s{_gorsETag = a}); --- | Undocumented member. -gorsRequestCharged :: Lens' GetObjectResponse (Maybe RequestCharged) -gorsRequestCharged = lens _gorsRequestCharged (\ s a -> s{_gorsRequestCharged = a}); +-- | Version of the object. +gorsVersionId :: Lens' GetObjectResponse (Maybe ObjectVersionId) +gorsVersionId = lens _gorsVersionId (\ s a -> s{_gorsVersionId = a}); -- | Size of the body in bytes. gorsContentLength :: Lens' GetObjectResponse (Maybe Int) gorsContentLength = lens _gorsContentLength (\ s a -> s{_gorsContentLength = a}); --- | Provides information about object restoration operation and expiration --- time of the restored object copy. -gorsRestore :: Lens' GetObjectResponse (Maybe Text) -gorsRestore = lens _gorsRestore (\ s a -> s{_gorsRestore = a}); - -- | The date and time at which the object is no longer cacheable. gorsExpires :: Lens' GetObjectResponse (Maybe UTCTime) gorsExpires = lens _gorsExpires (\ s a -> s{_gorsExpires = a}) . mapping _Time; --- | Specifies whether the object retrieved was (true) or was not (false) a --- Delete Marker. If false, this response header does not appear in the --- response. -gorsDeleteMarker :: Lens' GetObjectResponse (Maybe Bool) -gorsDeleteMarker = lens _gorsDeleteMarker (\ s a -> s{_gorsDeleteMarker = a}); +-- | Provides information about object restoration operation and expiration +-- time of the restored object copy. +gorsRestore :: Lens' GetObjectResponse (Maybe Text) +gorsRestore = lens _gorsRestore (\ s a -> s{_gorsRestore = a}); -- | If the object expiration is configured (see PUT Bucket lifecycle), the -- response includes this header. It includes the expiry-date and rule-id @@ -492,6 +486,12 @@ gorsExpiration :: Lens' GetObjectResponse (Maybe Text) gorsExpiration = lens _gorsExpiration (\ s a -> s{_gorsExpiration = a}); +-- | Specifies whether the object retrieved was (true) or was not (false) a +-- Delete Marker. If false, this response header does not appear in the +-- response. +gorsDeleteMarker :: Lens' GetObjectResponse (Maybe Bool) +gorsDeleteMarker = lens _gorsDeleteMarker (\ s a -> s{_gorsDeleteMarker = a}); + -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header confirming the -- encryption algorithm used. @@ -520,22 +520,22 @@ gorsStorageClass :: Lens' GetObjectResponse (Maybe StorageClass) gorsStorageClass = lens _gorsStorageClass (\ s a -> s{_gorsStorageClass = a}); --- | Specifies what content encodings have been applied to the object and --- thus what decoding mechanisms must be applied to obtain the media-type --- referenced by the Content-Type header field. -gorsContentEncoding :: Lens' GetObjectResponse (Maybe Text) -gorsContentEncoding = lens _gorsContentEncoding (\ s a -> s{_gorsContentEncoding = a}); +-- | If server-side encryption with a customer-provided encryption key was +-- requested, the response will include this header to provide round trip +-- message integrity verification of the customer-provided encryption key. +gorsSSECustomerKeyMD5 :: Lens' GetObjectResponse (Maybe Text) +gorsSSECustomerKeyMD5 = lens _gorsSSECustomerKeyMD5 (\ s a -> s{_gorsSSECustomerKeyMD5 = a}); -- | If present, specifies the ID of the AWS Key Management Service (KMS) -- master encryption key that was used for the object. gorsSSEKMSKeyId :: Lens' GetObjectResponse (Maybe Text) gorsSSEKMSKeyId = lens _gorsSSEKMSKeyId (\ s a -> s{_gorsSSEKMSKeyId = a}) . mapping _Sensitive; --- | If server-side encryption with a customer-provided encryption key was --- requested, the response will include this header to provide round trip --- message integrity verification of the customer-provided encryption key. -gorsSSECustomerKeyMD5 :: Lens' GetObjectResponse (Maybe Text) -gorsSSECustomerKeyMD5 = lens _gorsSSECustomerKeyMD5 (\ s a -> s{_gorsSSECustomerKeyMD5 = a}); +-- | Specifies what content encodings have been applied to the object and +-- thus what decoding mechanisms must be applied to obtain the media-type +-- referenced by the Content-Type header field. +gorsContentEncoding :: Lens' GetObjectResponse (Maybe Text) +gorsContentEncoding = lens _gorsContentEncoding (\ s a -> s{_gorsContentEncoding = a}); -- | A map of metadata to store with the object in S3. gorsMetadata :: Lens' GetObjectResponse (HashMap Text Text) @@ -575,8 +575,8 @@ gorsContentType = lens _gorsContentType (\ s a -> s{_gorsContentType = a}); -- | The response status code. -gorsStatus :: Lens' GetObjectResponse Int -gorsStatus = lens _gorsStatus (\ s a -> s{_gorsStatus = a}); +gorsResponseStatus :: Lens' GetObjectResponse Int +gorsResponseStatus = lens _gorsResponseStatus (\ s a -> s{_gorsResponseStatus = a}); -- | Object data. gorsBody :: Lens' GetObjectResponse RsBody diff --git a/gen/Network/AWS/S3/GetObjectACL.hs b/gen/Network/AWS/S3/GetObjectACL.hs --- a/gen/Network/AWS/S3/GetObjectACL.hs +++ b/gen/Network/AWS/S3/GetObjectACL.hs @@ -39,7 +39,7 @@ , goarsRequestCharged , goarsGrants , goarsOwner - , goarsStatus + , goarsResponseStatus ) where import Network.AWS.Prelude @@ -125,7 +125,7 @@ { _goarsRequestCharged :: !(Maybe RequestCharged) , _goarsGrants :: !(Maybe [Grant]) , _goarsOwner :: !(Maybe Owner) - , _goarsStatus :: !Int + , _goarsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetObjectACLResponse' with the minimum fields required to make a request. @@ -138,16 +138,16 @@ -- -- * 'goarsOwner' -- --- * 'goarsStatus' +-- * 'goarsResponseStatus' getObjectACLResponse - :: Int -- ^ 'goarsStatus' + :: Int -- ^ 'goarsResponseStatus' -> GetObjectACLResponse -getObjectACLResponse pStatus_ = +getObjectACLResponse pResponseStatus_ = GetObjectACLResponse' { _goarsRequestCharged = Nothing , _goarsGrants = Nothing , _goarsOwner = Nothing - , _goarsStatus = pStatus_ + , _goarsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -163,5 +163,5 @@ goarsOwner = lens _goarsOwner (\ s a -> s{_goarsOwner = a}); -- | The response status code. -goarsStatus :: Lens' GetObjectACLResponse Int -goarsStatus = lens _goarsStatus (\ s a -> s{_goarsStatus = a}); +goarsResponseStatus :: Lens' GetObjectACLResponse Int +goarsResponseStatus = lens _goarsResponseStatus (\ s a -> s{_goarsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/GetObjectTorrent.hs b/gen/Network/AWS/S3/GetObjectTorrent.hs --- a/gen/Network/AWS/S3/GetObjectTorrent.hs +++ b/gen/Network/AWS/S3/GetObjectTorrent.hs @@ -36,7 +36,7 @@ , GetObjectTorrentResponse -- * Response Lenses , gotrsRequestCharged - , gotrsStatus + , gotrsResponseStatus , gotrsBody ) where @@ -110,7 +110,7 @@ -- | /See:/ 'getObjectTorrentResponse' smart constructor. data GetObjectTorrentResponse = GetObjectTorrentResponse' { _gotrsRequestCharged :: !(Maybe RequestCharged) - , _gotrsStatus :: !Int + , _gotrsResponseStatus :: !Int , _gotrsBody :: !RsBody } deriving (Show,Generic) @@ -120,17 +120,17 @@ -- -- * 'gotrsRequestCharged' -- --- * 'gotrsStatus' +-- * 'gotrsResponseStatus' -- -- * 'gotrsBody' getObjectTorrentResponse - :: Int -- ^ 'gotrsStatus' + :: Int -- ^ 'gotrsResponseStatus' -> RsBody -- ^ 'gotrsBody' -> GetObjectTorrentResponse -getObjectTorrentResponse pStatus_ pBody_ = +getObjectTorrentResponse pResponseStatus_ pBody_ = GetObjectTorrentResponse' { _gotrsRequestCharged = Nothing - , _gotrsStatus = pStatus_ + , _gotrsResponseStatus = pResponseStatus_ , _gotrsBody = pBody_ } @@ -139,8 +139,8 @@ gotrsRequestCharged = lens _gotrsRequestCharged (\ s a -> s{_gotrsRequestCharged = a}); -- | The response status code. -gotrsStatus :: Lens' GetObjectTorrentResponse Int -gotrsStatus = lens _gotrsStatus (\ s a -> s{_gotrsStatus = a}); +gotrsResponseStatus :: Lens' GetObjectTorrentResponse Int +gotrsResponseStatus = lens _gotrsResponseStatus (\ s a -> s{_gotrsResponseStatus = a}); -- | Undocumented member. gotrsBody :: Lens' GetObjectTorrentResponse RsBody diff --git a/gen/Network/AWS/S3/HeadObject.hs b/gen/Network/AWS/S3/HeadObject.hs --- a/gen/Network/AWS/S3/HeadObject.hs +++ b/gen/Network/AWS/S3/HeadObject.hs @@ -47,22 +47,22 @@ , headObjectResponse , HeadObjectResponse -- * Response Lenses - , horsVersionId - , horsETag , horsRequestCharged + , horsETag + , horsVersionId , horsContentLength - , horsRestore , horsExpires - , horsDeleteMarker + , horsRestore , horsExpiration + , horsDeleteMarker , horsSSECustomerAlgorithm , horsMissingMeta , horsWebsiteRedirectLocation , horsAcceptRanges , horsStorageClass - , horsContentEncoding - , horsSSEKMSKeyId , horsSSECustomerKeyMD5 + , horsSSEKMSKeyId + , horsContentEncoding , horsMetadata , horsReplicationStatus , horsCacheControl @@ -71,7 +71,7 @@ , horsContentDisposition , horsServerSideEncryption , horsContentType - , horsStatus + , horsResponseStatus ) where import Network.AWS.Prelude @@ -211,13 +211,13 @@ = receiveEmpty (\ s h x -> HeadObjectResponse' <$> - (h .#? "x-amz-version-id") <*> (h .#? "ETag") <*> - (h .#? "x-amz-request-charged") + (h .#? "x-amz-request-charged") <*> (h .#? "ETag") + <*> (h .#? "x-amz-version-id") <*> (h .#? "Content-Length") - <*> (h .#? "x-amz-restore") <*> (h .#? "Expires") - <*> (h .#? "x-amz-delete-marker") + <*> (h .#? "x-amz-restore") <*> (h .#? "x-amz-expiration") + <*> (h .#? "x-amz-delete-marker") <*> (h .#? "x-amz-server-side-encryption-customer-algorithm") @@ -225,12 +225,12 @@ <*> (h .#? "x-amz-website-redirect-location") <*> (h .#? "accept-ranges") <*> (h .#? "x-amz-storage-class") - <*> (h .#? "Content-Encoding") <*> - (h .#? "x-amz-server-side-encryption-aws-kms-key-id") - <*> (h .#? "x-amz-server-side-encryption-customer-key-MD5") + <*> + (h .#? "x-amz-server-side-encryption-aws-kms-key-id") + <*> (h .#? "Content-Encoding") <*> (parseHeadersMap "x-amz-meta-" h) <*> (h .#? "x-amz-replication-status") <*> (h .#? "Cache-Control") @@ -267,22 +267,22 @@ -- | /See:/ 'headObjectResponse' smart constructor. data HeadObjectResponse = HeadObjectResponse' - { _horsVersionId :: !(Maybe ObjectVersionId) + { _horsRequestCharged :: !(Maybe RequestCharged) , _horsETag :: !(Maybe ETag) - , _horsRequestCharged :: !(Maybe RequestCharged) + , _horsVersionId :: !(Maybe ObjectVersionId) , _horsContentLength :: !(Maybe Int) - , _horsRestore :: !(Maybe Text) , _horsExpires :: !(Maybe RFC822) - , _horsDeleteMarker :: !(Maybe Bool) + , _horsRestore :: !(Maybe Text) , _horsExpiration :: !(Maybe Text) + , _horsDeleteMarker :: !(Maybe Bool) , _horsSSECustomerAlgorithm :: !(Maybe Text) , _horsMissingMeta :: !(Maybe Int) , _horsWebsiteRedirectLocation :: !(Maybe Text) , _horsAcceptRanges :: !(Maybe Text) , _horsStorageClass :: !(Maybe StorageClass) - , _horsContentEncoding :: !(Maybe Text) - , _horsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _horsSSECustomerKeyMD5 :: !(Maybe Text) + , _horsSSEKMSKeyId :: !(Maybe (Sensitive Text)) + , _horsContentEncoding :: !(Maybe Text) , _horsMetadata :: !(Map Text Text) , _horsReplicationStatus :: !(Maybe ReplicationStatus) , _horsCacheControl :: !(Maybe Text) @@ -291,29 +291,29 @@ , _horsContentDisposition :: !(Maybe Text) , _horsServerSideEncryption :: !(Maybe ServerSideEncryption) , _horsContentType :: !(Maybe Text) - , _horsStatus :: !Int + , _horsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'HeadObjectResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'horsVersionId' +-- * 'horsRequestCharged' -- -- * 'horsETag' -- --- * 'horsRequestCharged' +-- * 'horsVersionId' -- -- * 'horsContentLength' -- --- * 'horsRestore' --- -- * 'horsExpires' -- --- * 'horsDeleteMarker' +-- * 'horsRestore' -- -- * 'horsExpiration' -- +-- * 'horsDeleteMarker' +-- -- * 'horsSSECustomerAlgorithm' -- -- * 'horsMissingMeta' @@ -324,11 +324,11 @@ -- -- * 'horsStorageClass' -- --- * 'horsContentEncoding' +-- * 'horsSSECustomerKeyMD5' -- -- * 'horsSSEKMSKeyId' -- --- * 'horsSSECustomerKeyMD5' +-- * 'horsContentEncoding' -- -- * 'horsMetadata' -- @@ -346,28 +346,28 @@ -- -- * 'horsContentType' -- --- * 'horsStatus' +-- * 'horsResponseStatus' headObjectResponse - :: Int -- ^ 'horsStatus' + :: Int -- ^ 'horsResponseStatus' -> HeadObjectResponse -headObjectResponse pStatus_ = +headObjectResponse pResponseStatus_ = HeadObjectResponse' - { _horsVersionId = Nothing + { _horsRequestCharged = Nothing , _horsETag = Nothing - , _horsRequestCharged = Nothing + , _horsVersionId = Nothing , _horsContentLength = Nothing - , _horsRestore = Nothing , _horsExpires = Nothing - , _horsDeleteMarker = Nothing + , _horsRestore = Nothing , _horsExpiration = Nothing + , _horsDeleteMarker = Nothing , _horsSSECustomerAlgorithm = Nothing , _horsMissingMeta = Nothing , _horsWebsiteRedirectLocation = Nothing , _horsAcceptRanges = Nothing , _horsStorageClass = Nothing - , _horsContentEncoding = Nothing - , _horsSSEKMSKeyId = Nothing , _horsSSECustomerKeyMD5 = Nothing + , _horsSSEKMSKeyId = Nothing + , _horsContentEncoding = Nothing , _horsMetadata = mempty , _horsReplicationStatus = Nothing , _horsCacheControl = Nothing @@ -376,40 +376,34 @@ , _horsContentDisposition = Nothing , _horsServerSideEncryption = Nothing , _horsContentType = Nothing - , _horsStatus = pStatus_ + , _horsResponseStatus = pResponseStatus_ } --- | Version of the object. -horsVersionId :: Lens' HeadObjectResponse (Maybe ObjectVersionId) -horsVersionId = lens _horsVersionId (\ s a -> s{_horsVersionId = a}); +-- | Undocumented member. +horsRequestCharged :: Lens' HeadObjectResponse (Maybe RequestCharged) +horsRequestCharged = lens _horsRequestCharged (\ s a -> s{_horsRequestCharged = a}); -- | An ETag is an opaque identifier assigned by a web server to a specific -- version of a resource found at a URL horsETag :: Lens' HeadObjectResponse (Maybe ETag) horsETag = lens _horsETag (\ s a -> s{_horsETag = a}); --- | Undocumented member. -horsRequestCharged :: Lens' HeadObjectResponse (Maybe RequestCharged) -horsRequestCharged = lens _horsRequestCharged (\ s a -> s{_horsRequestCharged = a}); +-- | Version of the object. +horsVersionId :: Lens' HeadObjectResponse (Maybe ObjectVersionId) +horsVersionId = lens _horsVersionId (\ s a -> s{_horsVersionId = a}); -- | Size of the body in bytes. horsContentLength :: Lens' HeadObjectResponse (Maybe Int) horsContentLength = lens _horsContentLength (\ s a -> s{_horsContentLength = a}); --- | Provides information about object restoration operation and expiration --- time of the restored object copy. -horsRestore :: Lens' HeadObjectResponse (Maybe Text) -horsRestore = lens _horsRestore (\ s a -> s{_horsRestore = a}); - -- | The date and time at which the object is no longer cacheable. horsExpires :: Lens' HeadObjectResponse (Maybe UTCTime) horsExpires = lens _horsExpires (\ s a -> s{_horsExpires = a}) . mapping _Time; --- | Specifies whether the object retrieved was (true) or was not (false) a --- Delete Marker. If false, this response header does not appear in the --- response. -horsDeleteMarker :: Lens' HeadObjectResponse (Maybe Bool) -horsDeleteMarker = lens _horsDeleteMarker (\ s a -> s{_horsDeleteMarker = a}); +-- | Provides information about object restoration operation and expiration +-- time of the restored object copy. +horsRestore :: Lens' HeadObjectResponse (Maybe Text) +horsRestore = lens _horsRestore (\ s a -> s{_horsRestore = a}); -- | If the object expiration is configured (see PUT Bucket lifecycle), the -- response includes this header. It includes the expiry-date and rule-id @@ -418,6 +412,12 @@ horsExpiration :: Lens' HeadObjectResponse (Maybe Text) horsExpiration = lens _horsExpiration (\ s a -> s{_horsExpiration = a}); +-- | Specifies whether the object retrieved was (true) or was not (false) a +-- Delete Marker. If false, this response header does not appear in the +-- response. +horsDeleteMarker :: Lens' HeadObjectResponse (Maybe Bool) +horsDeleteMarker = lens _horsDeleteMarker (\ s a -> s{_horsDeleteMarker = a}); + -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header confirming the -- encryption algorithm used. @@ -446,22 +446,22 @@ horsStorageClass :: Lens' HeadObjectResponse (Maybe StorageClass) horsStorageClass = lens _horsStorageClass (\ s a -> s{_horsStorageClass = a}); --- | Specifies what content encodings have been applied to the object and --- thus what decoding mechanisms must be applied to obtain the media-type --- referenced by the Content-Type header field. -horsContentEncoding :: Lens' HeadObjectResponse (Maybe Text) -horsContentEncoding = lens _horsContentEncoding (\ s a -> s{_horsContentEncoding = a}); +-- | If server-side encryption with a customer-provided encryption key was +-- requested, the response will include this header to provide round trip +-- message integrity verification of the customer-provided encryption key. +horsSSECustomerKeyMD5 :: Lens' HeadObjectResponse (Maybe Text) +horsSSECustomerKeyMD5 = lens _horsSSECustomerKeyMD5 (\ s a -> s{_horsSSECustomerKeyMD5 = a}); -- | If present, specifies the ID of the AWS Key Management Service (KMS) -- master encryption key that was used for the object. horsSSEKMSKeyId :: Lens' HeadObjectResponse (Maybe Text) horsSSEKMSKeyId = lens _horsSSEKMSKeyId (\ s a -> s{_horsSSEKMSKeyId = a}) . mapping _Sensitive; --- | If server-side encryption with a customer-provided encryption key was --- requested, the response will include this header to provide round trip --- message integrity verification of the customer-provided encryption key. -horsSSECustomerKeyMD5 :: Lens' HeadObjectResponse (Maybe Text) -horsSSECustomerKeyMD5 = lens _horsSSECustomerKeyMD5 (\ s a -> s{_horsSSECustomerKeyMD5 = a}); +-- | Specifies what content encodings have been applied to the object and +-- thus what decoding mechanisms must be applied to obtain the media-type +-- referenced by the Content-Type header field. +horsContentEncoding :: Lens' HeadObjectResponse (Maybe Text) +horsContentEncoding = lens _horsContentEncoding (\ s a -> s{_horsContentEncoding = a}); -- | A map of metadata to store with the object in S3. horsMetadata :: Lens' HeadObjectResponse (HashMap Text Text) @@ -497,5 +497,5 @@ horsContentType = lens _horsContentType (\ s a -> s{_horsContentType = a}); -- | The response status code. -horsStatus :: Lens' HeadObjectResponse Int -horsStatus = lens _horsStatus (\ s a -> s{_horsStatus = a}); +horsResponseStatus :: Lens' HeadObjectResponse Int +horsResponseStatus = lens _horsResponseStatus (\ s a -> s{_horsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/ListBuckets.hs b/gen/Network/AWS/S3/ListBuckets.hs --- a/gen/Network/AWS/S3/ListBuckets.hs +++ b/gen/Network/AWS/S3/ListBuckets.hs @@ -34,7 +34,7 @@ -- * Response Lenses , lbrsBuckets , lbrsOwner - , lbrsStatus + , lbrsResponseStatus ) where import Network.AWS.Prelude @@ -77,9 +77,9 @@ -- | /See:/ 'listBucketsResponse' smart constructor. data ListBucketsResponse = ListBucketsResponse' - { _lbrsBuckets :: !(Maybe [Bucket]) - , _lbrsOwner :: !(Maybe Owner) - , _lbrsStatus :: !Int + { _lbrsBuckets :: !(Maybe [Bucket]) + , _lbrsOwner :: !(Maybe Owner) + , _lbrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListBucketsResponse' with the minimum fields required to make a request. @@ -90,15 +90,15 @@ -- -- * 'lbrsOwner' -- --- * 'lbrsStatus' +-- * 'lbrsResponseStatus' listBucketsResponse - :: Int -- ^ 'lbrsStatus' + :: Int -- ^ 'lbrsResponseStatus' -> ListBucketsResponse -listBucketsResponse pStatus_ = +listBucketsResponse pResponseStatus_ = ListBucketsResponse' { _lbrsBuckets = Nothing , _lbrsOwner = Nothing - , _lbrsStatus = pStatus_ + , _lbrsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -110,5 +110,5 @@ lbrsOwner = lens _lbrsOwner (\ s a -> s{_lbrsOwner = a}); -- | The response status code. -lbrsStatus :: Lens' ListBucketsResponse Int -lbrsStatus = lens _lbrsStatus (\ s a -> s{_lbrsStatus = a}); +lbrsResponseStatus :: Lens' ListBucketsResponse Int +lbrsResponseStatus = lens _lbrsResponseStatus (\ s a -> s{_lbrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/ListMultipartUploads.hs b/gen/Network/AWS/S3/ListMultipartUploads.hs --- a/gen/Network/AWS/S3/ListMultipartUploads.hs +++ b/gen/Network/AWS/S3/ListMultipartUploads.hs @@ -32,8 +32,8 @@ , lmuKeyMarker , lmuPrefix , lmuEncodingType - , lmuMaxUploads , lmuUploadIdMarker + , lmuMaxUploads , lmuDelimiter , lmuBucket @@ -43,17 +43,17 @@ -- * Response Lenses , lmursKeyMarker , lmursPrefix - , lmursEncodingType , lmursCommonPrefixes + , lmursEncodingType , lmursBucket - , lmursMaxUploads , lmursUploadIdMarker + , lmursMaxUploads , lmursNextKeyMarker , lmursUploads , lmursIsTruncated , lmursNextUploadIdMarker , lmursDelimiter - , lmursStatus + , lmursResponseStatus ) where import Network.AWS.Pager @@ -68,8 +68,8 @@ { _lmuKeyMarker :: !(Maybe Text) , _lmuPrefix :: !(Maybe Text) , _lmuEncodingType :: !(Maybe EncodingType) - , _lmuMaxUploads :: !(Maybe Int) , _lmuUploadIdMarker :: !(Maybe Text) + , _lmuMaxUploads :: !(Maybe Int) , _lmuDelimiter :: !(Maybe Delimiter) , _lmuBucket :: !BucketName } deriving (Eq,Read,Show,Data,Typeable,Generic) @@ -84,10 +84,10 @@ -- -- * 'lmuEncodingType' -- --- * 'lmuMaxUploads' --- -- * 'lmuUploadIdMarker' -- +-- * 'lmuMaxUploads' +-- -- * 'lmuDelimiter' -- -- * 'lmuBucket' @@ -99,8 +99,8 @@ { _lmuKeyMarker = Nothing , _lmuPrefix = Nothing , _lmuEncodingType = Nothing - , _lmuMaxUploads = Nothing , _lmuUploadIdMarker = Nothing + , _lmuMaxUploads = Nothing , _lmuDelimiter = Nothing , _lmuBucket = pBucket_ } @@ -119,18 +119,18 @@ lmuEncodingType :: Lens' ListMultipartUploads (Maybe EncodingType) lmuEncodingType = lens _lmuEncodingType (\ s a -> s{_lmuEncodingType = a}); --- | Sets the maximum number of multipart uploads, from 1 to 1,000, to return --- in the response body. 1,000 is the maximum number of uploads that can be --- returned in a response. -lmuMaxUploads :: Lens' ListMultipartUploads (Maybe Int) -lmuMaxUploads = lens _lmuMaxUploads (\ s a -> s{_lmuMaxUploads = a}); - -- | Together with key-marker, specifies the multipart upload after which -- listing should begin. If key-marker is not specified, the -- upload-id-marker parameter is ignored. lmuUploadIdMarker :: Lens' ListMultipartUploads (Maybe Text) lmuUploadIdMarker = lens _lmuUploadIdMarker (\ s a -> s{_lmuUploadIdMarker = a}); +-- | Sets the maximum number of multipart uploads, from 1 to 1,000, to return +-- in the response body. 1,000 is the maximum number of uploads that can be +-- returned in a response. +lmuMaxUploads :: Lens' ListMultipartUploads (Maybe Int) +lmuMaxUploads = lens _lmuMaxUploads (\ s a -> s{_lmuMaxUploads = a}); + -- | Character you use to group keys. lmuDelimiter :: Lens' ListMultipartUploads (Maybe Delimiter) lmuDelimiter = lens _lmuDelimiter (\ s a -> s{_lmuDelimiter = a}); @@ -158,11 +158,11 @@ (\ s h x -> ListMultipartUploadsResponse' <$> (x .@? "KeyMarker") <*> (x .@? "Prefix") <*> - (x .@? "EncodingType") - <*> (may (parseXMLList "CommonPrefixes") x) + (may (parseXMLList "CommonPrefixes") x) + <*> (x .@? "EncodingType") <*> (x .@? "Bucket") - <*> (x .@? "MaxUploads") <*> (x .@? "UploadIdMarker") + <*> (x .@? "MaxUploads") <*> (x .@? "NextKeyMarker") <*> (may (parseXMLList "Upload") x) <*> (x .@? "IsTruncated") @@ -183,25 +183,25 @@ ["key-marker" =: _lmuKeyMarker, "prefix" =: _lmuPrefix, "encoding-type" =: _lmuEncodingType, - "max-uploads" =: _lmuMaxUploads, "upload-id-marker" =: _lmuUploadIdMarker, + "max-uploads" =: _lmuMaxUploads, "delimiter" =: _lmuDelimiter, "uploads"] -- | /See:/ 'listMultipartUploadsResponse' smart constructor. data ListMultipartUploadsResponse = ListMultipartUploadsResponse' { _lmursKeyMarker :: !(Maybe Text) , _lmursPrefix :: !(Maybe Text) - , _lmursEncodingType :: !(Maybe EncodingType) , _lmursCommonPrefixes :: !(Maybe [CommonPrefix]) + , _lmursEncodingType :: !(Maybe EncodingType) , _lmursBucket :: !(Maybe BucketName) - , _lmursMaxUploads :: !(Maybe Int) , _lmursUploadIdMarker :: !(Maybe Text) + , _lmursMaxUploads :: !(Maybe Int) , _lmursNextKeyMarker :: !(Maybe Text) , _lmursUploads :: !(Maybe [MultipartUpload]) , _lmursIsTruncated :: !(Maybe Bool) , _lmursNextUploadIdMarker :: !(Maybe Text) , _lmursDelimiter :: !(Maybe Delimiter) - , _lmursStatus :: !Int + , _lmursResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListMultipartUploadsResponse' with the minimum fields required to make a request. @@ -212,16 +212,16 @@ -- -- * 'lmursPrefix' -- --- * 'lmursEncodingType' --- -- * 'lmursCommonPrefixes' -- --- * 'lmursBucket' +-- * 'lmursEncodingType' -- --- * 'lmursMaxUploads' +-- * 'lmursBucket' -- -- * 'lmursUploadIdMarker' -- +-- * 'lmursMaxUploads' +-- -- * 'lmursNextKeyMarker' -- -- * 'lmursUploads' @@ -232,25 +232,25 @@ -- -- * 'lmursDelimiter' -- --- * 'lmursStatus' +-- * 'lmursResponseStatus' listMultipartUploadsResponse - :: Int -- ^ 'lmursStatus' + :: Int -- ^ 'lmursResponseStatus' -> ListMultipartUploadsResponse -listMultipartUploadsResponse pStatus_ = +listMultipartUploadsResponse pResponseStatus_ = ListMultipartUploadsResponse' { _lmursKeyMarker = Nothing , _lmursPrefix = Nothing - , _lmursEncodingType = Nothing , _lmursCommonPrefixes = Nothing + , _lmursEncodingType = Nothing , _lmursBucket = Nothing - , _lmursMaxUploads = Nothing , _lmursUploadIdMarker = Nothing + , _lmursMaxUploads = Nothing , _lmursNextKeyMarker = Nothing , _lmursUploads = Nothing , _lmursIsTruncated = Nothing , _lmursNextUploadIdMarker = Nothing , _lmursDelimiter = Nothing - , _lmursStatus = pStatus_ + , _lmursResponseStatus = pResponseStatus_ } -- | The key at or after which the listing began. @@ -263,27 +263,27 @@ lmursPrefix :: Lens' ListMultipartUploadsResponse (Maybe Text) lmursPrefix = lens _lmursPrefix (\ s a -> s{_lmursPrefix = a}); --- | Encoding type used by Amazon S3 to encode object keys in the response. -lmursEncodingType :: Lens' ListMultipartUploadsResponse (Maybe EncodingType) -lmursEncodingType = lens _lmursEncodingType (\ s a -> s{_lmursEncodingType = a}); - -- | Undocumented member. lmursCommonPrefixes :: Lens' ListMultipartUploadsResponse [CommonPrefix] lmursCommonPrefixes = lens _lmursCommonPrefixes (\ s a -> s{_lmursCommonPrefixes = a}) . _Default . _Coerce; +-- | Encoding type used by Amazon S3 to encode object keys in the response. +lmursEncodingType :: Lens' ListMultipartUploadsResponse (Maybe EncodingType) +lmursEncodingType = lens _lmursEncodingType (\ s a -> s{_lmursEncodingType = a}); + -- | Name of the bucket to which the multipart upload was initiated. lmursBucket :: Lens' ListMultipartUploadsResponse (Maybe BucketName) lmursBucket = lens _lmursBucket (\ s a -> s{_lmursBucket = a}); +-- | Upload ID after which listing began. +lmursUploadIdMarker :: Lens' ListMultipartUploadsResponse (Maybe Text) +lmursUploadIdMarker = lens _lmursUploadIdMarker (\ s a -> s{_lmursUploadIdMarker = a}); + -- | Maximum number of multipart uploads that could have been included in the -- response. lmursMaxUploads :: Lens' ListMultipartUploadsResponse (Maybe Int) lmursMaxUploads = lens _lmursMaxUploads (\ s a -> s{_lmursMaxUploads = a}); --- | Upload ID after which listing began. -lmursUploadIdMarker :: Lens' ListMultipartUploadsResponse (Maybe Text) -lmursUploadIdMarker = lens _lmursUploadIdMarker (\ s a -> s{_lmursUploadIdMarker = a}); - -- | When a list is truncated, this element specifies the value that should -- be used for the key-marker request parameter in a subsequent request. lmursNextKeyMarker :: Lens' ListMultipartUploadsResponse (Maybe Text) @@ -311,5 +311,5 @@ lmursDelimiter = lens _lmursDelimiter (\ s a -> s{_lmursDelimiter = a}); -- | The response status code. -lmursStatus :: Lens' ListMultipartUploadsResponse Int -lmursStatus = lens _lmursStatus (\ s a -> s{_lmursStatus = a}); +lmursResponseStatus :: Lens' ListMultipartUploadsResponse Int +lmursResponseStatus = lens _lmursResponseStatus (\ s a -> s{_lmursResponseStatus = a}); diff --git a/gen/Network/AWS/S3/ListObjectVersions.hs b/gen/Network/AWS/S3/ListObjectVersions.hs --- a/gen/Network/AWS/S3/ListObjectVersions.hs +++ b/gen/Network/AWS/S3/ListObjectVersions.hs @@ -43,10 +43,10 @@ -- * Response Lenses , lovrsNextVersionIdMarker , lovrsKeyMarker - , lovrsPrefix , lovrsDeleteMarkers - , lovrsEncodingType + , lovrsPrefix , lovrsCommonPrefixes + , lovrsEncodingType , lovrsVersions , lovrsName , lovrsNextKeyMarker @@ -54,7 +54,7 @@ , lovrsMaxKeys , lovrsIsTruncated , lovrsDelimiter - , lovrsStatus + , lovrsResponseStatus ) where import Network.AWS.Pager @@ -155,10 +155,10 @@ (\ s h x -> ListObjectVersionsResponse' <$> (x .@? "NextVersionIdMarker") <*> (x .@? "KeyMarker") - <*> (x .@? "Prefix") <*> (may (parseXMLList "DeleteMarker") x) - <*> (x .@? "EncodingType") + <*> (x .@? "Prefix") <*> (may (parseXMLList "CommonPrefixes") x) + <*> (x .@? "EncodingType") <*> (may (parseXMLList "Version") x) <*> (x .@? "Name") <*> (x .@? "NextKeyMarker") @@ -189,10 +189,10 @@ data ListObjectVersionsResponse = ListObjectVersionsResponse' { _lovrsNextVersionIdMarker :: !(Maybe Text) , _lovrsKeyMarker :: !(Maybe Text) - , _lovrsPrefix :: !(Maybe Text) , _lovrsDeleteMarkers :: !(Maybe [DeleteMarkerEntry]) - , _lovrsEncodingType :: !(Maybe EncodingType) + , _lovrsPrefix :: !(Maybe Text) , _lovrsCommonPrefixes :: !(Maybe [CommonPrefix]) + , _lovrsEncodingType :: !(Maybe EncodingType) , _lovrsVersions :: !(Maybe [ObjectVersion]) , _lovrsName :: !(Maybe BucketName) , _lovrsNextKeyMarker :: !(Maybe Text) @@ -200,7 +200,7 @@ , _lovrsMaxKeys :: !(Maybe Int) , _lovrsIsTruncated :: !(Maybe Bool) , _lovrsDelimiter :: !(Maybe Delimiter) - , _lovrsStatus :: !Int + , _lovrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListObjectVersionsResponse' with the minimum fields required to make a request. @@ -211,14 +211,14 @@ -- -- * 'lovrsKeyMarker' -- --- * 'lovrsPrefix' --- -- * 'lovrsDeleteMarkers' -- --- * 'lovrsEncodingType' +-- * 'lovrsPrefix' -- -- * 'lovrsCommonPrefixes' -- +-- * 'lovrsEncodingType' +-- -- * 'lovrsVersions' -- -- * 'lovrsName' @@ -233,18 +233,18 @@ -- -- * 'lovrsDelimiter' -- --- * 'lovrsStatus' +-- * 'lovrsResponseStatus' listObjectVersionsResponse - :: Int -- ^ 'lovrsStatus' + :: Int -- ^ 'lovrsResponseStatus' -> ListObjectVersionsResponse -listObjectVersionsResponse pStatus_ = +listObjectVersionsResponse pResponseStatus_ = ListObjectVersionsResponse' { _lovrsNextVersionIdMarker = Nothing , _lovrsKeyMarker = Nothing - , _lovrsPrefix = Nothing , _lovrsDeleteMarkers = Nothing - , _lovrsEncodingType = Nothing + , _lovrsPrefix = Nothing , _lovrsCommonPrefixes = Nothing + , _lovrsEncodingType = Nothing , _lovrsVersions = Nothing , _lovrsName = Nothing , _lovrsNextKeyMarker = Nothing @@ -252,7 +252,7 @@ , _lovrsMaxKeys = Nothing , _lovrsIsTruncated = Nothing , _lovrsDelimiter = Nothing - , _lovrsStatus = pStatus_ + , _lovrsResponseStatus = pResponseStatus_ } -- | Use this value for the next version id marker parameter in a subsequent @@ -265,22 +265,22 @@ lovrsKeyMarker = lens _lovrsKeyMarker (\ s a -> s{_lovrsKeyMarker = a}); -- | Undocumented member. +lovrsDeleteMarkers :: Lens' ListObjectVersionsResponse [DeleteMarkerEntry] +lovrsDeleteMarkers = lens _lovrsDeleteMarkers (\ s a -> s{_lovrsDeleteMarkers = a}) . _Default . _Coerce; + +-- | Undocumented member. lovrsPrefix :: Lens' ListObjectVersionsResponse (Maybe Text) lovrsPrefix = lens _lovrsPrefix (\ s a -> s{_lovrsPrefix = a}); -- | Undocumented member. -lovrsDeleteMarkers :: Lens' ListObjectVersionsResponse [DeleteMarkerEntry] -lovrsDeleteMarkers = lens _lovrsDeleteMarkers (\ s a -> s{_lovrsDeleteMarkers = a}) . _Default . _Coerce; +lovrsCommonPrefixes :: Lens' ListObjectVersionsResponse [CommonPrefix] +lovrsCommonPrefixes = lens _lovrsCommonPrefixes (\ s a -> s{_lovrsCommonPrefixes = a}) . _Default . _Coerce; -- | Encoding type used by Amazon S3 to encode object keys in the response. lovrsEncodingType :: Lens' ListObjectVersionsResponse (Maybe EncodingType) lovrsEncodingType = lens _lovrsEncodingType (\ s a -> s{_lovrsEncodingType = a}); -- | Undocumented member. -lovrsCommonPrefixes :: Lens' ListObjectVersionsResponse [CommonPrefix] -lovrsCommonPrefixes = lens _lovrsCommonPrefixes (\ s a -> s{_lovrsCommonPrefixes = a}) . _Default . _Coerce; - --- | Undocumented member. lovrsVersions :: Lens' ListObjectVersionsResponse [ObjectVersion] lovrsVersions = lens _lovrsVersions (\ s a -> s{_lovrsVersions = a}) . _Default . _Coerce; @@ -314,5 +314,5 @@ lovrsDelimiter = lens _lovrsDelimiter (\ s a -> s{_lovrsDelimiter = a}); -- | The response status code. -lovrsStatus :: Lens' ListObjectVersionsResponse Int -lovrsStatus = lens _lovrsStatus (\ s a -> s{_lovrsStatus = a}); +lovrsResponseStatus :: Lens' ListObjectVersionsResponse Int +lovrsResponseStatus = lens _lovrsResponseStatus (\ s a -> s{_lovrsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/ListObjects.hs b/gen/Network/AWS/S3/ListObjects.hs --- a/gen/Network/AWS/S3/ListObjects.hs +++ b/gen/Network/AWS/S3/ListObjects.hs @@ -44,15 +44,15 @@ -- * Response Lenses , lorsContents , lorsPrefix - , lorsEncodingType , lorsCommonPrefixes + , lorsEncodingType , lorsName , lorsMarker , lorsNextMarker , lorsMaxKeys , lorsIsTruncated , lorsDelimiter - , lorsStatus + , lorsResponseStatus ) where import Network.AWS.Pager @@ -127,12 +127,12 @@ instance AWSPager ListObjects where page rq rs - | stop (rs ^. lorsIsTruncated) = Nothing - | isNothing + | stop (rs ^. choice (^. lorsNextMarker) (^? (lorsContents . _last . oKey))) = Nothing + | stop (rs ^. lorsContents) = Nothing | otherwise = Just $ rq & loMarker .~ @@ -149,8 +149,8 @@ ListObjectsResponse' <$> (may (parseXMLList "Contents") x) <*> (x .@? "Prefix") - <*> (x .@? "EncodingType") <*> (may (parseXMLList "CommonPrefixes") x) + <*> (x .@? "EncodingType") <*> (x .@? "Name") <*> (x .@? "Marker") <*> (x .@? "NextMarker") @@ -178,15 +178,15 @@ data ListObjectsResponse = ListObjectsResponse' { _lorsContents :: !(Maybe [Object]) , _lorsPrefix :: !(Maybe Text) - , _lorsEncodingType :: !(Maybe EncodingType) , _lorsCommonPrefixes :: !(Maybe [CommonPrefix]) + , _lorsEncodingType :: !(Maybe EncodingType) , _lorsName :: !(Maybe BucketName) , _lorsMarker :: !(Maybe Text) , _lorsNextMarker :: !(Maybe Text) , _lorsMaxKeys :: !(Maybe Int) , _lorsIsTruncated :: !(Maybe Bool) , _lorsDelimiter :: !(Maybe Delimiter) - , _lorsStatus :: !Int + , _lorsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListObjectsResponse' with the minimum fields required to make a request. @@ -197,10 +197,10 @@ -- -- * 'lorsPrefix' -- --- * 'lorsEncodingType' --- -- * 'lorsCommonPrefixes' -- +-- * 'lorsEncodingType' +-- -- * 'lorsName' -- -- * 'lorsMarker' @@ -213,23 +213,23 @@ -- -- * 'lorsDelimiter' -- --- * 'lorsStatus' +-- * 'lorsResponseStatus' listObjectsResponse - :: Int -- ^ 'lorsStatus' + :: Int -- ^ 'lorsResponseStatus' -> ListObjectsResponse -listObjectsResponse pStatus_ = +listObjectsResponse pResponseStatus_ = ListObjectsResponse' { _lorsContents = Nothing , _lorsPrefix = Nothing - , _lorsEncodingType = Nothing , _lorsCommonPrefixes = Nothing + , _lorsEncodingType = Nothing , _lorsName = Nothing , _lorsMarker = Nothing , _lorsNextMarker = Nothing , _lorsMaxKeys = Nothing , _lorsIsTruncated = Nothing , _lorsDelimiter = Nothing - , _lorsStatus = pStatus_ + , _lorsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -240,14 +240,14 @@ lorsPrefix :: Lens' ListObjectsResponse (Maybe Text) lorsPrefix = lens _lorsPrefix (\ s a -> s{_lorsPrefix = a}); --- | Encoding type used by Amazon S3 to encode object keys in the response. -lorsEncodingType :: Lens' ListObjectsResponse (Maybe EncodingType) -lorsEncodingType = lens _lorsEncodingType (\ s a -> s{_lorsEncodingType = a}); - -- | Undocumented member. lorsCommonPrefixes :: Lens' ListObjectsResponse [CommonPrefix] lorsCommonPrefixes = lens _lorsCommonPrefixes (\ s a -> s{_lorsCommonPrefixes = a}) . _Default . _Coerce; +-- | Encoding type used by Amazon S3 to encode object keys in the response. +lorsEncodingType :: Lens' ListObjectsResponse (Maybe EncodingType) +lorsEncodingType = lens _lorsEncodingType (\ s a -> s{_lorsEncodingType = a}); + -- | Undocumented member. lorsName :: Lens' ListObjectsResponse (Maybe BucketName) lorsName = lens _lorsName (\ s a -> s{_lorsName = a}); @@ -281,5 +281,5 @@ lorsDelimiter = lens _lorsDelimiter (\ s a -> s{_lorsDelimiter = a}); -- | The response status code. -lorsStatus :: Lens' ListObjectsResponse Int -lorsStatus = lens _lorsStatus (\ s a -> s{_lorsStatus = a}); +lorsResponseStatus :: Lens' ListObjectsResponse Int +lorsResponseStatus = lens _lorsResponseStatus (\ s a -> s{_lorsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/ListParts.hs b/gen/Network/AWS/S3/ListParts.hs --- a/gen/Network/AWS/S3/ListParts.hs +++ b/gen/Network/AWS/S3/ListParts.hs @@ -52,7 +52,7 @@ , lprsIsTruncated , lprsPartNumberMarker , lprsUploadId - , lprsStatus + , lprsResponseStatus ) where import Network.AWS.Pager @@ -129,9 +129,8 @@ instance AWSPager ListParts where page rq rs - | stop (rs ^. lprsIsTruncated) = Nothing - | isNothing (rs ^. lprsNextPartNumberMarker) = - Nothing + | stop (rs ^. lprsNextPartNumberMarker) = Nothing + | stop (rs ^. lprsParts) = Nothing | otherwise = Just $ rq & lpPartNumberMarker .~ rs ^. lprsNextPartNumberMarker @@ -186,7 +185,7 @@ , _lprsIsTruncated :: !(Maybe Bool) , _lprsPartNumberMarker :: !(Maybe Int) , _lprsUploadId :: !(Maybe Text) - , _lprsStatus :: !Int + , _lprsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListPartsResponse' with the minimum fields required to make a request. @@ -217,11 +216,11 @@ -- -- * 'lprsUploadId' -- --- * 'lprsStatus' +-- * 'lprsResponseStatus' listPartsResponse - :: Int -- ^ 'lprsStatus' + :: Int -- ^ 'lprsResponseStatus' -> ListPartsResponse -listPartsResponse pStatus_ = +listPartsResponse pResponseStatus_ = ListPartsResponse' { _lprsParts = Nothing , _lprsRequestCharged = Nothing @@ -235,7 +234,7 @@ , _lprsIsTruncated = Nothing , _lprsPartNumberMarker = Nothing , _lprsUploadId = Nothing - , _lprsStatus = pStatus_ + , _lprsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -289,5 +288,5 @@ lprsUploadId = lens _lprsUploadId (\ s a -> s{_lprsUploadId = a}); -- | The response status code. -lprsStatus :: Lens' ListPartsResponse Int -lprsStatus = lens _lprsStatus (\ s a -> s{_lprsStatus = a}); +lprsResponseStatus :: Lens' ListPartsResponse Int +lprsResponseStatus = lens _lprsResponseStatus (\ s a -> s{_lprsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/PutBucketCORS.hs b/gen/Network/AWS/S3/PutBucketCORS.hs --- a/gen/Network/AWS/S3/PutBucketCORS.hs +++ b/gen/Network/AWS/S3/PutBucketCORS.hs @@ -82,7 +82,7 @@ instance AWSRequest PutBucketCORS where type Rs PutBucketCORS = PutBucketCORSResponse - request = contentMD5 . putXML s3 + request = putXML s3 response = receiveNull PutBucketCORSResponse' instance ToElement PutBucketCORS where diff --git a/gen/Network/AWS/S3/PutObject.hs b/gen/Network/AWS/S3/PutObject.hs --- a/gen/Network/AWS/S3/PutObject.hs +++ b/gen/Network/AWS/S3/PutObject.hs @@ -29,20 +29,20 @@ -- * Request Lenses , poContentLength , poExpires - , poSSECustomerAlgorithm , poGrantReadACP + , poSSECustomerAlgorithm , poSSECustomerKey , poRequestPayer , poGrantWriteACP , poWebsiteRedirectLocation , poGrantRead , poStorageClass - , poContentEncoding + , poSSECustomerKeyMD5 , poSSEKMSKeyId , poGrantFullControl - , poSSECustomerKeyMD5 - , poMetadata + , poContentEncoding , poContentMD5 + , poMetadata , poCacheControl , poContentLanguage , poACL @@ -57,15 +57,15 @@ , putObjectResponse , PutObjectResponse -- * Response Lenses - , porsVersionId - , porsETag , porsRequestCharged + , porsETag + , porsVersionId , porsExpiration , porsSSECustomerAlgorithm - , porsSSEKMSKeyId , porsSSECustomerKeyMD5 + , porsSSEKMSKeyId , porsServerSideEncryption - , porsStatus + , porsResponseStatus ) where import Network.AWS.Prelude @@ -78,20 +78,20 @@ data PutObject = PutObject' { _poContentLength :: !(Maybe Int) , _poExpires :: !(Maybe RFC822) - , _poSSECustomerAlgorithm :: !(Maybe Text) , _poGrantReadACP :: !(Maybe Text) + , _poSSECustomerAlgorithm :: !(Maybe Text) , _poSSECustomerKey :: !(Maybe (Sensitive Text)) , _poRequestPayer :: !(Maybe RequestPayer) , _poGrantWriteACP :: !(Maybe Text) , _poWebsiteRedirectLocation :: !(Maybe Text) , _poGrantRead :: !(Maybe Text) , _poStorageClass :: !(Maybe StorageClass) - , _poContentEncoding :: !(Maybe Text) + , _poSSECustomerKeyMD5 :: !(Maybe Text) , _poSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _poGrantFullControl :: !(Maybe Text) - , _poSSECustomerKeyMD5 :: !(Maybe Text) - , _poMetadata :: !(Map Text Text) + , _poContentEncoding :: !(Maybe Text) , _poContentMD5 :: !(Maybe Text) + , _poMetadata :: !(Map Text Text) , _poCacheControl :: !(Maybe Text) , _poContentLanguage :: !(Maybe Text) , _poACL :: !(Maybe ObjectCannedACL) @@ -111,10 +111,10 @@ -- -- * 'poExpires' -- --- * 'poSSECustomerAlgorithm' --- -- * 'poGrantReadACP' -- +-- * 'poSSECustomerAlgorithm' +-- -- * 'poSSECustomerKey' -- -- * 'poRequestPayer' @@ -127,18 +127,18 @@ -- -- * 'poStorageClass' -- --- * 'poContentEncoding' +-- * 'poSSECustomerKeyMD5' -- -- * 'poSSEKMSKeyId' -- -- * 'poGrantFullControl' -- --- * 'poSSECustomerKeyMD5' --- --- * 'poMetadata' +-- * 'poContentEncoding' -- -- * 'poContentMD5' -- +-- * 'poMetadata' +-- -- * 'poCacheControl' -- -- * 'poContentLanguage' @@ -165,20 +165,20 @@ PutObject' { _poContentLength = Nothing , _poExpires = Nothing - , _poSSECustomerAlgorithm = Nothing , _poGrantReadACP = Nothing + , _poSSECustomerAlgorithm = Nothing , _poSSECustomerKey = Nothing , _poRequestPayer = Nothing , _poGrantWriteACP = Nothing , _poWebsiteRedirectLocation = Nothing , _poGrantRead = Nothing , _poStorageClass = Nothing - , _poContentEncoding = Nothing + , _poSSECustomerKeyMD5 = Nothing , _poSSEKMSKeyId = Nothing , _poGrantFullControl = Nothing - , _poSSECustomerKeyMD5 = Nothing - , _poMetadata = mempty + , _poContentEncoding = Nothing , _poContentMD5 = Nothing + , _poMetadata = mempty , _poCacheControl = Nothing , _poContentLanguage = Nothing , _poACL = Nothing @@ -199,15 +199,15 @@ poExpires :: Lens' PutObject (Maybe UTCTime) poExpires = lens _poExpires (\ s a -> s{_poExpires = a}) . mapping _Time; +-- | Allows grantee to read the object ACL. +poGrantReadACP :: Lens' PutObject (Maybe Text) +poGrantReadACP = lens _poGrantReadACP (\ s a -> s{_poGrantReadACP = a}); + -- | Specifies the algorithm to use to when encrypting the object (e.g., -- AES256). poSSECustomerAlgorithm :: Lens' PutObject (Maybe Text) poSSECustomerAlgorithm = lens _poSSECustomerAlgorithm (\ s a -> s{_poSSECustomerAlgorithm = a}); --- | Allows grantee to read the object ACL. -poGrantReadACP :: Lens' PutObject (Maybe Text) -poGrantReadACP = lens _poGrantReadACP (\ s a -> s{_poGrantReadACP = a}); - -- | Specifies the customer-provided encryption key for Amazon S3 to use in -- encrypting data. This value is used to store the object and then it is -- discarded; Amazon does not store the encryption key. The key must be @@ -238,11 +238,11 @@ poStorageClass :: Lens' PutObject (Maybe StorageClass) poStorageClass = lens _poStorageClass (\ s a -> s{_poStorageClass = a}); --- | Specifies what content encodings have been applied to the object and --- thus what decoding mechanisms must be applied to obtain the media-type --- referenced by the Content-Type header field. -poContentEncoding :: Lens' PutObject (Maybe Text) -poContentEncoding = lens _poContentEncoding (\ s a -> s{_poContentEncoding = a}); +-- | Specifies the 128-bit MD5 digest of the encryption key according to RFC +-- 1321. Amazon S3 uses this header for a message integrity check to ensure +-- the encryption key was transmitted without error. +poSSECustomerKeyMD5 :: Lens' PutObject (Maybe Text) +poSSECustomerKeyMD5 = lens _poSSECustomerKeyMD5 (\ s a -> s{_poSSECustomerKeyMD5 = a}); -- | Specifies the AWS KMS key ID to use for object encryption. All GET and -- PUT requests for an object protected by AWS KMS will fail if not made @@ -257,20 +257,20 @@ poGrantFullControl :: Lens' PutObject (Maybe Text) poGrantFullControl = lens _poGrantFullControl (\ s a -> s{_poGrantFullControl = a}); --- | Specifies the 128-bit MD5 digest of the encryption key according to RFC --- 1321. Amazon S3 uses this header for a message integrity check to ensure --- the encryption key was transmitted without error. -poSSECustomerKeyMD5 :: Lens' PutObject (Maybe Text) -poSSECustomerKeyMD5 = lens _poSSECustomerKeyMD5 (\ s a -> s{_poSSECustomerKeyMD5 = a}); - --- | A map of metadata to store with the object in S3. -poMetadata :: Lens' PutObject (HashMap Text Text) -poMetadata = lens _poMetadata (\ s a -> s{_poMetadata = a}) . _Map; +-- | Specifies what content encodings have been applied to the object and +-- thus what decoding mechanisms must be applied to obtain the media-type +-- referenced by the Content-Type header field. +poContentEncoding :: Lens' PutObject (Maybe Text) +poContentEncoding = lens _poContentEncoding (\ s a -> s{_poContentEncoding = a}); -- | Undocumented member. poContentMD5 :: Lens' PutObject (Maybe Text) poContentMD5 = lens _poContentMD5 (\ s a -> s{_poContentMD5 = a}); +-- | A map of metadata to store with the object in S3. +poMetadata :: Lens' PutObject (HashMap Text Text) +poMetadata = lens _poMetadata (\ s a -> s{_poMetadata = a}) . _Map; + -- | Specifies caching behavior along the request\/reply chain. poCacheControl :: Lens' PutObject (Maybe Text) poCacheControl = lens _poCacheControl (\ s a -> s{_poCacheControl = a}); @@ -315,17 +315,17 @@ = receiveEmpty (\ s h x -> PutObjectResponse' <$> - (h .#? "x-amz-version-id") <*> (h .#? "ETag") <*> - (h .#? "x-amz-request-charged") + (h .#? "x-amz-request-charged") <*> (h .#? "ETag") + <*> (h .#? "x-amz-version-id") <*> (h .#? "x-amz-expiration") <*> (h .#? "x-amz-server-side-encryption-customer-algorithm") <*> - (h .#? "x-amz-server-side-encryption-aws-kms-key-id") - <*> (h .#? "x-amz-server-side-encryption-customer-key-MD5") + <*> + (h .#? "x-amz-server-side-encryption-aws-kms-key-id") <*> (h .#? "x-amz-server-side-encryption") <*> (pure (fromEnum s))) @@ -337,9 +337,9 @@ = mconcat ["Content-Length" =# _poContentLength, "Expires" =# _poExpires, + "x-amz-grant-read-acp" =# _poGrantReadACP, "x-amz-server-side-encryption-customer-algorithm" =# _poSSECustomerAlgorithm, - "x-amz-grant-read-acp" =# _poGrantReadACP, "x-amz-server-side-encryption-customer-key" =# _poSSECustomerKey, "x-amz-request-payer" =# _poRequestPayer, @@ -348,14 +348,14 @@ _poWebsiteRedirectLocation, "x-amz-grant-read" =# _poGrantRead, "x-amz-storage-class" =# _poStorageClass, - "Content-Encoding" =# _poContentEncoding, + "x-amz-server-side-encryption-customer-key-MD5" =# + _poSSECustomerKeyMD5, "x-amz-server-side-encryption-aws-kms-key-id" =# _poSSEKMSKeyId, "x-amz-grant-full-control" =# _poGrantFullControl, - "x-amz-server-side-encryption-customer-key-MD5" =# - _poSSECustomerKeyMD5, - "x-amz-meta-" =# _poMetadata, + "Content-Encoding" =# _poContentEncoding, "Content-MD5" =# _poContentMD5, + "x-amz-meta-" =# _poMetadata, "Cache-Control" =# _poCacheControl, "Content-Language" =# _poContentLanguage, "x-amz-acl" =# _poACL, @@ -373,65 +373,65 @@ -- | /See:/ 'putObjectResponse' smart constructor. data PutObjectResponse = PutObjectResponse' - { _porsVersionId :: !(Maybe ObjectVersionId) + { _porsRequestCharged :: !(Maybe RequestCharged) , _porsETag :: !(Maybe ETag) - , _porsRequestCharged :: !(Maybe RequestCharged) + , _porsVersionId :: !(Maybe ObjectVersionId) , _porsExpiration :: !(Maybe Text) , _porsSSECustomerAlgorithm :: !(Maybe Text) - , _porsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _porsSSECustomerKeyMD5 :: !(Maybe Text) + , _porsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _porsServerSideEncryption :: !(Maybe ServerSideEncryption) - , _porsStatus :: !Int + , _porsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'PutObjectResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'porsVersionId' +-- * 'porsRequestCharged' -- -- * 'porsETag' -- --- * 'porsRequestCharged' +-- * 'porsVersionId' -- -- * 'porsExpiration' -- -- * 'porsSSECustomerAlgorithm' -- --- * 'porsSSEKMSKeyId' --- -- * 'porsSSECustomerKeyMD5' -- +-- * 'porsSSEKMSKeyId' +-- -- * 'porsServerSideEncryption' -- --- * 'porsStatus' +-- * 'porsResponseStatus' putObjectResponse - :: Int -- ^ 'porsStatus' + :: Int -- ^ 'porsResponseStatus' -> PutObjectResponse -putObjectResponse pStatus_ = +putObjectResponse pResponseStatus_ = PutObjectResponse' - { _porsVersionId = Nothing + { _porsRequestCharged = Nothing , _porsETag = Nothing - , _porsRequestCharged = Nothing + , _porsVersionId = Nothing , _porsExpiration = Nothing , _porsSSECustomerAlgorithm = Nothing - , _porsSSEKMSKeyId = Nothing , _porsSSECustomerKeyMD5 = Nothing + , _porsSSEKMSKeyId = Nothing , _porsServerSideEncryption = Nothing - , _porsStatus = pStatus_ + , _porsResponseStatus = pResponseStatus_ } --- | Version of the object. -porsVersionId :: Lens' PutObjectResponse (Maybe ObjectVersionId) -porsVersionId = lens _porsVersionId (\ s a -> s{_porsVersionId = a}); +-- | Undocumented member. +porsRequestCharged :: Lens' PutObjectResponse (Maybe RequestCharged) +porsRequestCharged = lens _porsRequestCharged (\ s a -> s{_porsRequestCharged = a}); -- | Entity tag for the uploaded object. porsETag :: Lens' PutObjectResponse (Maybe ETag) porsETag = lens _porsETag (\ s a -> s{_porsETag = a}); --- | Undocumented member. -porsRequestCharged :: Lens' PutObjectResponse (Maybe RequestCharged) -porsRequestCharged = lens _porsRequestCharged (\ s a -> s{_porsRequestCharged = a}); +-- | Version of the object. +porsVersionId :: Lens' PutObjectResponse (Maybe ObjectVersionId) +porsVersionId = lens _porsVersionId (\ s a -> s{_porsVersionId = 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 @@ -445,22 +445,22 @@ porsSSECustomerAlgorithm :: Lens' PutObjectResponse (Maybe Text) porsSSECustomerAlgorithm = lens _porsSSECustomerAlgorithm (\ s a -> s{_porsSSECustomerAlgorithm = a}); --- | If present, specifies the ID of the AWS Key Management Service (KMS) --- master encryption key that was used for the object. -porsSSEKMSKeyId :: Lens' PutObjectResponse (Maybe Text) -porsSSEKMSKeyId = lens _porsSSEKMSKeyId (\ s a -> s{_porsSSEKMSKeyId = a}) . mapping _Sensitive; - -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header to provide round trip -- message integrity verification of the customer-provided encryption key. porsSSECustomerKeyMD5 :: Lens' PutObjectResponse (Maybe Text) porsSSECustomerKeyMD5 = lens _porsSSECustomerKeyMD5 (\ s a -> s{_porsSSECustomerKeyMD5 = a}); +-- | If present, specifies the ID of the AWS Key Management Service (KMS) +-- master encryption key that was used for the object. +porsSSEKMSKeyId :: Lens' PutObjectResponse (Maybe Text) +porsSSEKMSKeyId = lens _porsSSEKMSKeyId (\ s a -> s{_porsSSEKMSKeyId = a}) . mapping _Sensitive; + -- | The Server-side encryption algorithm used when storing this object in S3 -- (e.g., AES256, aws:kms). porsServerSideEncryption :: Lens' PutObjectResponse (Maybe ServerSideEncryption) porsServerSideEncryption = lens _porsServerSideEncryption (\ s a -> s{_porsServerSideEncryption = a}); -- | The response status code. -porsStatus :: Lens' PutObjectResponse Int -porsStatus = lens _porsStatus (\ s a -> s{_porsStatus = a}); +porsResponseStatus :: Lens' PutObjectResponse Int +porsResponseStatus = lens _porsResponseStatus (\ s a -> s{_porsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/PutObjectACL.hs b/gen/Network/AWS/S3/PutObjectACL.hs --- a/gen/Network/AWS/S3/PutObjectACL.hs +++ b/gen/Network/AWS/S3/PutObjectACL.hs @@ -45,7 +45,7 @@ , PutObjectACLResponse -- * Response Lenses , poarsRequestCharged - , poarsStatus + , poarsResponseStatus ) where import Network.AWS.Prelude @@ -198,7 +198,7 @@ -- | /See:/ 'putObjectACLResponse' smart constructor. data PutObjectACLResponse = PutObjectACLResponse' { _poarsRequestCharged :: !(Maybe RequestCharged) - , _poarsStatus :: !Int + , _poarsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'PutObjectACLResponse' with the minimum fields required to make a request. @@ -207,14 +207,14 @@ -- -- * 'poarsRequestCharged' -- --- * 'poarsStatus' +-- * 'poarsResponseStatus' putObjectACLResponse - :: Int -- ^ 'poarsStatus' + :: Int -- ^ 'poarsResponseStatus' -> PutObjectACLResponse -putObjectACLResponse pStatus_ = +putObjectACLResponse pResponseStatus_ = PutObjectACLResponse' { _poarsRequestCharged = Nothing - , _poarsStatus = pStatus_ + , _poarsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -222,5 +222,5 @@ poarsRequestCharged = lens _poarsRequestCharged (\ s a -> s{_poarsRequestCharged = a}); -- | The response status code. -poarsStatus :: Lens' PutObjectACLResponse Int -poarsStatus = lens _poarsStatus (\ s a -> s{_poarsStatus = a}); +poarsResponseStatus :: Lens' PutObjectACLResponse Int +poarsResponseStatus = lens _poarsResponseStatus (\ s a -> s{_poarsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/RestoreObject.hs b/gen/Network/AWS/S3/RestoreObject.hs --- a/gen/Network/AWS/S3/RestoreObject.hs +++ b/gen/Network/AWS/S3/RestoreObject.hs @@ -38,7 +38,7 @@ , RestoreObjectResponse -- * Response Lenses , rorsRequestCharged - , rorsStatus + , rorsResponseStatus ) where import Network.AWS.Prelude @@ -134,7 +134,7 @@ -- | /See:/ 'restoreObjectResponse' smart constructor. data RestoreObjectResponse = RestoreObjectResponse' { _rorsRequestCharged :: !(Maybe RequestCharged) - , _rorsStatus :: !Int + , _rorsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'RestoreObjectResponse' with the minimum fields required to make a request. @@ -143,14 +143,14 @@ -- -- * 'rorsRequestCharged' -- --- * 'rorsStatus' +-- * 'rorsResponseStatus' restoreObjectResponse - :: Int -- ^ 'rorsStatus' + :: Int -- ^ 'rorsResponseStatus' -> RestoreObjectResponse -restoreObjectResponse pStatus_ = +restoreObjectResponse pResponseStatus_ = RestoreObjectResponse' { _rorsRequestCharged = Nothing - , _rorsStatus = pStatus_ + , _rorsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -158,5 +158,5 @@ rorsRequestCharged = lens _rorsRequestCharged (\ s a -> s{_rorsRequestCharged = a}); -- | The response status code. -rorsStatus :: Lens' RestoreObjectResponse Int -rorsStatus = lens _rorsStatus (\ s a -> s{_rorsStatus = a}); +rorsResponseStatus :: Lens' RestoreObjectResponse Int +rorsResponseStatus = lens _rorsResponseStatus (\ s a -> s{_rorsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/Types.hs b/gen/Network/AWS/S3/Types.hs --- a/gen/Network/AWS/S3/Types.hs +++ b/gen/Network/AWS/S3/Types.hs @@ -218,8 +218,8 @@ , grantee , gURI , gEmailAddress - , gId , gDisplayName + , gId , gType -- * IndexDocument @@ -230,8 +230,8 @@ -- * Initiator , Initiator , initiator - , iId , iDisplayName + , iId -- * LambdaFunctionConfiguration , LambdaFunctionConfiguration @@ -311,8 +311,8 @@ -- * ObjectVersion , ObjectVersion , objectVersion - , ovVersionId , ovETag + , ovVersionId , ovSize , ovIsLatest , ovOwner @@ -323,8 +323,8 @@ -- * Owner , Owner , owner - , oId , oDisplayName + , oId -- * Part , Part @@ -454,8 +454,8 @@ , websiteConfiguration , wcRedirectAllRequestsTo , wcErrorDocument - , wcRoutingRules , wcIndexDocument + , wcRoutingRules ) where import Network.AWS.Prelude diff --git a/gen/Network/AWS/S3/Types/Product.hs b/gen/Network/AWS/S3/Types/Product.hs --- a/gen/Network/AWS/S3/Types/Product.hs +++ b/gen/Network/AWS/S3/Types/Product.hs @@ -753,8 +753,8 @@ data Grantee = Grantee' { _gURI :: !(Maybe Text) , _gEmailAddress :: !(Maybe Text) - , _gId :: !(Maybe Text) , _gDisplayName :: !(Maybe Text) + , _gId :: !(Maybe Text) , _gType :: !Type } deriving (Eq,Read,Show,Data,Typeable,Generic) @@ -766,10 +766,10 @@ -- -- * 'gEmailAddress' -- --- * 'gId' --- -- * 'gDisplayName' -- +-- * 'gId' +-- -- * 'gType' grantee :: Type -- ^ 'gType' @@ -778,8 +778,8 @@ Grantee' { _gURI = Nothing , _gEmailAddress = Nothing - , _gId = Nothing , _gDisplayName = Nothing + , _gId = Nothing , _gType = pType_ } @@ -791,14 +791,14 @@ gEmailAddress :: Lens' Grantee (Maybe Text) gEmailAddress = lens _gEmailAddress (\ s a -> s{_gEmailAddress = a}); --- | The canonical user ID of the grantee. -gId :: Lens' Grantee (Maybe Text) -gId = lens _gId (\ s a -> s{_gId = a}); - -- | Screen name of the grantee. gDisplayName :: Lens' Grantee (Maybe Text) gDisplayName = lens _gDisplayName (\ s a -> s{_gDisplayName = a}); +-- | The canonical user ID of the grantee. +gId :: Lens' Grantee (Maybe Text) +gId = lens _gId (\ s a -> s{_gId = a}); + -- | Type of grantee gType :: Lens' Grantee Type gType = lens _gType (\ s a -> s{_gType = a}); @@ -807,15 +807,15 @@ parseXML x = Grantee' <$> (x .@? "URI") <*> (x .@? "EmailAddress") <*> - (x .@? "ID") - <*> (x .@? "DisplayName") + (x .@? "DisplayName") + <*> (x .@? "ID") <*> (x .@ "xsi:type") instance ToXML Grantee where toXML Grantee'{..} = mconcat ["URI" @= _gURI, "EmailAddress" @= _gEmailAddress, - "ID" @= _gId, "DisplayName" @= _gDisplayName, + "DisplayName" @= _gDisplayName, "ID" @= _gId, "xsi:type" @= _gType] -- | /See:/ 'indexDocument' smart constructor. @@ -853,38 +853,38 @@ -- | /See:/ 'initiator' smart constructor. data Initiator = Initiator' - { _iId :: !(Maybe Text) - , _iDisplayName :: !(Maybe Text) + { _iDisplayName :: !(Maybe Text) + , _iId :: !(Maybe Text) } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'Initiator' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'iId' --- -- * 'iDisplayName' +-- +-- * 'iId' initiator :: Initiator initiator = Initiator' - { _iId = Nothing - , _iDisplayName = Nothing + { _iDisplayName = Nothing + , _iId = Nothing } +-- | Name of the Principal. +iDisplayName :: Lens' Initiator (Maybe Text) +iDisplayName = lens _iDisplayName (\ s a -> s{_iDisplayName = a}); + -- | If the principal is an AWS account, it provides the Canonical User ID. -- If the principal is an IAM User, it provides a user ARN value. iId :: Lens' Initiator (Maybe Text) iId = lens _iId (\ s a -> s{_iId = a}); --- | Name of the Principal. -iDisplayName :: Lens' Initiator (Maybe Text) -iDisplayName = lens _iDisplayName (\ s a -> s{_iDisplayName = a}); - instance FromXML Initiator where parseXML x = Initiator' <$> - (x .@? "ID") <*> (x .@? "DisplayName") + (x .@? "DisplayName") <*> (x .@? "ID") -- | Container for specifying the AWS Lambda notification configuration. -- @@ -1444,8 +1444,8 @@ -- | /See:/ 'objectVersion' smart constructor. data ObjectVersion = ObjectVersion' - { _ovVersionId :: !(Maybe ObjectVersionId) - , _ovETag :: !(Maybe ETag) + { _ovETag :: !(Maybe ETag) + , _ovVersionId :: !(Maybe ObjectVersionId) , _ovSize :: !(Maybe Int) , _ovIsLatest :: !(Maybe Bool) , _ovOwner :: !(Maybe Owner) @@ -1458,10 +1458,10 @@ -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'ovVersionId' --- -- * 'ovETag' -- +-- * 'ovVersionId' +-- -- * 'ovSize' -- -- * 'ovIsLatest' @@ -1477,8 +1477,8 @@ :: ObjectVersion objectVersion = ObjectVersion' - { _ovVersionId = Nothing - , _ovETag = Nothing + { _ovETag = Nothing + , _ovVersionId = Nothing , _ovSize = Nothing , _ovIsLatest = Nothing , _ovOwner = Nothing @@ -1487,14 +1487,14 @@ , _ovLastModified = Nothing } --- | Version ID of an object. -ovVersionId :: Lens' ObjectVersion (Maybe ObjectVersionId) -ovVersionId = lens _ovVersionId (\ s a -> s{_ovVersionId = a}); - -- | Undocumented member. ovETag :: Lens' ObjectVersion (Maybe ETag) ovETag = lens _ovETag (\ s a -> s{_ovETag = a}); +-- | Version ID of an object. +ovVersionId :: Lens' ObjectVersion (Maybe ObjectVersionId) +ovVersionId = lens _ovVersionId (\ s a -> s{_ovVersionId = a}); + -- | Size in bytes of the object. ovSize :: Lens' ObjectVersion (Maybe Int) ovSize = lens _ovSize (\ s a -> s{_ovSize = a}); @@ -1523,7 +1523,7 @@ instance FromXML ObjectVersion where parseXML x = ObjectVersion' <$> - (x .@? "VersionId") <*> (x .@? "ETag") <*> + (x .@? "ETag") <*> (x .@? "VersionId") <*> (x .@? "Size") <*> (x .@? "IsLatest") <*> (x .@? "Owner") @@ -1533,41 +1533,41 @@ -- | /See:/ 'owner' smart constructor. data Owner = Owner' - { _oId :: !(Maybe Text) - , _oDisplayName :: !(Maybe Text) + { _oDisplayName :: !(Maybe Text) + , _oId :: !(Maybe Text) } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'Owner' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'oId' --- -- * 'oDisplayName' +-- +-- * 'oId' owner :: Owner owner = Owner' - { _oId = Nothing - , _oDisplayName = Nothing + { _oDisplayName = Nothing + , _oId = Nothing } -- | Undocumented member. -oId :: Lens' Owner (Maybe Text) -oId = lens _oId (\ s a -> s{_oId = a}); - --- | Undocumented member. oDisplayName :: Lens' Owner (Maybe Text) oDisplayName = lens _oDisplayName (\ s a -> s{_oDisplayName = a}); +-- | Undocumented member. +oId :: Lens' Owner (Maybe Text) +oId = lens _oId (\ s a -> s{_oId = a}); + instance FromXML Owner where parseXML x - = Owner' <$> (x .@? "ID") <*> (x .@? "DisplayName") + = Owner' <$> (x .@? "DisplayName") <*> (x .@? "ID") instance ToXML Owner where toXML Owner'{..} = mconcat - ["ID" @= _oId, "DisplayName" @= _oDisplayName] + ["DisplayName" @= _oDisplayName, "ID" @= _oId] -- | /See:/ 'part' smart constructor. data Part = Part' @@ -2452,8 +2452,8 @@ data WebsiteConfiguration = WebsiteConfiguration' { _wcRedirectAllRequestsTo :: !(Maybe RedirectAllRequestsTo) , _wcErrorDocument :: !(Maybe ErrorDocument) - , _wcRoutingRules :: !(Maybe [RoutingRule]) , _wcIndexDocument :: !(Maybe IndexDocument) + , _wcRoutingRules :: !(Maybe [RoutingRule]) } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'WebsiteConfiguration' with the minimum fields required to make a request. @@ -2464,17 +2464,17 @@ -- -- * 'wcErrorDocument' -- --- * 'wcRoutingRules' --- -- * 'wcIndexDocument' +-- +-- * 'wcRoutingRules' websiteConfiguration :: WebsiteConfiguration websiteConfiguration = WebsiteConfiguration' { _wcRedirectAllRequestsTo = Nothing , _wcErrorDocument = Nothing - , _wcRoutingRules = Nothing , _wcIndexDocument = Nothing + , _wcRoutingRules = Nothing } -- | Undocumented member. @@ -2486,18 +2486,18 @@ wcErrorDocument = lens _wcErrorDocument (\ s a -> s{_wcErrorDocument = a}); -- | Undocumented member. -wcRoutingRules :: Lens' WebsiteConfiguration [RoutingRule] -wcRoutingRules = lens _wcRoutingRules (\ s a -> s{_wcRoutingRules = a}) . _Default . _Coerce; - --- | Undocumented member. wcIndexDocument :: Lens' WebsiteConfiguration (Maybe IndexDocument) wcIndexDocument = lens _wcIndexDocument (\ s a -> s{_wcIndexDocument = a}); +-- | Undocumented member. +wcRoutingRules :: Lens' WebsiteConfiguration [RoutingRule] +wcRoutingRules = lens _wcRoutingRules (\ s a -> s{_wcRoutingRules = a}) . _Default . _Coerce; + instance ToXML WebsiteConfiguration where toXML WebsiteConfiguration'{..} = mconcat ["RedirectAllRequestsTo" @= _wcRedirectAllRequestsTo, "ErrorDocument" @= _wcErrorDocument, + "IndexDocument" @= _wcIndexDocument, "RoutingRules" @= - toXML (toXMLList "RoutingRule" <$> _wcRoutingRules), - "IndexDocument" @= _wcIndexDocument] + toXML (toXMLList "RoutingRule" <$> _wcRoutingRules)] diff --git a/gen/Network/AWS/S3/UploadPart.hs b/gen/Network/AWS/S3/UploadPart.hs --- a/gen/Network/AWS/S3/UploadPart.hs +++ b/gen/Network/AWS/S3/UploadPart.hs @@ -49,13 +49,13 @@ , uploadPartResponse , UploadPartResponse -- * Response Lenses - , uprsETag , uprsRequestCharged + , uprsETag , uprsSSECustomerAlgorithm - , uprsSSEKMSKeyId , uprsSSECustomerKeyMD5 + , uprsSSEKMSKeyId , uprsServerSideEncryption - , uprsStatus + , uprsResponseStatus ) where import Network.AWS.Prelude @@ -188,15 +188,15 @@ = receiveEmpty (\ s h x -> UploadPartResponse' <$> - (h .#? "ETag") <*> (h .#? "x-amz-request-charged") + (h .#? "x-amz-request-charged") <*> (h .#? "ETag") <*> (h .#? "x-amz-server-side-encryption-customer-algorithm") <*> - (h .#? "x-amz-server-side-encryption-aws-kms-key-id") - <*> (h .#? "x-amz-server-side-encryption-customer-key-MD5") + <*> + (h .#? "x-amz-server-side-encryption-aws-kms-key-id") <*> (h .#? "x-amz-server-side-encryption") <*> (pure (fromEnum s))) @@ -228,76 +228,76 @@ -- | /See:/ 'uploadPartResponse' smart constructor. data UploadPartResponse = UploadPartResponse' - { _uprsETag :: !(Maybe ETag) - , _uprsRequestCharged :: !(Maybe RequestCharged) + { _uprsRequestCharged :: !(Maybe RequestCharged) + , _uprsETag :: !(Maybe ETag) , _uprsSSECustomerAlgorithm :: !(Maybe Text) - , _uprsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _uprsSSECustomerKeyMD5 :: !(Maybe Text) + , _uprsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _uprsServerSideEncryption :: !(Maybe ServerSideEncryption) - , _uprsStatus :: !Int + , _uprsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'UploadPartResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'uprsETag' --- -- * 'uprsRequestCharged' -- --- * 'uprsSSECustomerAlgorithm' +-- * 'uprsETag' -- --- * 'uprsSSEKMSKeyId' +-- * 'uprsSSECustomerAlgorithm' -- -- * 'uprsSSECustomerKeyMD5' -- +-- * 'uprsSSEKMSKeyId' +-- -- * 'uprsServerSideEncryption' -- --- * 'uprsStatus' +-- * 'uprsResponseStatus' uploadPartResponse - :: Int -- ^ 'uprsStatus' + :: Int -- ^ 'uprsResponseStatus' -> UploadPartResponse -uploadPartResponse pStatus_ = +uploadPartResponse pResponseStatus_ = UploadPartResponse' - { _uprsETag = Nothing - , _uprsRequestCharged = Nothing + { _uprsRequestCharged = Nothing + , _uprsETag = Nothing , _uprsSSECustomerAlgorithm = Nothing - , _uprsSSEKMSKeyId = Nothing , _uprsSSECustomerKeyMD5 = Nothing + , _uprsSSEKMSKeyId = Nothing , _uprsServerSideEncryption = Nothing - , _uprsStatus = pStatus_ + , _uprsResponseStatus = pResponseStatus_ } --- | Entity tag for the uploaded object. -uprsETag :: Lens' UploadPartResponse (Maybe ETag) -uprsETag = lens _uprsETag (\ s a -> s{_uprsETag = a}); - -- | Undocumented member. uprsRequestCharged :: Lens' UploadPartResponse (Maybe RequestCharged) uprsRequestCharged = lens _uprsRequestCharged (\ s a -> s{_uprsRequestCharged = a}); +-- | Entity tag for the uploaded object. +uprsETag :: Lens' UploadPartResponse (Maybe ETag) +uprsETag = lens _uprsETag (\ s a -> s{_uprsETag = a}); + -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header confirming the -- encryption algorithm used. uprsSSECustomerAlgorithm :: Lens' UploadPartResponse (Maybe Text) uprsSSECustomerAlgorithm = lens _uprsSSECustomerAlgorithm (\ s a -> s{_uprsSSECustomerAlgorithm = a}); --- | If present, specifies the ID of the AWS Key Management Service (KMS) --- master encryption key that was used for the object. -uprsSSEKMSKeyId :: Lens' UploadPartResponse (Maybe Text) -uprsSSEKMSKeyId = lens _uprsSSEKMSKeyId (\ s a -> s{_uprsSSEKMSKeyId = a}) . mapping _Sensitive; - -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header to provide round trip -- message integrity verification of the customer-provided encryption key. uprsSSECustomerKeyMD5 :: Lens' UploadPartResponse (Maybe Text) uprsSSECustomerKeyMD5 = lens _uprsSSECustomerKeyMD5 (\ s a -> s{_uprsSSECustomerKeyMD5 = a}); +-- | If present, specifies the ID of the AWS Key Management Service (KMS) +-- master encryption key that was used for the object. +uprsSSEKMSKeyId :: Lens' UploadPartResponse (Maybe Text) +uprsSSEKMSKeyId = lens _uprsSSEKMSKeyId (\ s a -> s{_uprsSSEKMSKeyId = a}) . mapping _Sensitive; + -- | The Server-side encryption algorithm used when storing this object in S3 -- (e.g., AES256, aws:kms). uprsServerSideEncryption :: Lens' UploadPartResponse (Maybe ServerSideEncryption) uprsServerSideEncryption = lens _uprsServerSideEncryption (\ s a -> s{_uprsServerSideEncryption = a}); -- | The response status code. -uprsStatus :: Lens' UploadPartResponse Int -uprsStatus = lens _uprsStatus (\ s a -> s{_uprsStatus = a}); +uprsResponseStatus :: Lens' UploadPartResponse Int +uprsResponseStatus = lens _uprsResponseStatus (\ s a -> s{_uprsResponseStatus = a}); diff --git a/gen/Network/AWS/S3/UploadPartCopy.hs b/gen/Network/AWS/S3/UploadPartCopy.hs --- a/gen/Network/AWS/S3/UploadPartCopy.hs +++ b/gen/Network/AWS/S3/UploadPartCopy.hs @@ -31,8 +31,8 @@ , upcCopySourceIfUnmodifiedSince , upcCopySourceRange , upcCopySourceSSECustomerKeyMD5 - , upcSSECustomerAlgorithm , upcCopySourceIfNoneMatch + , upcSSECustomerAlgorithm , upcSSECustomerKey , upcRequestPayer , upcCopySourceIfMatch @@ -53,10 +53,10 @@ , upcrsCopyPartResult , upcrsSSECustomerAlgorithm , upcrsCopySourceVersionId - , upcrsSSEKMSKeyId , upcrsSSECustomerKeyMD5 + , upcrsSSEKMSKeyId , upcrsServerSideEncryption - , upcrsStatus + , upcrsResponseStatus ) where import Network.AWS.Prelude @@ -71,8 +71,8 @@ , _upcCopySourceIfUnmodifiedSince :: !(Maybe RFC822) , _upcCopySourceRange :: !(Maybe Text) , _upcCopySourceSSECustomerKeyMD5 :: !(Maybe Text) - , _upcSSECustomerAlgorithm :: !(Maybe Text) , _upcCopySourceIfNoneMatch :: !(Maybe Text) + , _upcSSECustomerAlgorithm :: !(Maybe Text) , _upcSSECustomerKey :: !(Maybe (Sensitive Text)) , _upcRequestPayer :: !(Maybe RequestPayer) , _upcCopySourceIfMatch :: !(Maybe Text) @@ -98,10 +98,10 @@ -- -- * 'upcCopySourceSSECustomerKeyMD5' -- --- * 'upcSSECustomerAlgorithm' --- -- * 'upcCopySourceIfNoneMatch' -- +-- * 'upcSSECustomerAlgorithm' +-- -- * 'upcSSECustomerKey' -- -- * 'upcRequestPayer' @@ -136,8 +136,8 @@ , _upcCopySourceIfUnmodifiedSince = Nothing , _upcCopySourceRange = Nothing , _upcCopySourceSSECustomerKeyMD5 = Nothing - , _upcSSECustomerAlgorithm = Nothing , _upcCopySourceIfNoneMatch = Nothing + , _upcSSECustomerAlgorithm = Nothing , _upcSSECustomerKey = Nothing , _upcRequestPayer = Nothing , _upcCopySourceIfMatch = Nothing @@ -173,16 +173,16 @@ upcCopySourceSSECustomerKeyMD5 :: Lens' UploadPartCopy (Maybe Text) upcCopySourceSSECustomerKeyMD5 = lens _upcCopySourceSSECustomerKeyMD5 (\ s a -> s{_upcCopySourceSSECustomerKeyMD5 = a}); --- | Specifies the algorithm to use to when encrypting the object (e.g., --- AES256). -upcSSECustomerAlgorithm :: Lens' UploadPartCopy (Maybe Text) -upcSSECustomerAlgorithm = lens _upcSSECustomerAlgorithm (\ s a -> s{_upcSSECustomerAlgorithm = a}); - -- | Copies the object if its entity tag (ETag) is different than the -- specified ETag. upcCopySourceIfNoneMatch :: Lens' UploadPartCopy (Maybe Text) upcCopySourceIfNoneMatch = lens _upcCopySourceIfNoneMatch (\ s a -> s{_upcCopySourceIfNoneMatch = a}); +-- | Specifies the algorithm to use to when encrypting the object (e.g., +-- AES256). +upcSSECustomerAlgorithm :: Lens' UploadPartCopy (Maybe Text) +upcSSECustomerAlgorithm = lens _upcSSECustomerAlgorithm (\ s a -> s{_upcSSECustomerAlgorithm = a}); + -- | Specifies the customer-provided encryption key for Amazon S3 to use in -- encrypting data. This value is used to store the object and then it is -- discarded; Amazon does not store the encryption key. The key must be @@ -252,10 +252,10 @@ "x-amz-server-side-encryption-customer-algorithm") <*> (h .#? "x-amz-copy-source-version-id") <*> - (h .#? "x-amz-server-side-encryption-aws-kms-key-id") - <*> (h .#? "x-amz-server-side-encryption-customer-key-MD5") + <*> + (h .#? "x-amz-server-side-encryption-aws-kms-key-id") <*> (h .#? "x-amz-server-side-encryption") <*> (pure (fromEnum s))) @@ -269,10 +269,10 @@ "x-amz-copy-source-range" =# _upcCopySourceRange, "x-amz-copy-source-server-side-encryption-customer-key-MD5" =# _upcCopySourceSSECustomerKeyMD5, - "x-amz-server-side-encryption-customer-algorithm" =# - _upcSSECustomerAlgorithm, "x-amz-copy-source-if-none-match" =# _upcCopySourceIfNoneMatch, + "x-amz-server-side-encryption-customer-algorithm" =# + _upcSSECustomerAlgorithm, "x-amz-server-side-encryption-customer-key" =# _upcSSECustomerKey, "x-amz-request-payer" =# _upcRequestPayer, @@ -302,10 +302,10 @@ , _upcrsCopyPartResult :: !(Maybe CopyPartResult) , _upcrsSSECustomerAlgorithm :: !(Maybe Text) , _upcrsCopySourceVersionId :: !(Maybe Text) - , _upcrsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _upcrsSSECustomerKeyMD5 :: !(Maybe Text) + , _upcrsSSEKMSKeyId :: !(Maybe (Sensitive Text)) , _upcrsServerSideEncryption :: !(Maybe ServerSideEncryption) - , _upcrsStatus :: !Int + , _upcrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'UploadPartCopyResponse' with the minimum fields required to make a request. @@ -320,26 +320,26 @@ -- -- * 'upcrsCopySourceVersionId' -- --- * 'upcrsSSEKMSKeyId' --- -- * 'upcrsSSECustomerKeyMD5' -- +-- * 'upcrsSSEKMSKeyId' +-- -- * 'upcrsServerSideEncryption' -- --- * 'upcrsStatus' +-- * 'upcrsResponseStatus' uploadPartCopyResponse - :: Int -- ^ 'upcrsStatus' + :: Int -- ^ 'upcrsResponseStatus' -> UploadPartCopyResponse -uploadPartCopyResponse pStatus_ = +uploadPartCopyResponse pResponseStatus_ = UploadPartCopyResponse' { _upcrsRequestCharged = Nothing , _upcrsCopyPartResult = Nothing , _upcrsSSECustomerAlgorithm = Nothing , _upcrsCopySourceVersionId = Nothing - , _upcrsSSEKMSKeyId = Nothing , _upcrsSSECustomerKeyMD5 = Nothing + , _upcrsSSEKMSKeyId = Nothing , _upcrsServerSideEncryption = Nothing - , _upcrsStatus = pStatus_ + , _upcrsResponseStatus = pResponseStatus_ } -- | Undocumented member. @@ -361,22 +361,22 @@ upcrsCopySourceVersionId :: Lens' UploadPartCopyResponse (Maybe Text) upcrsCopySourceVersionId = lens _upcrsCopySourceVersionId (\ s a -> s{_upcrsCopySourceVersionId = a}); --- | If present, specifies the ID of the AWS Key Management Service (KMS) --- master encryption key that was used for the object. -upcrsSSEKMSKeyId :: Lens' UploadPartCopyResponse (Maybe Text) -upcrsSSEKMSKeyId = lens _upcrsSSEKMSKeyId (\ s a -> s{_upcrsSSEKMSKeyId = a}) . mapping _Sensitive; - -- | If server-side encryption with a customer-provided encryption key was -- requested, the response will include this header to provide round trip -- message integrity verification of the customer-provided encryption key. upcrsSSECustomerKeyMD5 :: Lens' UploadPartCopyResponse (Maybe Text) upcrsSSECustomerKeyMD5 = lens _upcrsSSECustomerKeyMD5 (\ s a -> s{_upcrsSSECustomerKeyMD5 = a}); +-- | If present, specifies the ID of the AWS Key Management Service (KMS) +-- master encryption key that was used for the object. +upcrsSSEKMSKeyId :: Lens' UploadPartCopyResponse (Maybe Text) +upcrsSSEKMSKeyId = lens _upcrsSSEKMSKeyId (\ s a -> s{_upcrsSSEKMSKeyId = a}) . mapping _Sensitive; + -- | The Server-side encryption algorithm used when storing this object in S3 -- (e.g., AES256, aws:kms). upcrsServerSideEncryption :: Lens' UploadPartCopyResponse (Maybe ServerSideEncryption) upcrsServerSideEncryption = lens _upcrsServerSideEncryption (\ s a -> s{_upcrsServerSideEncryption = a}); -- | The response status code. -upcrsStatus :: Lens' UploadPartCopyResponse Int -upcrsStatus = lens _upcrsStatus (\ s a -> s{_upcrsStatus = a}); +upcrsResponseStatus :: Lens' UploadPartCopyResponse Int +upcrsResponseStatus = lens _upcrsResponseStatus (\ s a -> s{_upcrsResponseStatus = a}); diff --git a/test/Test/AWS/Gen/S3.hs b/test/Test/AWS/Gen/S3.hs --- a/test/Test/AWS/Gen/S3.hs +++ b/test/Test/AWS/Gen/S3.hs @@ -34,68 +34,71 @@ -- , testPutObject $ -- putObject -- --- , testPutBucketLogging $ --- putBucketLogging --- -- , testDeleteObject $ -- deleteObject -- --- , testDeleteBucket $ --- deleteBucket +-- , testPutBucketLogging $ +-- putBucketLogging -- -- , testListBuckets $ -- listBuckets -- +-- , testDeleteBucket $ +-- deleteBucket +-- -- , testCreateBucket $ -- createBucket -- --- , testPutBucketTagging $ --- putBucketTagging --- -- , testDeleteBucketTagging $ -- deleteBucketTagging -- -- , testPutObjectACL $ -- putObjectACL -- --- , testGetBucketNotificationConfiguration $ --- getBucketNotificationConfiguration +-- , testPutBucketTagging $ +-- putBucketTagging -- -- , testGetBucketLocation $ -- getBucketLocation -- +-- , testGetBucketNotificationConfiguration $ +-- getBucketNotificationConfiguration +-- +-- , testGetObject $ +-- getObject +-- -- , testPutBucketReplication $ -- putBucketReplication -- -- , testGetBucketWebsite $ -- getBucketWebsite -- --- , testGetObject $ --- getObject +-- , testGetBucketRequestPayment $ +-- getBucketRequestPayment -- -- , testDeleteBucketReplication $ -- deleteBucketReplication -- --- , testGetBucketRequestPayment $ --- getBucketRequestPayment +-- , testGetBucketLifecycle $ +-- getBucketLifecycle -- -- , testListObjectVersions $ -- listObjectVersions -- --- , testGetBucketLifecycle $ --- getBucketLifecycle --- -- , testHeadBucket $ -- headBucket -- -- , testPutBucketLifecycle $ -- putBucketLifecycle -- +-- , testDeleteBucketLifecycle $ +-- deleteBucketLifecycle +-- -- , testCreateMultipartUpload $ -- createMultipartUpload -- --- , testDeleteBucketLifecycle $ --- deleteBucketLifecycle +-- , testUploadPart $ +-- uploadPart -- -- , testGetBucketReplication $ -- getBucketReplication @@ -103,56 +106,47 @@ -- , testPutBucketWebsite $ -- putBucketWebsite -- +-- , testDeleteBucketWebsite $ +-- deleteBucketWebsite +-- -- , testCompleteMultipartUpload $ -- completeMultipartUpload -- --- , testUploadPart $ --- uploadPart --- -- , testListMultipartUploads $ -- listMultipartUploads -- --- , testDeleteBucketWebsite $ --- deleteBucketWebsite --- -- , testListObjects $ -- listObjects -- --- , testDeleteObjects $ --- deleteObjects --- --- , testPutBucketPolicy $ --- putBucketPolicy --- -- , testDeleteBucketPolicy $ -- deleteBucketPolicy -- -- , testAbortMultipartUpload $ -- abortMultipartUpload -- +-- , testPutBucketPolicy $ +-- putBucketPolicy +-- -- , testGetObjectTorrent $ -- getObjectTorrent -- --- , testPutBucketCORS $ --- putBucketCORS +-- , testDeleteObjects $ +-- deleteObjects -- --- , testDeleteBucketCORS $ --- deleteBucketCORS +-- , testPutBucketNotificationConfiguration $ +-- putBucketNotificationConfiguration -- -- , testGetBucketVersioning $ -- getBucketVersioning -- --- , testPutBucketNotificationConfiguration $ --- putBucketNotificationConfiguration --- --- , testGetBucketTagging $ --- getBucketTagging +-- , testDeleteBucketCORS $ +-- deleteBucketCORS -- --- , testHeadObject $ --- headObject +-- , testPutBucketCORS $ +-- putBucketCORS -- --- , testPutBucketVersioning $ --- putBucketVersioning +-- , testGetBucketCORS $ +-- getBucketCORS -- -- , testGetObjectACL $ -- getObjectACL @@ -160,9 +154,15 @@ -- , testRestoreObject $ -- restoreObject -- --- , testGetBucketCORS $ --- getBucketCORS +-- , testHeadObject $ +-- headObject -- +-- , testPutBucketVersioning $ +-- putBucketVersioning +-- +-- , testGetBucketTagging $ +-- getBucketTagging +-- -- , testCopyObject $ -- copyObject -- @@ -172,18 +172,18 @@ -- , testGetBucketLogging $ -- getBucketLogging -- --- , testListParts $ --- listParts --- -- , testGetBucketACL $ -- getBucketACL -- --- , testPutBucketACL $ --- putBucketACL +-- , testListParts $ +-- listParts -- -- , testUploadPartCopy $ -- uploadPartCopy -- +-- , testPutBucketACL $ +-- putBucketACL +-- -- ] -- , testGroup "response" @@ -193,68 +193,71 @@ -- , testPutObjectResponse $ -- putObjectResponse -- --- , testPutBucketLoggingResponse $ --- putBucketLoggingResponse --- -- , testDeleteObjectResponse $ -- deleteObjectResponse -- --- , testDeleteBucketResponse $ --- deleteBucketResponse +-- , testPutBucketLoggingResponse $ +-- putBucketLoggingResponse -- -- , testListBucketsResponse $ -- listBucketsResponse -- +-- , testDeleteBucketResponse $ +-- deleteBucketResponse +-- -- , testCreateBucketResponse $ -- createBucketResponse -- --- , testPutBucketTaggingResponse $ --- putBucketTaggingResponse --- -- , testDeleteBucketTaggingResponse $ -- deleteBucketTaggingResponse -- -- , testPutObjectACLResponse $ -- putObjectACLResponse -- --- , testGetBucketNotificationConfigurationResponse $ --- notificationConfiguration +-- , testPutBucketTaggingResponse $ +-- putBucketTaggingResponse -- -- , testGetBucketLocationResponse $ -- getBucketLocationResponse -- +-- , testGetBucketNotificationConfigurationResponse $ +-- notificationConfiguration +-- +-- , testGetObjectResponse $ +-- getObjectResponse +-- -- , testPutBucketReplicationResponse $ -- putBucketReplicationResponse -- -- , testGetBucketWebsiteResponse $ -- getBucketWebsiteResponse -- --- , testGetObjectResponse $ --- getObjectResponse +-- , testGetBucketRequestPaymentResponse $ +-- getBucketRequestPaymentResponse -- -- , testDeleteBucketReplicationResponse $ -- deleteBucketReplicationResponse -- --- , testGetBucketRequestPaymentResponse $ --- getBucketRequestPaymentResponse +-- , testGetBucketLifecycleResponse $ +-- getBucketLifecycleResponse -- -- , testListObjectVersionsResponse $ -- listObjectVersionsResponse -- --- , testGetBucketLifecycleResponse $ --- getBucketLifecycleResponse --- -- , testHeadBucketResponse $ -- headBucketResponse -- -- , testPutBucketLifecycleResponse $ -- putBucketLifecycleResponse -- +-- , testDeleteBucketLifecycleResponse $ +-- deleteBucketLifecycleResponse +-- -- , testCreateMultipartUploadResponse $ -- createMultipartUploadResponse -- --- , testDeleteBucketLifecycleResponse $ --- deleteBucketLifecycleResponse +-- , testUploadPartResponse $ +-- uploadPartResponse -- -- , testGetBucketReplicationResponse $ -- getBucketReplicationResponse @@ -262,56 +265,47 @@ -- , testPutBucketWebsiteResponse $ -- putBucketWebsiteResponse -- +-- , testDeleteBucketWebsiteResponse $ +-- deleteBucketWebsiteResponse +-- -- , testCompleteMultipartUploadResponse $ -- completeMultipartUploadResponse -- --- , testUploadPartResponse $ --- uploadPartResponse --- -- , testListMultipartUploadsResponse $ -- listMultipartUploadsResponse -- --- , testDeleteBucketWebsiteResponse $ --- deleteBucketWebsiteResponse --- -- , testListObjectsResponse $ -- listObjectsResponse -- --- , testDeleteObjectsResponse $ --- deleteObjectsResponse --- --- , testPutBucketPolicyResponse $ --- putBucketPolicyResponse --- -- , testDeleteBucketPolicyResponse $ -- deleteBucketPolicyResponse -- -- , testAbortMultipartUploadResponse $ -- abortMultipartUploadResponse -- +-- , testPutBucketPolicyResponse $ +-- putBucketPolicyResponse +-- -- , testGetObjectTorrentResponse $ -- getObjectTorrentResponse -- --- , testPutBucketCORSResponse $ --- putBucketCORSResponse +-- , testDeleteObjectsResponse $ +-- deleteObjectsResponse -- --- , testDeleteBucketCORSResponse $ --- deleteBucketCORSResponse +-- , testPutBucketNotificationConfigurationResponse $ +-- putBucketNotificationConfigurationResponse -- -- , testGetBucketVersioningResponse $ -- getBucketVersioningResponse -- --- , testPutBucketNotificationConfigurationResponse $ --- putBucketNotificationConfigurationResponse --- --- , testGetBucketTaggingResponse $ --- getBucketTaggingResponse +-- , testDeleteBucketCORSResponse $ +-- deleteBucketCORSResponse -- --- , testHeadObjectResponse $ --- headObjectResponse +-- , testPutBucketCORSResponse $ +-- putBucketCORSResponse -- --- , testPutBucketVersioningResponse $ --- putBucketVersioningResponse +-- , testGetBucketCORSResponse $ +-- getBucketCORSResponse -- -- , testGetObjectACLResponse $ -- getObjectACLResponse @@ -319,9 +313,15 @@ -- , testRestoreObjectResponse $ -- restoreObjectResponse -- --- , testGetBucketCORSResponse $ --- getBucketCORSResponse +-- , testHeadObjectResponse $ +-- headObjectResponse -- +-- , testPutBucketVersioningResponse $ +-- putBucketVersioningResponse +-- +-- , testGetBucketTaggingResponse $ +-- getBucketTaggingResponse +-- -- , testCopyObjectResponse $ -- copyObjectResponse -- @@ -331,18 +331,18 @@ -- , testGetBucketLoggingResponse $ -- getBucketLoggingResponse -- --- , testListPartsResponse $ --- listPartsResponse --- -- , testGetBucketACLResponse $ -- getBucketACLResponse -- --- , testPutBucketACLResponse $ --- putBucketACLResponse +-- , testListPartsResponse $ +-- listPartsResponse -- -- , testUploadPartCopyResponse $ -- uploadPartCopyResponse -- +-- , testPutBucketACLResponse $ +-- putBucketACLResponse +-- -- ] -- ] @@ -353,36 +353,31 @@ "PutBucketRequestPayment" "fixture/PutBucketRequestPayment.yaml" -testPutBucketLogging :: PutBucketLogging -> TestTree -testPutBucketLogging = req - "PutBucketLogging" - "fixture/PutBucketLogging.yaml" - testDeleteObject :: DeleteObject -> TestTree testDeleteObject = req "DeleteObject" "fixture/DeleteObject.yaml" -testDeleteBucket :: DeleteBucket -> TestTree -testDeleteBucket = req - "DeleteBucket" - "fixture/DeleteBucket.yaml" +testPutBucketLogging :: PutBucketLogging -> TestTree +testPutBucketLogging = req + "PutBucketLogging" + "fixture/PutBucketLogging.yaml" testListBuckets :: ListBuckets -> TestTree testListBuckets = req "ListBuckets" "fixture/ListBuckets.yaml" +testDeleteBucket :: DeleteBucket -> TestTree +testDeleteBucket = req + "DeleteBucket" + "fixture/DeleteBucket.yaml" + testCreateBucket :: CreateBucket -> TestTree testCreateBucket = req "CreateBucket" "fixture/CreateBucket.yaml" -testPutBucketTagging :: PutBucketTagging -> TestTree -testPutBucketTagging = req - "PutBucketTagging" - "fixture/PutBucketTagging.yaml" - testDeleteBucketTagging :: DeleteBucketTagging -> TestTree testDeleteBucketTagging = req "DeleteBucketTagging" @@ -393,16 +388,26 @@ "PutObjectACL" "fixture/PutObjectACL.yaml" -testGetBucketNotificationConfiguration :: GetBucketNotificationConfiguration -> TestTree -testGetBucketNotificationConfiguration = req - "GetBucketNotificationConfiguration" - "fixture/GetBucketNotificationConfiguration.yaml" +testPutBucketTagging :: PutBucketTagging -> TestTree +testPutBucketTagging = req + "PutBucketTagging" + "fixture/PutBucketTagging.yaml" testGetBucketLocation :: GetBucketLocation -> TestTree testGetBucketLocation = req "GetBucketLocation" "fixture/GetBucketLocation.yaml" +testGetBucketNotificationConfiguration :: GetBucketNotificationConfiguration -> TestTree +testGetBucketNotificationConfiguration = req + "GetBucketNotificationConfiguration" + "fixture/GetBucketNotificationConfiguration.yaml" + +testGetObject :: GetObject -> TestTree +testGetObject = req + "GetObject" + "fixture/GetObject.yaml" + testPutBucketReplication :: PutBucketReplication -> TestTree testPutBucketReplication = req "PutBucketReplication" @@ -413,31 +418,26 @@ "GetBucketWebsite" "fixture/GetBucketWebsite.yaml" -testGetObject :: GetObject -> TestTree -testGetObject = req - "GetObject" - "fixture/GetObject.yaml" +testGetBucketRequestPayment :: GetBucketRequestPayment -> TestTree +testGetBucketRequestPayment = req + "GetBucketRequestPayment" + "fixture/GetBucketRequestPayment.yaml" testDeleteBucketReplication :: DeleteBucketReplication -> TestTree testDeleteBucketReplication = req "DeleteBucketReplication" "fixture/DeleteBucketReplication.yaml" -testGetBucketRequestPayment :: GetBucketRequestPayment -> TestTree -testGetBucketRequestPayment = req - "GetBucketRequestPayment" - "fixture/GetBucketRequestPayment.yaml" +testGetBucketLifecycle :: GetBucketLifecycle -> TestTree +testGetBucketLifecycle = req + "GetBucketLifecycle" + "fixture/GetBucketLifecycle.yaml" testListObjectVersions :: ListObjectVersions -> TestTree testListObjectVersions = req "ListObjectVersions" "fixture/ListObjectVersions.yaml" -testGetBucketLifecycle :: GetBucketLifecycle -> TestTree -testGetBucketLifecycle = req - "GetBucketLifecycle" - "fixture/GetBucketLifecycle.yaml" - testHeadBucket :: HeadBucket -> TestTree testHeadBucket = req "HeadBucket" @@ -448,16 +448,16 @@ "PutBucketLifecycle" "fixture/PutBucketLifecycle.yaml" -testCreateMultipartUpload :: CreateMultipartUpload -> TestTree -testCreateMultipartUpload = req - "CreateMultipartUpload" - "fixture/CreateMultipartUpload.yaml" - testDeleteBucketLifecycle :: DeleteBucketLifecycle -> TestTree testDeleteBucketLifecycle = req "DeleteBucketLifecycle" "fixture/DeleteBucketLifecycle.yaml" +testCreateMultipartUpload :: CreateMultipartUpload -> TestTree +testCreateMultipartUpload = req + "CreateMultipartUpload" + "fixture/CreateMultipartUpload.yaml" + testGetBucketReplication :: GetBucketReplication -> TestTree testGetBucketReplication = req "GetBucketReplication" @@ -468,6 +468,11 @@ "PutBucketWebsite" "fixture/PutBucketWebsite.yaml" +testDeleteBucketWebsite :: DeleteBucketWebsite -> TestTree +testDeleteBucketWebsite = req + "DeleteBucketWebsite" + "fixture/DeleteBucketWebsite.yaml" + testCompleteMultipartUpload :: CompleteMultipartUpload -> TestTree testCompleteMultipartUpload = req "CompleteMultipartUpload" @@ -478,26 +483,11 @@ "ListMultipartUploads" "fixture/ListMultipartUploads.yaml" -testDeleteBucketWebsite :: DeleteBucketWebsite -> TestTree -testDeleteBucketWebsite = req - "DeleteBucketWebsite" - "fixture/DeleteBucketWebsite.yaml" - testListObjects :: ListObjects -> TestTree testListObjects = req "ListObjects" "fixture/ListObjects.yaml" -testDeleteObjects :: DeleteObjects -> TestTree -testDeleteObjects = req - "DeleteObjects" - "fixture/DeleteObjects.yaml" - -testPutBucketPolicy :: PutBucketPolicy -> TestTree -testPutBucketPolicy = req - "PutBucketPolicy" - "fixture/PutBucketPolicy.yaml" - testDeleteBucketPolicy :: DeleteBucketPolicy -> TestTree testDeleteBucketPolicy = req "DeleteBucketPolicy" @@ -508,45 +498,45 @@ "AbortMultipartUpload" "fixture/AbortMultipartUpload.yaml" +testPutBucketPolicy :: PutBucketPolicy -> TestTree +testPutBucketPolicy = req + "PutBucketPolicy" + "fixture/PutBucketPolicy.yaml" + testGetObjectTorrent :: GetObjectTorrent -> TestTree testGetObjectTorrent = req "GetObjectTorrent" "fixture/GetObjectTorrent.yaml" -testPutBucketCORS :: PutBucketCORS -> TestTree -testPutBucketCORS = req - "PutBucketCORS" - "fixture/PutBucketCORS.yaml" +testDeleteObjects :: DeleteObjects -> TestTree +testDeleteObjects = req + "DeleteObjects" + "fixture/DeleteObjects.yaml" -testDeleteBucketCORS :: DeleteBucketCORS -> TestTree -testDeleteBucketCORS = req - "DeleteBucketCORS" - "fixture/DeleteBucketCORS.yaml" +testPutBucketNotificationConfiguration :: PutBucketNotificationConfiguration -> TestTree +testPutBucketNotificationConfiguration = req + "PutBucketNotificationConfiguration" + "fixture/PutBucketNotificationConfiguration.yaml" testGetBucketVersioning :: GetBucketVersioning -> TestTree testGetBucketVersioning = req "GetBucketVersioning" "fixture/GetBucketVersioning.yaml" -testPutBucketNotificationConfiguration :: PutBucketNotificationConfiguration -> TestTree -testPutBucketNotificationConfiguration = req - "PutBucketNotificationConfiguration" - "fixture/PutBucketNotificationConfiguration.yaml" - -testGetBucketTagging :: GetBucketTagging -> TestTree -testGetBucketTagging = req - "GetBucketTagging" - "fixture/GetBucketTagging.yaml" +testDeleteBucketCORS :: DeleteBucketCORS -> TestTree +testDeleteBucketCORS = req + "DeleteBucketCORS" + "fixture/DeleteBucketCORS.yaml" -testHeadObject :: HeadObject -> TestTree -testHeadObject = req - "HeadObject" - "fixture/HeadObject.yaml" +testPutBucketCORS :: PutBucketCORS -> TestTree +testPutBucketCORS = req + "PutBucketCORS" + "fixture/PutBucketCORS.yaml" -testPutBucketVersioning :: PutBucketVersioning -> TestTree -testPutBucketVersioning = req - "PutBucketVersioning" - "fixture/PutBucketVersioning.yaml" +testGetBucketCORS :: GetBucketCORS -> TestTree +testGetBucketCORS = req + "GetBucketCORS" + "fixture/GetBucketCORS.yaml" testGetObjectACL :: GetObjectACL -> TestTree testGetObjectACL = req @@ -558,11 +548,21 @@ "RestoreObject" "fixture/RestoreObject.yaml" -testGetBucketCORS :: GetBucketCORS -> TestTree -testGetBucketCORS = req - "GetBucketCORS" - "fixture/GetBucketCORS.yaml" +testHeadObject :: HeadObject -> TestTree +testHeadObject = req + "HeadObject" + "fixture/HeadObject.yaml" +testPutBucketVersioning :: PutBucketVersioning -> TestTree +testPutBucketVersioning = req + "PutBucketVersioning" + "fixture/PutBucketVersioning.yaml" + +testGetBucketTagging :: GetBucketTagging -> TestTree +testGetBucketTagging = req + "GetBucketTagging" + "fixture/GetBucketTagging.yaml" + testCopyObject :: CopyObject -> TestTree testCopyObject = req "CopyObject" @@ -578,26 +578,26 @@ "GetBucketLogging" "fixture/GetBucketLogging.yaml" -testListParts :: ListParts -> TestTree -testListParts = req - "ListParts" - "fixture/ListParts.yaml" - testGetBucketACL :: GetBucketACL -> TestTree testGetBucketACL = req "GetBucketACL" "fixture/GetBucketACL.yaml" -testPutBucketACL :: PutBucketACL -> TestTree -testPutBucketACL = req - "PutBucketACL" - "fixture/PutBucketACL.yaml" +testListParts :: ListParts -> TestTree +testListParts = req + "ListParts" + "fixture/ListParts.yaml" testUploadPartCopy :: UploadPartCopy -> TestTree testUploadPartCopy = req "UploadPartCopy" "fixture/UploadPartCopy.yaml" +testPutBucketACL :: PutBucketACL -> TestTree +testPutBucketACL = req + "PutBucketACL" + "fixture/PutBucketACL.yaml" + -- Responses testPutBucketRequestPaymentResponse :: PutBucketRequestPaymentResponse -> TestTree @@ -614,13 +614,6 @@ s3 (Proxy :: Proxy PutObject) -testPutBucketLoggingResponse :: PutBucketLoggingResponse -> TestTree -testPutBucketLoggingResponse = res - "PutBucketLoggingResponse" - "fixture/PutBucketLoggingResponse.proto" - s3 - (Proxy :: Proxy PutBucketLogging) - testDeleteObjectResponse :: DeleteObjectResponse -> TestTree testDeleteObjectResponse = res "DeleteObjectResponse" @@ -628,12 +621,12 @@ s3 (Proxy :: Proxy DeleteObject) -testDeleteBucketResponse :: DeleteBucketResponse -> TestTree -testDeleteBucketResponse = res - "DeleteBucketResponse" - "fixture/DeleteBucketResponse.proto" +testPutBucketLoggingResponse :: PutBucketLoggingResponse -> TestTree +testPutBucketLoggingResponse = res + "PutBucketLoggingResponse" + "fixture/PutBucketLoggingResponse.proto" s3 - (Proxy :: Proxy DeleteBucket) + (Proxy :: Proxy PutBucketLogging) testListBucketsResponse :: ListBucketsResponse -> TestTree testListBucketsResponse = res @@ -642,6 +635,13 @@ s3 (Proxy :: Proxy ListBuckets) +testDeleteBucketResponse :: DeleteBucketResponse -> TestTree +testDeleteBucketResponse = res + "DeleteBucketResponse" + "fixture/DeleteBucketResponse.proto" + s3 + (Proxy :: Proxy DeleteBucket) + testCreateBucketResponse :: CreateBucketResponse -> TestTree testCreateBucketResponse = res "CreateBucketResponse" @@ -649,13 +649,6 @@ s3 (Proxy :: Proxy CreateBucket) -testPutBucketTaggingResponse :: PutBucketTaggingResponse -> TestTree -testPutBucketTaggingResponse = res - "PutBucketTaggingResponse" - "fixture/PutBucketTaggingResponse.proto" - s3 - (Proxy :: Proxy PutBucketTagging) - testDeleteBucketTaggingResponse :: DeleteBucketTaggingResponse -> TestTree testDeleteBucketTaggingResponse = res "DeleteBucketTaggingResponse" @@ -670,12 +663,12 @@ s3 (Proxy :: Proxy PutObjectACL) -testGetBucketNotificationConfigurationResponse :: NotificationConfiguration -> TestTree -testGetBucketNotificationConfigurationResponse = res - "GetBucketNotificationConfigurationResponse" - "fixture/GetBucketNotificationConfigurationResponse.proto" +testPutBucketTaggingResponse :: PutBucketTaggingResponse -> TestTree +testPutBucketTaggingResponse = res + "PutBucketTaggingResponse" + "fixture/PutBucketTaggingResponse.proto" s3 - (Proxy :: Proxy GetBucketNotificationConfiguration) + (Proxy :: Proxy PutBucketTagging) testGetBucketLocationResponse :: GetBucketLocationResponse -> TestTree testGetBucketLocationResponse = res @@ -684,6 +677,13 @@ s3 (Proxy :: Proxy GetBucketLocation) +testGetBucketNotificationConfigurationResponse :: NotificationConfiguration -> TestTree +testGetBucketNotificationConfigurationResponse = res + "GetBucketNotificationConfigurationResponse" + "fixture/GetBucketNotificationConfigurationResponse.proto" + s3 + (Proxy :: Proxy GetBucketNotificationConfiguration) + testPutBucketReplicationResponse :: PutBucketReplicationResponse -> TestTree testPutBucketReplicationResponse = res "PutBucketReplicationResponse" @@ -698,13 +698,6 @@ s3 (Proxy :: Proxy GetBucketWebsite) -testDeleteBucketReplicationResponse :: DeleteBucketReplicationResponse -> TestTree -testDeleteBucketReplicationResponse = res - "DeleteBucketReplicationResponse" - "fixture/DeleteBucketReplicationResponse.proto" - s3 - (Proxy :: Proxy DeleteBucketReplication) - testGetBucketRequestPaymentResponse :: GetBucketRequestPaymentResponse -> TestTree testGetBucketRequestPaymentResponse = res "GetBucketRequestPaymentResponse" @@ -712,12 +705,12 @@ s3 (Proxy :: Proxy GetBucketRequestPayment) -testListObjectVersionsResponse :: ListObjectVersionsResponse -> TestTree -testListObjectVersionsResponse = res - "ListObjectVersionsResponse" - "fixture/ListObjectVersionsResponse.proto" +testDeleteBucketReplicationResponse :: DeleteBucketReplicationResponse -> TestTree +testDeleteBucketReplicationResponse = res + "DeleteBucketReplicationResponse" + "fixture/DeleteBucketReplicationResponse.proto" s3 - (Proxy :: Proxy ListObjectVersions) + (Proxy :: Proxy DeleteBucketReplication) testGetBucketLifecycleResponse :: GetBucketLifecycleResponse -> TestTree testGetBucketLifecycleResponse = res @@ -726,6 +719,13 @@ s3 (Proxy :: Proxy GetBucketLifecycle) +testListObjectVersionsResponse :: ListObjectVersionsResponse -> TestTree +testListObjectVersionsResponse = res + "ListObjectVersionsResponse" + "fixture/ListObjectVersionsResponse.proto" + s3 + (Proxy :: Proxy ListObjectVersions) + testHeadBucketResponse :: HeadBucketResponse -> TestTree testHeadBucketResponse = res "HeadBucketResponse" @@ -740,6 +740,13 @@ s3 (Proxy :: Proxy PutBucketLifecycle) +testDeleteBucketLifecycleResponse :: DeleteBucketLifecycleResponse -> TestTree +testDeleteBucketLifecycleResponse = res + "DeleteBucketLifecycleResponse" + "fixture/DeleteBucketLifecycleResponse.proto" + s3 + (Proxy :: Proxy DeleteBucketLifecycle) + testCreateMultipartUploadResponse :: CreateMultipartUploadResponse -> TestTree testCreateMultipartUploadResponse = res "CreateMultipartUploadResponse" @@ -747,12 +754,12 @@ s3 (Proxy :: Proxy CreateMultipartUpload) -testDeleteBucketLifecycleResponse :: DeleteBucketLifecycleResponse -> TestTree -testDeleteBucketLifecycleResponse = res - "DeleteBucketLifecycleResponse" - "fixture/DeleteBucketLifecycleResponse.proto" +testUploadPartResponse :: UploadPartResponse -> TestTree +testUploadPartResponse = res + "UploadPartResponse" + "fixture/UploadPartResponse.proto" s3 - (Proxy :: Proxy DeleteBucketLifecycle) + (Proxy :: Proxy UploadPart) testGetBucketReplicationResponse :: GetBucketReplicationResponse -> TestTree testGetBucketReplicationResponse = res @@ -768,6 +775,13 @@ s3 (Proxy :: Proxy PutBucketWebsite) +testDeleteBucketWebsiteResponse :: DeleteBucketWebsiteResponse -> TestTree +testDeleteBucketWebsiteResponse = res + "DeleteBucketWebsiteResponse" + "fixture/DeleteBucketWebsiteResponse.proto" + s3 + (Proxy :: Proxy DeleteBucketWebsite) + testCompleteMultipartUploadResponse :: CompleteMultipartUploadResponse -> TestTree testCompleteMultipartUploadResponse = res "CompleteMultipartUploadResponse" @@ -775,13 +789,6 @@ s3 (Proxy :: Proxy CompleteMultipartUpload) -testUploadPartResponse :: UploadPartResponse -> TestTree -testUploadPartResponse = res - "UploadPartResponse" - "fixture/UploadPartResponse.proto" - s3 - (Proxy :: Proxy UploadPart) - testListMultipartUploadsResponse :: ListMultipartUploadsResponse -> TestTree testListMultipartUploadsResponse = res "ListMultipartUploadsResponse" @@ -789,13 +796,6 @@ s3 (Proxy :: Proxy ListMultipartUploads) -testDeleteBucketWebsiteResponse :: DeleteBucketWebsiteResponse -> TestTree -testDeleteBucketWebsiteResponse = res - "DeleteBucketWebsiteResponse" - "fixture/DeleteBucketWebsiteResponse.proto" - s3 - (Proxy :: Proxy DeleteBucketWebsite) - testListObjectsResponse :: ListObjectsResponse -> TestTree testListObjectsResponse = res "ListObjectsResponse" @@ -803,20 +803,6 @@ s3 (Proxy :: Proxy ListObjects) -testDeleteObjectsResponse :: DeleteObjectsResponse -> TestTree -testDeleteObjectsResponse = res - "DeleteObjectsResponse" - "fixture/DeleteObjectsResponse.proto" - s3 - (Proxy :: Proxy DeleteObjects) - -testPutBucketPolicyResponse :: PutBucketPolicyResponse -> TestTree -testPutBucketPolicyResponse = res - "PutBucketPolicyResponse" - "fixture/PutBucketPolicyResponse.proto" - s3 - (Proxy :: Proxy PutBucketPolicy) - testDeleteBucketPolicyResponse :: DeleteBucketPolicyResponse -> TestTree testDeleteBucketPolicyResponse = res "DeleteBucketPolicyResponse" @@ -831,26 +817,19 @@ s3 (Proxy :: Proxy AbortMultipartUpload) -testPutBucketCORSResponse :: PutBucketCORSResponse -> TestTree -testPutBucketCORSResponse = res - "PutBucketCORSResponse" - "fixture/PutBucketCORSResponse.proto" - s3 - (Proxy :: Proxy PutBucketCORS) - -testDeleteBucketCORSResponse :: DeleteBucketCORSResponse -> TestTree -testDeleteBucketCORSResponse = res - "DeleteBucketCORSResponse" - "fixture/DeleteBucketCORSResponse.proto" +testPutBucketPolicyResponse :: PutBucketPolicyResponse -> TestTree +testPutBucketPolicyResponse = res + "PutBucketPolicyResponse" + "fixture/PutBucketPolicyResponse.proto" s3 - (Proxy :: Proxy DeleteBucketCORS) + (Proxy :: Proxy PutBucketPolicy) -testGetBucketVersioningResponse :: GetBucketVersioningResponse -> TestTree -testGetBucketVersioningResponse = res - "GetBucketVersioningResponse" - "fixture/GetBucketVersioningResponse.proto" +testDeleteObjectsResponse :: DeleteObjectsResponse -> TestTree +testDeleteObjectsResponse = res + "DeleteObjectsResponse" + "fixture/DeleteObjectsResponse.proto" s3 - (Proxy :: Proxy GetBucketVersioning) + (Proxy :: Proxy DeleteObjects) testPutBucketNotificationConfigurationResponse :: PutBucketNotificationConfigurationResponse -> TestTree testPutBucketNotificationConfigurationResponse = res @@ -859,27 +838,34 @@ s3 (Proxy :: Proxy PutBucketNotificationConfiguration) -testGetBucketTaggingResponse :: GetBucketTaggingResponse -> TestTree -testGetBucketTaggingResponse = res - "GetBucketTaggingResponse" - "fixture/GetBucketTaggingResponse.proto" +testGetBucketVersioningResponse :: GetBucketVersioningResponse -> TestTree +testGetBucketVersioningResponse = res + "GetBucketVersioningResponse" + "fixture/GetBucketVersioningResponse.proto" s3 - (Proxy :: Proxy GetBucketTagging) + (Proxy :: Proxy GetBucketVersioning) -testHeadObjectResponse :: HeadObjectResponse -> TestTree -testHeadObjectResponse = res - "HeadObjectResponse" - "fixture/HeadObjectResponse.proto" +testDeleteBucketCORSResponse :: DeleteBucketCORSResponse -> TestTree +testDeleteBucketCORSResponse = res + "DeleteBucketCORSResponse" + "fixture/DeleteBucketCORSResponse.proto" s3 - (Proxy :: Proxy HeadObject) + (Proxy :: Proxy DeleteBucketCORS) -testPutBucketVersioningResponse :: PutBucketVersioningResponse -> TestTree -testPutBucketVersioningResponse = res - "PutBucketVersioningResponse" - "fixture/PutBucketVersioningResponse.proto" +testPutBucketCORSResponse :: PutBucketCORSResponse -> TestTree +testPutBucketCORSResponse = res + "PutBucketCORSResponse" + "fixture/PutBucketCORSResponse.proto" s3 - (Proxy :: Proxy PutBucketVersioning) + (Proxy :: Proxy PutBucketCORS) +testGetBucketCORSResponse :: GetBucketCORSResponse -> TestTree +testGetBucketCORSResponse = res + "GetBucketCORSResponse" + "fixture/GetBucketCORSResponse.proto" + s3 + (Proxy :: Proxy GetBucketCORS) + testGetObjectACLResponse :: GetObjectACLResponse -> TestTree testGetObjectACLResponse = res "GetObjectACLResponse" @@ -894,13 +880,27 @@ s3 (Proxy :: Proxy RestoreObject) -testGetBucketCORSResponse :: GetBucketCORSResponse -> TestTree -testGetBucketCORSResponse = res - "GetBucketCORSResponse" - "fixture/GetBucketCORSResponse.proto" +testHeadObjectResponse :: HeadObjectResponse -> TestTree +testHeadObjectResponse = res + "HeadObjectResponse" + "fixture/HeadObjectResponse.proto" s3 - (Proxy :: Proxy GetBucketCORS) + (Proxy :: Proxy HeadObject) +testPutBucketVersioningResponse :: PutBucketVersioningResponse -> TestTree +testPutBucketVersioningResponse = res + "PutBucketVersioningResponse" + "fixture/PutBucketVersioningResponse.proto" + s3 + (Proxy :: Proxy PutBucketVersioning) + +testGetBucketTaggingResponse :: GetBucketTaggingResponse -> TestTree +testGetBucketTaggingResponse = res + "GetBucketTaggingResponse" + "fixture/GetBucketTaggingResponse.proto" + s3 + (Proxy :: Proxy GetBucketTagging) + testCopyObjectResponse :: CopyObjectResponse -> TestTree testCopyObjectResponse = res "CopyObjectResponse" @@ -922,13 +922,6 @@ s3 (Proxy :: Proxy GetBucketLogging) -testListPartsResponse :: ListPartsResponse -> TestTree -testListPartsResponse = res - "ListPartsResponse" - "fixture/ListPartsResponse.proto" - s3 - (Proxy :: Proxy ListParts) - testGetBucketACLResponse :: GetBucketACLResponse -> TestTree testGetBucketACLResponse = res "GetBucketACLResponse" @@ -936,12 +929,12 @@ s3 (Proxy :: Proxy GetBucketACL) -testPutBucketACLResponse :: PutBucketACLResponse -> TestTree -testPutBucketACLResponse = res - "PutBucketACLResponse" - "fixture/PutBucketACLResponse.proto" +testListPartsResponse :: ListPartsResponse -> TestTree +testListPartsResponse = res + "ListPartsResponse" + "fixture/ListPartsResponse.proto" s3 - (Proxy :: Proxy PutBucketACL) + (Proxy :: Proxy ListParts) testUploadPartCopyResponse :: UploadPartCopyResponse -> TestTree testUploadPartCopyResponse = res @@ -949,3 +942,10 @@ "fixture/UploadPartCopyResponse.proto" s3 (Proxy :: Proxy UploadPartCopy) + +testPutBucketACLResponse :: PutBucketACLResponse -> TestTree +testPutBucketACLResponse = res + "PutBucketACLResponse" + "fixture/PutBucketACLResponse.proto" + s3 + (Proxy :: Proxy PutBucketACL)