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-kms.cabal b/amazonka-kms.cabal --- a/amazonka-kms.cabal +++ b/amazonka-kms.cabal @@ -1,5 +1,5 @@ name: amazonka-kms -version: 1.2.0.2 +version: 1.3.0 synopsis: Amazon Key Management Service SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -147,7 +147,7 @@ , Network.AWS.KMS.Types.Sum build-depends: - amazonka-core == 1.2.0.* + amazonka-core == 1.3.0.* , base >= 4.7 && < 5 test-suite amazonka-kms-test @@ -167,9 +167,9 @@ , Test.AWS.KMS.Internal build-depends: - amazonka-core == 1.2.0.* - , amazonka-test == 1.2.0.* - , amazonka-kms == 1.2.0.* + amazonka-core == 1.3.0.* + , amazonka-test == 1.3.0.* + , amazonka-kms == 1.3.0.* , base , bytestring , lens diff --git a/gen/Network/AWS/KMS.hs b/gen/Network/AWS/KMS.hs --- a/gen/Network/AWS/KMS.hs +++ b/gen/Network/AWS/KMS.hs @@ -100,12 +100,12 @@ -- ** InvalidKeyUsageException , _InvalidKeyUsageException - -- ** UnsupportedOperationException - , _UnsupportedOperationException - -- ** MalformedPolicyDocumentException , _MalformedPolicyDocumentException + -- ** UnsupportedOperationException + , _UnsupportedOperationException + -- ** DisabledException , _DisabledException @@ -121,63 +121,63 @@ -- ** InvalidAliasNameException , _InvalidAliasNameException + -- ** InvalidGrantTokenException + , _InvalidGrantTokenException + -- ** InvalidARNException , _InvalidARNException -- ** DependencyTimeoutException , _DependencyTimeoutException - -- ** InvalidGrantTokenException - , _InvalidGrantTokenException - -- ** InvalidCiphertextException , _InvalidCiphertextException - -- ** LimitExceededException - , _LimitExceededException - -- ** AlreadyExistsException , _AlreadyExistsException + -- ** LimitExceededException + , _LimitExceededException + -- * Waiters -- $waiters -- * Operations -- $operations + -- ** Encrypt + , module Network.AWS.KMS.Encrypt + + -- ** ListGrants + , module Network.AWS.KMS.ListGrants + -- ** DisableKeyRotation , module Network.AWS.KMS.DisableKeyRotation -- ** GenerateDataKeyWithoutPlaintext , module Network.AWS.KMS.GenerateDataKeyWithoutPlaintext - -- ** ListGrants - , module Network.AWS.KMS.ListGrants - - -- ** Encrypt - , module Network.AWS.KMS.Encrypt - -- ** EnableKeyRotation , module Network.AWS.KMS.EnableKeyRotation - -- ** CreateGrant - , module Network.AWS.KMS.CreateGrant - -- ** CreateAlias , module Network.AWS.KMS.CreateAlias + -- ** CreateGrant + , module Network.AWS.KMS.CreateGrant + -- ** ListAliases , module Network.AWS.KMS.ListAliases -- ** GenerateRandom , module Network.AWS.KMS.GenerateRandom - -- ** DisableKey - , module Network.AWS.KMS.DisableKey - -- ** CreateKey , module Network.AWS.KMS.CreateKey + -- ** DisableKey + , module Network.AWS.KMS.DisableKey + -- ** RetireGrant , module Network.AWS.KMS.RetireGrant @@ -211,12 +211,12 @@ -- ** ListKeyPolicies , module Network.AWS.KMS.ListKeyPolicies - -- ** EnableKey - , module Network.AWS.KMS.EnableKey - -- ** PutKeyPolicy , module Network.AWS.KMS.PutKeyPolicy + -- ** EnableKey + , module Network.AWS.KMS.EnableKey + -- ** RevokeGrant , module Network.AWS.KMS.RevokeGrant @@ -260,14 +260,14 @@ -- ** KeyListEntry , KeyListEntry , keyListEntry - , kleKeyARN , kleKeyId + , kleKeyARN -- ** KeyMetadata , KeyMetadata , keyMetadata - , kmARN , kmEnabled + , kmARN , kmAWSAccountId , kmKeyUsage , kmCreationDate diff --git a/gen/Network/AWS/KMS/CreateGrant.hs b/gen/Network/AWS/KMS/CreateGrant.hs --- a/gen/Network/AWS/KMS/CreateGrant.hs +++ b/gen/Network/AWS/KMS/CreateGrant.hs @@ -37,8 +37,8 @@ , CreateGrant -- * Request Lenses , cgRetiringPrincipal - , cgConstraints , cgGrantTokens + , cgConstraints , cgOperations , cgKeyId , cgGranteePrincipal @@ -49,7 +49,7 @@ -- * Response Lenses , cgrsGrantId , cgrsGrantToken - , cgrsStatus + , cgrsResponseStatus ) where import Network.AWS.KMS.Types @@ -61,8 +61,8 @@ -- | /See:/ 'createGrant' smart constructor. data CreateGrant = CreateGrant' { _cgRetiringPrincipal :: !(Maybe Text) - , _cgConstraints :: !(Maybe GrantConstraints) , _cgGrantTokens :: !(Maybe [Text]) + , _cgConstraints :: !(Maybe GrantConstraints) , _cgOperations :: !(Maybe [GrantOperation]) , _cgKeyId :: !Text , _cgGranteePrincipal :: !Text @@ -74,10 +74,10 @@ -- -- * 'cgRetiringPrincipal' -- --- * 'cgConstraints' --- -- * 'cgGrantTokens' -- +-- * 'cgConstraints' +-- -- * 'cgOperations' -- -- * 'cgKeyId' @@ -90,8 +90,8 @@ createGrant pKeyId_ pGranteePrincipal_ = CreateGrant' { _cgRetiringPrincipal = Nothing - , _cgConstraints = Nothing , _cgGrantTokens = Nothing + , _cgConstraints = Nothing , _cgOperations = Nothing , _cgKeyId = pKeyId_ , _cgGranteePrincipal = pGranteePrincipal_ @@ -102,16 +102,16 @@ cgRetiringPrincipal :: Lens' CreateGrant (Maybe Text) cgRetiringPrincipal = lens _cgRetiringPrincipal (\ s a -> s{_cgRetiringPrincipal = a}); --- | Specifies the conditions under which the actions specified by the --- 'Operations' parameter are allowed. -cgConstraints :: Lens' CreateGrant (Maybe GrantConstraints) -cgConstraints = lens _cgConstraints (\ s a -> s{_cgConstraints = a}); - -- | For more information, see -- . cgGrantTokens :: Lens' CreateGrant [Text] cgGrantTokens = lens _cgGrantTokens (\ s a -> s{_cgGrantTokens = a}) . _Default . _Coerce; +-- | Specifies the conditions under which the actions specified by the +-- 'Operations' parameter are allowed. +cgConstraints :: Lens' CreateGrant (Maybe GrantConstraints) +cgConstraints = lens _cgConstraints (\ s a -> s{_cgConstraints = a}); + -- | List of operations permitted by the grant. This can be any combination -- of one or more of the following values: -- @@ -165,8 +165,8 @@ = object (catMaybes [("RetiringPrincipal" .=) <$> _cgRetiringPrincipal, - ("Constraints" .=) <$> _cgConstraints, ("GrantTokens" .=) <$> _cgGrantTokens, + ("Constraints" .=) <$> _cgConstraints, ("Operations" .=) <$> _cgOperations, Just ("KeyId" .= _cgKeyId), Just ("GranteePrincipal" .= _cgGranteePrincipal)]) @@ -179,9 +179,9 @@ -- | /See:/ 'createGrantResponse' smart constructor. data CreateGrantResponse = CreateGrantResponse' - { _cgrsGrantId :: !(Maybe Text) - , _cgrsGrantToken :: !(Maybe Text) - , _cgrsStatus :: !Int + { _cgrsGrantId :: !(Maybe Text) + , _cgrsGrantToken :: !(Maybe Text) + , _cgrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'CreateGrantResponse' with the minimum fields required to make a request. @@ -192,15 +192,15 @@ -- -- * 'cgrsGrantToken' -- --- * 'cgrsStatus' +-- * 'cgrsResponseStatus' createGrantResponse - :: Int -- ^ 'cgrsStatus' + :: Int -- ^ 'cgrsResponseStatus' -> CreateGrantResponse -createGrantResponse pStatus_ = +createGrantResponse pResponseStatus_ = CreateGrantResponse' { _cgrsGrantId = Nothing , _cgrsGrantToken = Nothing - , _cgrsStatus = pStatus_ + , _cgrsResponseStatus = pResponseStatus_ } -- | Unique grant identifier. You can use the /GrantId/ value to revoke a @@ -214,5 +214,5 @@ cgrsGrantToken = lens _cgrsGrantToken (\ s a -> s{_cgrsGrantToken = a}); -- | The response status code. -cgrsStatus :: Lens' CreateGrantResponse Int -cgrsStatus = lens _cgrsStatus (\ s a -> s{_cgrsStatus = a}); +cgrsResponseStatus :: Lens' CreateGrantResponse Int +cgrsResponseStatus = lens _cgrsResponseStatus (\ s a -> s{_cgrsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/CreateKey.hs b/gen/Network/AWS/KMS/CreateKey.hs --- a/gen/Network/AWS/KMS/CreateKey.hs +++ b/gen/Network/AWS/KMS/CreateKey.hs @@ -40,7 +40,7 @@ , CreateKeyResponse -- * Response Lenses , ckrsKeyMetadata - , ckrsStatus + , ckrsResponseStatus ) where import Network.AWS.KMS.Types @@ -124,8 +124,8 @@ -- | /See:/ 'createKeyResponse' smart constructor. data CreateKeyResponse = CreateKeyResponse' - { _ckrsKeyMetadata :: !(Maybe KeyMetadata) - , _ckrsStatus :: !Int + { _ckrsKeyMetadata :: !(Maybe KeyMetadata) + , _ckrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'CreateKeyResponse' with the minimum fields required to make a request. @@ -134,14 +134,14 @@ -- -- * 'ckrsKeyMetadata' -- --- * 'ckrsStatus' +-- * 'ckrsResponseStatus' createKeyResponse - :: Int -- ^ 'ckrsStatus' + :: Int -- ^ 'ckrsResponseStatus' -> CreateKeyResponse -createKeyResponse pStatus_ = +createKeyResponse pResponseStatus_ = CreateKeyResponse' { _ckrsKeyMetadata = Nothing - , _ckrsStatus = pStatus_ + , _ckrsResponseStatus = pResponseStatus_ } -- | Metadata associated with the key. @@ -149,5 +149,5 @@ ckrsKeyMetadata = lens _ckrsKeyMetadata (\ s a -> s{_ckrsKeyMetadata = a}); -- | The response status code. -ckrsStatus :: Lens' CreateKeyResponse Int -ckrsStatus = lens _ckrsStatus (\ s a -> s{_ckrsStatus = a}); +ckrsResponseStatus :: Lens' CreateKeyResponse Int +ckrsResponseStatus = lens _ckrsResponseStatus (\ s a -> s{_ckrsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/Decrypt.hs b/gen/Network/AWS/KMS/Decrypt.hs --- a/gen/Network/AWS/KMS/Decrypt.hs +++ b/gen/Network/AWS/KMS/Decrypt.hs @@ -51,7 +51,7 @@ -- * Response Lenses , drsKeyId , drsPlaintext - , drsStatus + , drsResponseStatus ) where import Network.AWS.KMS.Types @@ -143,9 +143,9 @@ -- | /See:/ 'decryptResponse' smart constructor. data DecryptResponse = DecryptResponse' - { _drsKeyId :: !(Maybe Text) - , _drsPlaintext :: !(Maybe (Sensitive Base64)) - , _drsStatus :: !Int + { _drsKeyId :: !(Maybe Text) + , _drsPlaintext :: !(Maybe (Sensitive Base64)) + , _drsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'DecryptResponse' with the minimum fields required to make a request. @@ -156,15 +156,15 @@ -- -- * 'drsPlaintext' -- --- * 'drsStatus' +-- * 'drsResponseStatus' decryptResponse - :: Int -- ^ 'drsStatus' + :: Int -- ^ 'drsResponseStatus' -> DecryptResponse -decryptResponse pStatus_ = +decryptResponse pResponseStatus_ = DecryptResponse' { _drsKeyId = Nothing , _drsPlaintext = Nothing - , _drsStatus = pStatus_ + , _drsResponseStatus = pResponseStatus_ } -- | ARN of the key used to perform the decryption. This value is returned if @@ -184,5 +184,5 @@ drsPlaintext = lens _drsPlaintext (\ s a -> s{_drsPlaintext = a}) . mapping (_Sensitive . _Base64); -- | The response status code. -drsStatus :: Lens' DecryptResponse Int -drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a}); +drsResponseStatus :: Lens' DecryptResponse Int +drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/DescribeKey.hs b/gen/Network/AWS/KMS/DescribeKey.hs --- a/gen/Network/AWS/KMS/DescribeKey.hs +++ b/gen/Network/AWS/KMS/DescribeKey.hs @@ -34,7 +34,7 @@ , DescribeKeyResponse -- * Response Lenses , dkrsKeyMetadata - , dkrsStatus + , dkrsResponseStatus ) where import Network.AWS.KMS.Types @@ -105,8 +105,8 @@ -- | /See:/ 'describeKeyResponse' smart constructor. data DescribeKeyResponse = DescribeKeyResponse' - { _dkrsKeyMetadata :: !(Maybe KeyMetadata) - , _dkrsStatus :: !Int + { _dkrsKeyMetadata :: !(Maybe KeyMetadata) + , _dkrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'DescribeKeyResponse' with the minimum fields required to make a request. @@ -115,14 +115,14 @@ -- -- * 'dkrsKeyMetadata' -- --- * 'dkrsStatus' +-- * 'dkrsResponseStatus' describeKeyResponse - :: Int -- ^ 'dkrsStatus' + :: Int -- ^ 'dkrsResponseStatus' -> DescribeKeyResponse -describeKeyResponse pStatus_ = +describeKeyResponse pResponseStatus_ = DescribeKeyResponse' { _dkrsKeyMetadata = Nothing - , _dkrsStatus = pStatus_ + , _dkrsResponseStatus = pResponseStatus_ } -- | Metadata associated with the key. @@ -130,5 +130,5 @@ dkrsKeyMetadata = lens _dkrsKeyMetadata (\ s a -> s{_dkrsKeyMetadata = a}); -- | The response status code. -dkrsStatus :: Lens' DescribeKeyResponse Int -dkrsStatus = lens _dkrsStatus (\ s a -> s{_dkrsStatus = a}); +dkrsResponseStatus :: Lens' DescribeKeyResponse Int +dkrsResponseStatus = lens _dkrsResponseStatus (\ s a -> s{_dkrsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/Encrypt.hs b/gen/Network/AWS/KMS/Encrypt.hs --- a/gen/Network/AWS/KMS/Encrypt.hs +++ b/gen/Network/AWS/KMS/Encrypt.hs @@ -59,7 +59,7 @@ -- * Response Lenses , ersKeyId , ersCiphertextBlob - , ersStatus + , ersResponseStatus ) where import Network.AWS.KMS.Types @@ -173,7 +173,7 @@ data EncryptResponse = EncryptResponse' { _ersKeyId :: !(Maybe Text) , _ersCiphertextBlob :: !(Maybe Base64) - , _ersStatus :: !Int + , _ersResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'EncryptResponse' with the minimum fields required to make a request. @@ -184,15 +184,15 @@ -- -- * 'ersCiphertextBlob' -- --- * 'ersStatus' +-- * 'ersResponseStatus' encryptResponse - :: Int -- ^ 'ersStatus' + :: Int -- ^ 'ersResponseStatus' -> EncryptResponse -encryptResponse pStatus_ = +encryptResponse pResponseStatus_ = EncryptResponse' { _ersKeyId = Nothing , _ersCiphertextBlob = Nothing - , _ersStatus = pStatus_ + , _ersResponseStatus = pResponseStatus_ } -- | The ID of the key used during encryption. @@ -211,5 +211,5 @@ ersCiphertextBlob = lens _ersCiphertextBlob (\ s a -> s{_ersCiphertextBlob = a}) . mapping _Base64; -- | The response status code. -ersStatus :: Lens' EncryptResponse Int -ersStatus = lens _ersStatus (\ s a -> s{_ersStatus = a}); +ersResponseStatus :: Lens' EncryptResponse Int +ersResponseStatus = lens _ersResponseStatus (\ s a -> s{_ersResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/GenerateDataKey.hs b/gen/Network/AWS/KMS/GenerateDataKey.hs --- a/gen/Network/AWS/KMS/GenerateDataKey.hs +++ b/gen/Network/AWS/KMS/GenerateDataKey.hs @@ -70,7 +70,7 @@ , generateDataKeyResponse , GenerateDataKeyResponse -- * Response Lenses - , gdkrsStatus + , gdkrsResponseStatus , gdkrsKeyId , gdkrsPlaintext , gdkrsCiphertextBlob @@ -191,7 +191,7 @@ -- | /See:/ 'generateDataKeyResponse' smart constructor. data GenerateDataKeyResponse = GenerateDataKeyResponse' - { _gdkrsStatus :: !Int + { _gdkrsResponseStatus :: !Int , _gdkrsKeyId :: !Text , _gdkrsPlaintext :: !(Sensitive Base64) , _gdkrsCiphertextBlob :: !Base64 @@ -201,7 +201,7 @@ -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'gdkrsStatus' +-- * 'gdkrsResponseStatus' -- -- * 'gdkrsKeyId' -- @@ -209,22 +209,22 @@ -- -- * 'gdkrsCiphertextBlob' generateDataKeyResponse - :: Int -- ^ 'gdkrsStatus' + :: Int -- ^ 'gdkrsResponseStatus' -> Text -- ^ 'gdkrsKeyId' -> ByteString -- ^ 'gdkrsPlaintext' -> ByteString -- ^ 'gdkrsCiphertextBlob' -> GenerateDataKeyResponse -generateDataKeyResponse pStatus_ pKeyId_ pPlaintext_ pCiphertextBlob_ = +generateDataKeyResponse pResponseStatus_ pKeyId_ pPlaintext_ pCiphertextBlob_ = GenerateDataKeyResponse' - { _gdkrsStatus = pStatus_ + { _gdkrsResponseStatus = pResponseStatus_ , _gdkrsKeyId = pKeyId_ , _gdkrsPlaintext = _Sensitive . _Base64 # pPlaintext_ , _gdkrsCiphertextBlob = _Base64 # pCiphertextBlob_ } -- | The response status code. -gdkrsStatus :: Lens' GenerateDataKeyResponse Int -gdkrsStatus = lens _gdkrsStatus (\ s a -> s{_gdkrsStatus = a}); +gdkrsResponseStatus :: Lens' GenerateDataKeyResponse Int +gdkrsResponseStatus = lens _gdkrsResponseStatus (\ s a -> s{_gdkrsResponseStatus = a}); -- | System generated unique identifier of the key to be used to decrypt the -- encrypted copy of the data key. diff --git a/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs b/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs --- a/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs +++ b/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs @@ -43,7 +43,7 @@ -- * Response Lenses , gdkwprsKeyId , gdkwprsCiphertextBlob - , gdkwprsStatus + , gdkwprsResponseStatus ) where import Network.AWS.KMS.Types @@ -165,7 +165,7 @@ data GenerateDataKeyWithoutPlaintextResponse = GenerateDataKeyWithoutPlaintextResponse' { _gdkwprsKeyId :: !(Maybe Text) , _gdkwprsCiphertextBlob :: !(Maybe Base64) - , _gdkwprsStatus :: !Int + , _gdkwprsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GenerateDataKeyWithoutPlaintextResponse' with the minimum fields required to make a request. @@ -176,15 +176,15 @@ -- -- * 'gdkwprsCiphertextBlob' -- --- * 'gdkwprsStatus' +-- * 'gdkwprsResponseStatus' generateDataKeyWithoutPlaintextResponse - :: Int -- ^ 'gdkwprsStatus' + :: Int -- ^ 'gdkwprsResponseStatus' -> GenerateDataKeyWithoutPlaintextResponse -generateDataKeyWithoutPlaintextResponse pStatus_ = +generateDataKeyWithoutPlaintextResponse pResponseStatus_ = GenerateDataKeyWithoutPlaintextResponse' { _gdkwprsKeyId = Nothing , _gdkwprsCiphertextBlob = Nothing - , _gdkwprsStatus = pStatus_ + , _gdkwprsResponseStatus = pResponseStatus_ } -- | System generated unique identifier of the key to be used to decrypt the @@ -208,5 +208,5 @@ gdkwprsCiphertextBlob = lens _gdkwprsCiphertextBlob (\ s a -> s{_gdkwprsCiphertextBlob = a}) . mapping _Base64; -- | The response status code. -gdkwprsStatus :: Lens' GenerateDataKeyWithoutPlaintextResponse Int -gdkwprsStatus = lens _gdkwprsStatus (\ s a -> s{_gdkwprsStatus = a}); +gdkwprsResponseStatus :: Lens' GenerateDataKeyWithoutPlaintextResponse Int +gdkwprsResponseStatus = lens _gdkwprsResponseStatus (\ s a -> s{_gdkwprsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/GenerateRandom.hs b/gen/Network/AWS/KMS/GenerateRandom.hs --- a/gen/Network/AWS/KMS/GenerateRandom.hs +++ b/gen/Network/AWS/KMS/GenerateRandom.hs @@ -34,7 +34,7 @@ , GenerateRandomResponse -- * Response Lenses , grrsPlaintext - , grrsStatus + , grrsResponseStatus ) where import Network.AWS.KMS.Types @@ -97,8 +97,8 @@ -- | /See:/ 'generateRandomResponse' smart constructor. data GenerateRandomResponse = GenerateRandomResponse' - { _grrsPlaintext :: !(Maybe (Sensitive Base64)) - , _grrsStatus :: !Int + { _grrsPlaintext :: !(Maybe (Sensitive Base64)) + , _grrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GenerateRandomResponse' with the minimum fields required to make a request. @@ -107,14 +107,14 @@ -- -- * 'grrsPlaintext' -- --- * 'grrsStatus' +-- * 'grrsResponseStatus' generateRandomResponse - :: Int -- ^ 'grrsStatus' + :: Int -- ^ 'grrsResponseStatus' -> GenerateRandomResponse -generateRandomResponse pStatus_ = +generateRandomResponse pResponseStatus_ = GenerateRandomResponse' { _grrsPlaintext = Nothing - , _grrsStatus = pStatus_ + , _grrsResponseStatus = pResponseStatus_ } -- | Plaintext that contains the unpredictable byte string. @@ -128,5 +128,5 @@ grrsPlaintext = lens _grrsPlaintext (\ s a -> s{_grrsPlaintext = a}) . mapping (_Sensitive . _Base64); -- | The response status code. -grrsStatus :: Lens' GenerateRandomResponse Int -grrsStatus = lens _grrsStatus (\ s a -> s{_grrsStatus = a}); +grrsResponseStatus :: Lens' GenerateRandomResponse Int +grrsResponseStatus = lens _grrsResponseStatus (\ s a -> s{_grrsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/GetKeyPolicy.hs b/gen/Network/AWS/KMS/GetKeyPolicy.hs --- a/gen/Network/AWS/KMS/GetKeyPolicy.hs +++ b/gen/Network/AWS/KMS/GetKeyPolicy.hs @@ -35,7 +35,7 @@ , GetKeyPolicyResponse -- * Response Lenses , gkprsPolicy - , gkprsStatus + , gkprsResponseStatus ) where import Network.AWS.KMS.Types @@ -115,8 +115,8 @@ -- | /See:/ 'getKeyPolicyResponse' smart constructor. data GetKeyPolicyResponse = GetKeyPolicyResponse' - { _gkprsPolicy :: !(Maybe Text) - , _gkprsStatus :: !Int + { _gkprsPolicy :: !(Maybe Text) + , _gkprsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetKeyPolicyResponse' with the minimum fields required to make a request. @@ -125,14 +125,14 @@ -- -- * 'gkprsPolicy' -- --- * 'gkprsStatus' +-- * 'gkprsResponseStatus' getKeyPolicyResponse - :: Int -- ^ 'gkprsStatus' + :: Int -- ^ 'gkprsResponseStatus' -> GetKeyPolicyResponse -getKeyPolicyResponse pStatus_ = +getKeyPolicyResponse pResponseStatus_ = GetKeyPolicyResponse' { _gkprsPolicy = Nothing - , _gkprsStatus = pStatus_ + , _gkprsResponseStatus = pResponseStatus_ } -- | A policy document in JSON format. @@ -140,5 +140,5 @@ gkprsPolicy = lens _gkprsPolicy (\ s a -> s{_gkprsPolicy = a}); -- | The response status code. -gkprsStatus :: Lens' GetKeyPolicyResponse Int -gkprsStatus = lens _gkprsStatus (\ s a -> s{_gkprsStatus = a}); +gkprsResponseStatus :: Lens' GetKeyPolicyResponse Int +gkprsResponseStatus = lens _gkprsResponseStatus (\ s a -> s{_gkprsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/GetKeyRotationStatus.hs b/gen/Network/AWS/KMS/GetKeyRotationStatus.hs --- a/gen/Network/AWS/KMS/GetKeyRotationStatus.hs +++ b/gen/Network/AWS/KMS/GetKeyRotationStatus.hs @@ -35,7 +35,7 @@ , GetKeyRotationStatusResponse -- * Response Lenses , gkrsrsKeyRotationEnabled - , gkrsrsStatus + , gkrsrsResponseStatus ) where import Network.AWS.KMS.Types @@ -104,7 +104,7 @@ -- | /See:/ 'getKeyRotationStatusResponse' smart constructor. data GetKeyRotationStatusResponse = GetKeyRotationStatusResponse' { _gkrsrsKeyRotationEnabled :: !(Maybe Bool) - , _gkrsrsStatus :: !Int + , _gkrsrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'GetKeyRotationStatusResponse' with the minimum fields required to make a request. @@ -113,14 +113,14 @@ -- -- * 'gkrsrsKeyRotationEnabled' -- --- * 'gkrsrsStatus' +-- * 'gkrsrsResponseStatus' getKeyRotationStatusResponse - :: Int -- ^ 'gkrsrsStatus' + :: Int -- ^ 'gkrsrsResponseStatus' -> GetKeyRotationStatusResponse -getKeyRotationStatusResponse pStatus_ = +getKeyRotationStatusResponse pResponseStatus_ = GetKeyRotationStatusResponse' { _gkrsrsKeyRotationEnabled = Nothing - , _gkrsrsStatus = pStatus_ + , _gkrsrsResponseStatus = pResponseStatus_ } -- | A Boolean value that specifies whether key rotation is enabled. @@ -128,5 +128,5 @@ gkrsrsKeyRotationEnabled = lens _gkrsrsKeyRotationEnabled (\ s a -> s{_gkrsrsKeyRotationEnabled = a}); -- | The response status code. -gkrsrsStatus :: Lens' GetKeyRotationStatusResponse Int -gkrsrsStatus = lens _gkrsrsStatus (\ s a -> s{_gkrsrsStatus = a}); +gkrsrsResponseStatus :: Lens' GetKeyRotationStatusResponse Int +gkrsrsResponseStatus = lens _gkrsrsResponseStatus (\ s a -> s{_gkrsrsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/ListAliases.hs b/gen/Network/AWS/KMS/ListAliases.hs --- a/gen/Network/AWS/KMS/ListAliases.hs +++ b/gen/Network/AWS/KMS/ListAliases.hs @@ -37,7 +37,7 @@ , larsTruncated , larsAliases , larsNextMarker - , larsStatus + , larsResponseStatus ) where import Network.AWS.KMS.Types @@ -116,10 +116,10 @@ -- | /See:/ 'listAliasesResponse' smart constructor. data ListAliasesResponse = ListAliasesResponse' - { _larsTruncated :: !(Maybe Bool) - , _larsAliases :: !(Maybe [AliasListEntry]) - , _larsNextMarker :: !(Maybe Text) - , _larsStatus :: !Int + { _larsTruncated :: !(Maybe Bool) + , _larsAliases :: !(Maybe [AliasListEntry]) + , _larsNextMarker :: !(Maybe Text) + , _larsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListAliasesResponse' with the minimum fields required to make a request. @@ -132,16 +132,16 @@ -- -- * 'larsNextMarker' -- --- * 'larsStatus' +-- * 'larsResponseStatus' listAliasesResponse - :: Int -- ^ 'larsStatus' + :: Int -- ^ 'larsResponseStatus' -> ListAliasesResponse -listAliasesResponse pStatus_ = +listAliasesResponse pResponseStatus_ = ListAliasesResponse' { _larsTruncated = Nothing , _larsAliases = Nothing , _larsNextMarker = Nothing - , _larsStatus = pStatus_ + , _larsResponseStatus = pResponseStatus_ } -- | A flag that indicates whether there are more items in the list. If your @@ -162,5 +162,5 @@ larsNextMarker = lens _larsNextMarker (\ s a -> s{_larsNextMarker = a}); -- | The response status code. -larsStatus :: Lens' ListAliasesResponse Int -larsStatus = lens _larsStatus (\ s a -> s{_larsStatus = a}); +larsResponseStatus :: Lens' ListAliasesResponse Int +larsResponseStatus = lens _larsResponseStatus (\ s a -> s{_larsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/ListGrants.hs b/gen/Network/AWS/KMS/ListGrants.hs --- a/gen/Network/AWS/KMS/ListGrants.hs +++ b/gen/Network/AWS/KMS/ListGrants.hs @@ -38,7 +38,7 @@ , lgrsTruncated , lgrsGrants , lgrsNextMarker - , lgrsStatus + , lgrsResponseStatus ) where import Network.AWS.KMS.Types @@ -133,10 +133,10 @@ -- | /See:/ 'listGrantsResponse' smart constructor. data ListGrantsResponse = ListGrantsResponse' - { _lgrsTruncated :: !(Maybe Bool) - , _lgrsGrants :: !(Maybe [GrantListEntry]) - , _lgrsNextMarker :: !(Maybe Text) - , _lgrsStatus :: !Int + { _lgrsTruncated :: !(Maybe Bool) + , _lgrsGrants :: !(Maybe [GrantListEntry]) + , _lgrsNextMarker :: !(Maybe Text) + , _lgrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListGrantsResponse' with the minimum fields required to make a request. @@ -149,16 +149,16 @@ -- -- * 'lgrsNextMarker' -- --- * 'lgrsStatus' +-- * 'lgrsResponseStatus' listGrantsResponse - :: Int -- ^ 'lgrsStatus' + :: Int -- ^ 'lgrsResponseStatus' -> ListGrantsResponse -listGrantsResponse pStatus_ = +listGrantsResponse pResponseStatus_ = ListGrantsResponse' { _lgrsTruncated = Nothing , _lgrsGrants = Nothing , _lgrsNextMarker = Nothing - , _lgrsStatus = pStatus_ + , _lgrsResponseStatus = pResponseStatus_ } -- | A flag that indicates whether there are more items in the list. If your @@ -179,5 +179,5 @@ lgrsNextMarker = lens _lgrsNextMarker (\ s a -> s{_lgrsNextMarker = a}); -- | The response status code. -lgrsStatus :: Lens' ListGrantsResponse Int -lgrsStatus = lens _lgrsStatus (\ s a -> s{_lgrsStatus = a}); +lgrsResponseStatus :: Lens' ListGrantsResponse Int +lgrsResponseStatus = lens _lgrsResponseStatus (\ s a -> s{_lgrsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/ListKeyPolicies.hs b/gen/Network/AWS/KMS/ListKeyPolicies.hs --- a/gen/Network/AWS/KMS/ListKeyPolicies.hs +++ b/gen/Network/AWS/KMS/ListKeyPolicies.hs @@ -38,7 +38,7 @@ , lkprsPolicyNames , lkprsTruncated , lkprsNextMarker - , lkprsStatus + , lkprsResponseStatus ) where import Network.AWS.KMS.Types @@ -138,10 +138,10 @@ -- | /See:/ 'listKeyPoliciesResponse' smart constructor. data ListKeyPoliciesResponse = ListKeyPoliciesResponse' - { _lkprsPolicyNames :: !(Maybe [Text]) - , _lkprsTruncated :: !(Maybe Bool) - , _lkprsNextMarker :: !(Maybe Text) - , _lkprsStatus :: !Int + { _lkprsPolicyNames :: !(Maybe [Text]) + , _lkprsTruncated :: !(Maybe Bool) + , _lkprsNextMarker :: !(Maybe Text) + , _lkprsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListKeyPoliciesResponse' with the minimum fields required to make a request. @@ -154,16 +154,16 @@ -- -- * 'lkprsNextMarker' -- --- * 'lkprsStatus' +-- * 'lkprsResponseStatus' listKeyPoliciesResponse - :: Int -- ^ 'lkprsStatus' + :: Int -- ^ 'lkprsResponseStatus' -> ListKeyPoliciesResponse -listKeyPoliciesResponse pStatus_ = +listKeyPoliciesResponse pResponseStatus_ = ListKeyPoliciesResponse' { _lkprsPolicyNames = Nothing , _lkprsTruncated = Nothing , _lkprsNextMarker = Nothing - , _lkprsStatus = pStatus_ + , _lkprsResponseStatus = pResponseStatus_ } -- | A list of policy names. Currently, there is only one policy and it is @@ -185,5 +185,5 @@ lkprsNextMarker = lens _lkprsNextMarker (\ s a -> s{_lkprsNextMarker = a}); -- | The response status code. -lkprsStatus :: Lens' ListKeyPoliciesResponse Int -lkprsStatus = lens _lkprsStatus (\ s a -> s{_lkprsStatus = a}); +lkprsResponseStatus :: Lens' ListKeyPoliciesResponse Int +lkprsResponseStatus = lens _lkprsResponseStatus (\ s a -> s{_lkprsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/ListKeys.hs b/gen/Network/AWS/KMS/ListKeys.hs --- a/gen/Network/AWS/KMS/ListKeys.hs +++ b/gen/Network/AWS/KMS/ListKeys.hs @@ -37,7 +37,7 @@ , lkrsTruncated , lkrsKeys , lkrsNextMarker - , lkrsStatus + , lkrsResponseStatus ) where import Network.AWS.KMS.Types @@ -116,10 +116,10 @@ -- | /See:/ 'listKeysResponse' smart constructor. data ListKeysResponse = ListKeysResponse' - { _lkrsTruncated :: !(Maybe Bool) - , _lkrsKeys :: !(Maybe [KeyListEntry]) - , _lkrsNextMarker :: !(Maybe Text) - , _lkrsStatus :: !Int + { _lkrsTruncated :: !(Maybe Bool) + , _lkrsKeys :: !(Maybe [KeyListEntry]) + , _lkrsNextMarker :: !(Maybe Text) + , _lkrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ListKeysResponse' with the minimum fields required to make a request. @@ -132,16 +132,16 @@ -- -- * 'lkrsNextMarker' -- --- * 'lkrsStatus' +-- * 'lkrsResponseStatus' listKeysResponse - :: Int -- ^ 'lkrsStatus' + :: Int -- ^ 'lkrsResponseStatus' -> ListKeysResponse -listKeysResponse pStatus_ = +listKeysResponse pResponseStatus_ = ListKeysResponse' { _lkrsTruncated = Nothing , _lkrsKeys = Nothing , _lkrsNextMarker = Nothing - , _lkrsStatus = pStatus_ + , _lkrsResponseStatus = pResponseStatus_ } -- | A flag that indicates whether there are more items in the list. If your @@ -161,5 +161,5 @@ lkrsNextMarker = lens _lkrsNextMarker (\ s a -> s{_lkrsNextMarker = a}); -- | The response status code. -lkrsStatus :: Lens' ListKeysResponse Int -lkrsStatus = lens _lkrsStatus (\ s a -> s{_lkrsStatus = a}); +lkrsResponseStatus :: Lens' ListKeysResponse Int +lkrsResponseStatus = lens _lkrsResponseStatus (\ s a -> s{_lkrsResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/ReEncrypt.hs b/gen/Network/AWS/KMS/ReEncrypt.hs --- a/gen/Network/AWS/KMS/ReEncrypt.hs +++ b/gen/Network/AWS/KMS/ReEncrypt.hs @@ -52,7 +52,7 @@ , rersSourceKeyId , rersKeyId , rersCiphertextBlob - , rersStatus + , rersResponseStatus ) where import Network.AWS.KMS.Types @@ -178,7 +178,7 @@ { _rersSourceKeyId :: !(Maybe Text) , _rersKeyId :: !(Maybe Text) , _rersCiphertextBlob :: !(Maybe Base64) - , _rersStatus :: !Int + , _rersResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'ReEncryptResponse' with the minimum fields required to make a request. @@ -191,16 +191,16 @@ -- -- * 'rersCiphertextBlob' -- --- * 'rersStatus' +-- * 'rersResponseStatus' reEncryptResponse - :: Int -- ^ 'rersStatus' + :: Int -- ^ 'rersResponseStatus' -> ReEncryptResponse -reEncryptResponse pStatus_ = +reEncryptResponse pResponseStatus_ = ReEncryptResponse' { _rersSourceKeyId = Nothing , _rersKeyId = Nothing , _rersCiphertextBlob = Nothing - , _rersStatus = pStatus_ + , _rersResponseStatus = pResponseStatus_ } -- | Unique identifier of the key used to originally encrypt the data. @@ -223,5 +223,5 @@ rersCiphertextBlob = lens _rersCiphertextBlob (\ s a -> s{_rersCiphertextBlob = a}) . mapping _Base64; -- | The response status code. -rersStatus :: Lens' ReEncryptResponse Int -rersStatus = lens _rersStatus (\ s a -> s{_rersStatus = a}); +rersResponseStatus :: Lens' ReEncryptResponse Int +rersResponseStatus = lens _rersResponseStatus (\ s a -> s{_rersResponseStatus = a}); diff --git a/gen/Network/AWS/KMS/Types.hs b/gen/Network/AWS/KMS/Types.hs --- a/gen/Network/AWS/KMS/Types.hs +++ b/gen/Network/AWS/KMS/Types.hs @@ -18,19 +18,19 @@ -- * Errors , _InvalidMarkerException , _InvalidKeyUsageException - , _UnsupportedOperationException , _MalformedPolicyDocumentException + , _UnsupportedOperationException , _DisabledException , _KeyUnavailableException , _KMSInternalException , _NotFoundException , _InvalidAliasNameException + , _InvalidGrantTokenException , _InvalidARNException , _DependencyTimeoutException - , _InvalidGrantTokenException , _InvalidCiphertextException - , _LimitExceededException , _AlreadyExistsException + , _LimitExceededException -- * DataKeySpec , DataKeySpec (..) @@ -67,14 +67,14 @@ -- * KeyListEntry , KeyListEntry , keyListEntry - , kleKeyARN , kleKeyId + , kleKeyARN -- * KeyMetadata , KeyMetadata , keyMetadata - , kmARN , kmEnabled + , kmARN , kmAWSAccountId , kmKeyUsage , kmCreationDate @@ -130,17 +130,17 @@ _InvalidKeyUsageException = _ServiceError . hasStatus 400 . hasCode "InvalidKeyUsage" --- | The request was rejected because a specified parameter is not supported. -_UnsupportedOperationException :: AsError a => Getting (First ServiceError) a ServiceError -_UnsupportedOperationException = - _ServiceError . hasStatus 400 . hasCode "UnsupportedOperation" - -- | The request was rejected because the specified policy is not -- syntactically or semantically correct. _MalformedPolicyDocumentException :: AsError a => Getting (First ServiceError) a ServiceError _MalformedPolicyDocumentException = _ServiceError . hasStatus 400 . hasCode "MalformedPolicyDocument" +-- | The request was rejected because a specified parameter is not supported. +_UnsupportedOperationException :: AsError a => Getting (First ServiceError) a ServiceError +_UnsupportedOperationException = + _ServiceError . hasStatus 400 . hasCode "UnsupportedOperation" + -- | A request was rejected because the specified key was marked as disabled. _DisabledException :: AsError a => Getting (First ServiceError) a ServiceError _DisabledException = _ServiceError . hasStatus 409 . hasCode "Disabled" @@ -166,6 +166,11 @@ _InvalidAliasNameException = _ServiceError . hasStatus 400 . hasCode "InvalidAliasName" +-- | A grant token provided as part of the request is invalid. +_InvalidGrantTokenException :: AsError a => Getting (First ServiceError) a ServiceError +_InvalidGrantTokenException = + _ServiceError . hasStatus 400 . hasCode "InvalidGrantToken" + -- | The request was rejected because a specified ARN was not valid. _InvalidARNException :: AsError a => Getting (First ServiceError) a ServiceError _InvalidARNException = _ServiceError . hasStatus 400 . hasCode "InvalidArn" @@ -175,24 +180,19 @@ _DependencyTimeoutException = _ServiceError . hasStatus 503 . hasCode "DependencyTimeout" --- | A grant token provided as part of the request is invalid. -_InvalidGrantTokenException :: AsError a => Getting (First ServiceError) a ServiceError -_InvalidGrantTokenException = - _ServiceError . hasStatus 400 . hasCode "InvalidGrantToken" - -- | The request was rejected because the specified ciphertext has been -- corrupted or is otherwise invalid. _InvalidCiphertextException :: AsError a => Getting (First ServiceError) a ServiceError _InvalidCiphertextException = _ServiceError . hasStatus 400 . hasCode "InvalidCiphertext" --- | The request was rejected because a quota was exceeded. -_LimitExceededException :: AsError a => Getting (First ServiceError) a ServiceError -_LimitExceededException = - _ServiceError . hasStatus 400 . hasCode "LimitExceeded" - -- | The request was rejected because it attempted to create a resource that -- already exists. _AlreadyExistsException :: AsError a => Getting (First ServiceError) a ServiceError _AlreadyExistsException = _ServiceError . hasStatus 400 . hasCode "AlreadyExists" + +-- | The request was rejected because a quota was exceeded. +_LimitExceededException :: AsError a => Getting (First ServiceError) a ServiceError +_LimitExceededException = + _ServiceError . hasStatus 400 . hasCode "LimitExceeded" diff --git a/gen/Network/AWS/KMS/Types/Product.hs b/gen/Network/AWS/KMS/Types/Product.hs --- a/gen/Network/AWS/KMS/Types/Product.hs +++ b/gen/Network/AWS/KMS/Types/Product.hs @@ -205,46 +205,46 @@ -- -- /See:/ 'keyListEntry' smart constructor. data KeyListEntry = KeyListEntry' - { _kleKeyARN :: !(Maybe Text) - , _kleKeyId :: !(Maybe Text) + { _kleKeyId :: !(Maybe Text) + , _kleKeyARN :: !(Maybe Text) } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'KeyListEntry' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'kleKeyARN' --- -- * 'kleKeyId' +-- +-- * 'kleKeyARN' keyListEntry :: KeyListEntry keyListEntry = KeyListEntry' - { _kleKeyARN = Nothing - , _kleKeyId = Nothing + { _kleKeyId = Nothing + , _kleKeyARN = Nothing } --- | ARN of the key. -kleKeyARN :: Lens' KeyListEntry (Maybe Text) -kleKeyARN = lens _kleKeyARN (\ s a -> s{_kleKeyARN = a}); - -- | Unique identifier of the key. kleKeyId :: Lens' KeyListEntry (Maybe Text) kleKeyId = lens _kleKeyId (\ s a -> s{_kleKeyId = a}); +-- | ARN of the key. +kleKeyARN :: Lens' KeyListEntry (Maybe Text) +kleKeyARN = lens _kleKeyARN (\ s a -> s{_kleKeyARN = a}); + instance FromJSON KeyListEntry where parseJSON = withObject "KeyListEntry" (\ x -> KeyListEntry' <$> - (x .:? "KeyArn") <*> (x .:? "KeyId")) + (x .:? "KeyId") <*> (x .:? "KeyArn")) -- | Contains metadata associated with a specific key. -- -- /See:/ 'keyMetadata' smart constructor. data KeyMetadata = KeyMetadata' - { _kmARN :: !(Maybe Text) - , _kmEnabled :: !(Maybe Bool) + { _kmEnabled :: !(Maybe Bool) + , _kmARN :: !(Maybe Text) , _kmAWSAccountId :: !(Maybe Text) , _kmKeyUsage :: !(Maybe KeyUsageType) , _kmCreationDate :: !(Maybe POSIX) @@ -256,10 +256,10 @@ -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'kmARN' --- -- * 'kmEnabled' -- +-- * 'kmARN' +-- -- * 'kmAWSAccountId' -- -- * 'kmKeyUsage' @@ -274,8 +274,8 @@ -> KeyMetadata keyMetadata pKeyId_ = KeyMetadata' - { _kmARN = Nothing - , _kmEnabled = Nothing + { _kmEnabled = Nothing + , _kmARN = Nothing , _kmAWSAccountId = Nothing , _kmKeyUsage = Nothing , _kmCreationDate = Nothing @@ -283,14 +283,14 @@ , _kmKeyId = pKeyId_ } --- | Key ARN (Amazon Resource Name). -kmARN :: Lens' KeyMetadata (Maybe Text) -kmARN = lens _kmARN (\ s a -> s{_kmARN = a}); - -- | Value that specifies whether the key is enabled. kmEnabled :: Lens' KeyMetadata (Maybe Bool) kmEnabled = lens _kmEnabled (\ s a -> s{_kmEnabled = a}); +-- | Key ARN (Amazon Resource Name). +kmARN :: Lens' KeyMetadata (Maybe Text) +kmARN = lens _kmARN (\ s a -> s{_kmARN = a}); + -- | Account ID number. kmAWSAccountId :: Lens' KeyMetadata (Maybe Text) kmAWSAccountId = lens _kmAWSAccountId (\ s a -> s{_kmAWSAccountId = a}); @@ -316,7 +316,7 @@ = withObject "KeyMetadata" (\ x -> KeyMetadata' <$> - (x .:? "Arn") <*> (x .:? "Enabled") <*> + (x .:? "Enabled") <*> (x .:? "Arn") <*> (x .:? "AWSAccountId") <*> (x .:? "KeyUsage") <*> (x .:? "CreationDate") diff --git a/test/Test/AWS/Gen/KMS.hs b/test/Test/AWS/Gen/KMS.hs --- a/test/Test/AWS/Gen/KMS.hs +++ b/test/Test/AWS/Gen/KMS.hs @@ -28,39 +28,39 @@ -- fixtures :: TestTree -- fixtures = -- [ testGroup "request" --- [ testDisableKeyRotation $ --- disableKeyRotation --- --- , testGenerateDataKeyWithoutPlaintext $ --- generateDataKeyWithoutPlaintext +-- [ testEncrypt $ +-- encrypt -- -- , testListGrants $ -- listGrants -- --- , testEncrypt $ --- encrypt +-- , testDisableKeyRotation $ +-- disableKeyRotation -- +-- , testGenerateDataKeyWithoutPlaintext $ +-- generateDataKeyWithoutPlaintext +-- -- , testEnableKeyRotation $ -- enableKeyRotation -- --- , testCreateGrant $ --- createGrant --- -- , testCreateAlias $ -- createAlias -- +-- , testCreateGrant $ +-- createGrant +-- -- , testListAliases $ -- listAliases -- -- , testGenerateRandom $ -- generateRandom -- --- , testDisableKey $ --- disableKey --- -- , testCreateKey $ -- createKey -- +-- , testDisableKey $ +-- disableKey +-- -- , testRetireGrant $ -- retireGrant -- @@ -94,12 +94,12 @@ -- , testListKeyPolicies $ -- listKeyPolicies -- --- , testEnableKey $ --- enableKey --- -- , testPutKeyPolicy $ -- putKeyPolicy -- +-- , testEnableKey $ +-- enableKey +-- -- , testRevokeGrant $ -- revokeGrant -- @@ -109,39 +109,39 @@ -- ] -- , testGroup "response" --- [ testDisableKeyRotationResponse $ --- disableKeyRotationResponse --- --- , testGenerateDataKeyWithoutPlaintextResponse $ --- generateDataKeyWithoutPlaintextResponse +-- [ testEncryptResponse $ +-- encryptResponse -- -- , testListGrantsResponse $ -- listGrantsResponse -- --- , testEncryptResponse $ --- encryptResponse +-- , testDisableKeyRotationResponse $ +-- disableKeyRotationResponse -- +-- , testGenerateDataKeyWithoutPlaintextResponse $ +-- generateDataKeyWithoutPlaintextResponse +-- -- , testEnableKeyRotationResponse $ -- enableKeyRotationResponse -- --- , testCreateGrantResponse $ --- createGrantResponse --- -- , testCreateAliasResponse $ -- createAliasResponse -- +-- , testCreateGrantResponse $ +-- createGrantResponse +-- -- , testListAliasesResponse $ -- listAliasesResponse -- -- , testGenerateRandomResponse $ -- generateRandomResponse -- --- , testDisableKeyResponse $ --- disableKeyResponse --- -- , testCreateKeyResponse $ -- createKeyResponse -- +-- , testDisableKeyResponse $ +-- disableKeyResponse +-- -- , testRetireGrantResponse $ -- retireGrantResponse -- @@ -175,12 +175,12 @@ -- , testListKeyPoliciesResponse $ -- listKeyPoliciesResponse -- --- , testEnableKeyResponse $ --- enableKeyResponse --- -- , testPutKeyPolicyResponse $ -- putKeyPolicyResponse -- +-- , testEnableKeyResponse $ +-- enableKeyResponse +-- -- , testRevokeGrantResponse $ -- revokeGrantResponse -- @@ -192,6 +192,16 @@ -- Requests +testEncrypt :: Encrypt -> TestTree +testEncrypt = req + "Encrypt" + "fixture/Encrypt.yaml" + +testListGrants :: ListGrants -> TestTree +testListGrants = req + "ListGrants" + "fixture/ListGrants.yaml" + testDisableKeyRotation :: DisableKeyRotation -> TestTree testDisableKeyRotation = req "DisableKeyRotation" @@ -202,31 +212,21 @@ "GenerateDataKeyWithoutPlaintext" "fixture/GenerateDataKeyWithoutPlaintext.yaml" -testListGrants :: ListGrants -> TestTree -testListGrants = req - "ListGrants" - "fixture/ListGrants.yaml" - -testEncrypt :: Encrypt -> TestTree -testEncrypt = req - "Encrypt" - "fixture/Encrypt.yaml" - testEnableKeyRotation :: EnableKeyRotation -> TestTree testEnableKeyRotation = req "EnableKeyRotation" "fixture/EnableKeyRotation.yaml" -testCreateGrant :: CreateGrant -> TestTree -testCreateGrant = req - "CreateGrant" - "fixture/CreateGrant.yaml" - testCreateAlias :: CreateAlias -> TestTree testCreateAlias = req "CreateAlias" "fixture/CreateAlias.yaml" +testCreateGrant :: CreateGrant -> TestTree +testCreateGrant = req + "CreateGrant" + "fixture/CreateGrant.yaml" + testListAliases :: ListAliases -> TestTree testListAliases = req "ListAliases" @@ -237,16 +237,16 @@ "GenerateRandom" "fixture/GenerateRandom.yaml" -testDisableKey :: DisableKey -> TestTree -testDisableKey = req - "DisableKey" - "fixture/DisableKey.yaml" - testCreateKey :: CreateKey -> TestTree testCreateKey = req "CreateKey" "fixture/CreateKey.yaml" +testDisableKey :: DisableKey -> TestTree +testDisableKey = req + "DisableKey" + "fixture/DisableKey.yaml" + testRetireGrant :: RetireGrant -> TestTree testRetireGrant = req "RetireGrant" @@ -302,16 +302,16 @@ "ListKeyPolicies" "fixture/ListKeyPolicies.yaml" -testEnableKey :: EnableKey -> TestTree -testEnableKey = req - "EnableKey" - "fixture/EnableKey.yaml" - testPutKeyPolicy :: PutKeyPolicy -> TestTree testPutKeyPolicy = req "PutKeyPolicy" "fixture/PutKeyPolicy.yaml" +testEnableKey :: EnableKey -> TestTree +testEnableKey = req + "EnableKey" + "fixture/EnableKey.yaml" + testRevokeGrant :: RevokeGrant -> TestTree testRevokeGrant = req "RevokeGrant" @@ -324,6 +324,20 @@ -- Responses +testEncryptResponse :: EncryptResponse -> TestTree +testEncryptResponse = res + "EncryptResponse" + "fixture/EncryptResponse.proto" + kMS + (Proxy :: Proxy Encrypt) + +testListGrantsResponse :: ListGrantsResponse -> TestTree +testListGrantsResponse = res + "ListGrantsResponse" + "fixture/ListGrantsResponse.proto" + kMS + (Proxy :: Proxy ListGrants) + testDisableKeyRotationResponse :: DisableKeyRotationResponse -> TestTree testDisableKeyRotationResponse = res "DisableKeyRotationResponse" @@ -338,20 +352,6 @@ kMS (Proxy :: Proxy GenerateDataKeyWithoutPlaintext) -testListGrantsResponse :: ListGrantsResponse -> TestTree -testListGrantsResponse = res - "ListGrantsResponse" - "fixture/ListGrantsResponse.proto" - kMS - (Proxy :: Proxy ListGrants) - -testEncryptResponse :: EncryptResponse -> TestTree -testEncryptResponse = res - "EncryptResponse" - "fixture/EncryptResponse.proto" - kMS - (Proxy :: Proxy Encrypt) - testEnableKeyRotationResponse :: EnableKeyRotationResponse -> TestTree testEnableKeyRotationResponse = res "EnableKeyRotationResponse" @@ -359,13 +359,6 @@ kMS (Proxy :: Proxy EnableKeyRotation) -testCreateGrantResponse :: CreateGrantResponse -> TestTree -testCreateGrantResponse = res - "CreateGrantResponse" - "fixture/CreateGrantResponse.proto" - kMS - (Proxy :: Proxy CreateGrant) - testCreateAliasResponse :: CreateAliasResponse -> TestTree testCreateAliasResponse = res "CreateAliasResponse" @@ -373,6 +366,13 @@ kMS (Proxy :: Proxy CreateAlias) +testCreateGrantResponse :: CreateGrantResponse -> TestTree +testCreateGrantResponse = res + "CreateGrantResponse" + "fixture/CreateGrantResponse.proto" + kMS + (Proxy :: Proxy CreateGrant) + testListAliasesResponse :: ListAliasesResponse -> TestTree testListAliasesResponse = res "ListAliasesResponse" @@ -387,13 +387,6 @@ kMS (Proxy :: Proxy GenerateRandom) -testDisableKeyResponse :: DisableKeyResponse -> TestTree -testDisableKeyResponse = res - "DisableKeyResponse" - "fixture/DisableKeyResponse.proto" - kMS - (Proxy :: Proxy DisableKey) - testCreateKeyResponse :: CreateKeyResponse -> TestTree testCreateKeyResponse = res "CreateKeyResponse" @@ -401,6 +394,13 @@ kMS (Proxy :: Proxy CreateKey) +testDisableKeyResponse :: DisableKeyResponse -> TestTree +testDisableKeyResponse = res + "DisableKeyResponse" + "fixture/DisableKeyResponse.proto" + kMS + (Proxy :: Proxy DisableKey) + testRetireGrantResponse :: RetireGrantResponse -> TestTree testRetireGrantResponse = res "RetireGrantResponse" @@ -478,19 +478,19 @@ kMS (Proxy :: Proxy ListKeyPolicies) -testEnableKeyResponse :: EnableKeyResponse -> TestTree -testEnableKeyResponse = res - "EnableKeyResponse" - "fixture/EnableKeyResponse.proto" - kMS - (Proxy :: Proxy EnableKey) - testPutKeyPolicyResponse :: PutKeyPolicyResponse -> TestTree testPutKeyPolicyResponse = res "PutKeyPolicyResponse" "fixture/PutKeyPolicyResponse.proto" kMS (Proxy :: Proxy PutKeyPolicy) + +testEnableKeyResponse :: EnableKeyResponse -> TestTree +testEnableKeyResponse = res + "EnableKeyResponse" + "fixture/EnableKeyResponse.proto" + kMS + (Proxy :: Proxy EnableKey) testRevokeGrantResponse :: RevokeGrantResponse -> TestTree testRevokeGrantResponse = res