aws-sdk-kms 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4b307da3ae6b5a132ef34883ec9f7fb8050173
-  data.tar.gz: d765f24a443f99852047990e57eaee77f132d09e
+  metadata.gz: d348ec6df574b88ba7fc4422404e1ec80da36ef7
+  data.tar.gz: 598efd7147127f5b74f0a5ecd87ae843467f6464
 SHA512:
-  metadata.gz: c9e1dfb9f0db2c751c7805ee9a5814160df0e8c7138fad582ff93c7a4307f6c4c6920e3b41a9ecb2e837afe1e941f4426ecc73b349479381d47bbb9851165c2a
-  data.tar.gz: 61d34aacbca1ecb33fac73087f977d708e7dc6c9ad58e1a1c0ae88f9294aca3de6a81905503af114d2a094c6b1ce75b3a1c9511b4beb01b11ff1a52cd05aaf12
+  metadata.gz: 5f26941c3677b5eef0bb57068ec8fe9c67d604d2921f82ef688a230184212e30b99abf939684067807cf99059fab819ffbefede2960e0c2c55d5b87331f1c5f5
+  data.tar.gz: d3787c2cad1583842acbb9cbb360ca572dd3724d79474f0148e145f200bba3686e46d11641acfa99f20a1889bc02de9453aa6253777f03a346686002198e0bec

data/lib/aws-sdk-kms.rb

@@ -42,6 +42,6 @@ require_relative 'aws-sdk-kms/customizations'
 # @service
 module Aws::KMS
 
-  GEM_VERSION = '1.0.0.rc1'
+  GEM_VERSION = '1.0.0.rc3'
 
 end

data/lib/aws-sdk-kms/client.rb

@@ -194,6 +194,8 @@ module Aws::KMS
     #
     #   resp.key_id #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/CancelKeyDeletion AWS API Documentation
+    #
     # @overload cancel_key_deletion(params = {})
     # @param [Hash] params ({})
     def cancel_key_deletion(params = {}, options = {})
@@ -240,6 +242,8 @@ module Aws::KMS
     #     target_key_id: "KeyIdType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/CreateAlias AWS API Documentation
+    #
     # @overload create_alias(params = {})
     # @param [Hash] params ({})
     def create_alias(params = {}, options = {})
@@ -373,6 +377,8 @@ module Aws::KMS
     #   resp.grant_token #=> String
     #   resp.grant_id #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/CreateGrant AWS API Documentation
+    #
     # @overload create_grant(params = {})
     # @param [Hash] params ({})
     def create_grant(params = {}, options = {})
@@ -404,14 +410,14 @@ module Aws::KMS
     #   `BypassPolicyLockoutSafetyCheck` to true, the policy must meet the
     #   following criteria:
     #
-    #   * It must allow the principal making the `CreateKey` request to make a
-    #     subsequent PutKeyPolicy request on the CMK. This reduces the
-    #     likelihood that the CMK becomes unmanageable. For more information,
-    #     refer to the scenario in the [Default Key Policy][1] section in the
-    #     *AWS Key Management Service Developer Guide*.
+    #   * It must allow the principal that is making the `CreateKey` request
+    #     to make a subsequent PutKeyPolicy request on the CMK. This reduces
+    #     the likelihood that the CMK becomes unmanageable. For more
+    #     information, refer to the scenario in the [Default Key Policy][1]
+    #     section in the *AWS Key Management Service Developer Guide*.
     #
-    #   * The principal(s) specified in the key policy must exist and be
-    #     visible to AWS KMS. When you create a new AWS principal (for
+    #   * The principals that are specified in the key policy must exist and
+    #     be visible to AWS KMS. When you create a new AWS principal (for
     #     example, an IAM user or role), you might need to enforce a delay
     #     before specifying the new principal in a key policy because the new
     #     principal might not immediately be visible to AWS KMS. For more
@@ -469,8 +475,8 @@ module Aws::KMS
     #   Guide*.
     #
     #   Use this parameter only when you include a policy in the request and
-    #   you intend to prevent the principal making the request from making a
-    #   subsequent PutKeyPolicy request on the CMK.
+    #   you intend to prevent the principal that is making the request from
+    #   making a subsequent PutKeyPolicy request on the CMK.
     #
     #   The default value is false.
     #
@@ -478,6 +484,15 @@ module Aws::KMS
     #
     #   [1]: http://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam
     #
+    # @option params [Array<Types::Tag>] :tags
+    #   One or more tags. Each tag consists of a tag key and a tag value. Tag
+    #   keys and tag values are both required, but tag values can be empty
+    #   (null) strings.
+    #
+    #   Use this parameter to tag the CMK when it is created. Alternately, you
+    #   can omit this parameter and instead tag the CMK after it is created
+    #   using TagResource.
+    #
     # @return [Types::CreateKeyResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::CreateKeyResponse#key_metadata #key_metadata} => Types::KeyMetadata
@@ -490,6 +505,12 @@ module Aws::KMS
     #     key_usage: "ENCRYPT_DECRYPT", # accepts ENCRYPT_DECRYPT
     #     origin: "AWS_KMS", # accepts AWS_KMS, EXTERNAL
     #     bypass_policy_lockout_safety_check: false,
+    #     tags: [
+    #       {
+    #         tag_key: "TagKeyType", # required
+    #         tag_value: "TagValueType", # required
+    #       },
+    #     ],
     #   })
     #
     # @example Response structure
@@ -507,6 +528,8 @@ module Aws::KMS
     #   resp.key_metadata.origin #=> String, one of "AWS_KMS", "EXTERNAL"
     #   resp.key_metadata.expiration_model #=> String, one of "KEY_MATERIAL_EXPIRES", "KEY_MATERIAL_DOES_NOT_EXPIRE"
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/CreateKey AWS API Documentation
+    #
     # @overload create_key(params = {})
     # @param [Hash] params ({})
     def create_key(params = {}, options = {})
@@ -575,6 +598,8 @@ module Aws::KMS
     #   resp.key_id #=> String
     #   resp.plaintext #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/Decrypt AWS API Documentation
+    #
     # @overload decrypt(params = {})
     # @param [Hash] params ({})
     def decrypt(params = {}, options = {})
@@ -598,6 +623,8 @@ module Aws::KMS
     #     alias_name: "AliasNameType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/DeleteAlias AWS API Documentation
+    #
     # @overload delete_alias(params = {})
     # @param [Hash] params ({})
     def delete_alias(params = {}, options = {})
@@ -641,6 +668,8 @@ module Aws::KMS
     #     key_id: "KeyIdType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/DeleteImportedKeyMaterial AWS API Documentation
+    #
     # @overload delete_imported_key_material(params = {})
     # @param [Hash] params ({})
     def delete_imported_key_material(params = {}, options = {})
@@ -702,6 +731,8 @@ module Aws::KMS
     #   resp.key_metadata.origin #=> String, one of "AWS_KMS", "EXTERNAL"
     #   resp.key_metadata.expiration_model #=> String, one of "KEY_MATERIAL_EXPIRES", "KEY_MATERIAL_DOES_NOT_EXPIRE"
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/DescribeKey AWS API Documentation
+    #
     # @overload describe_key(params = {})
     # @param [Hash] params ({})
     def describe_key(params = {}, options = {})
@@ -738,6 +769,8 @@ module Aws::KMS
     #     key_id: "KeyIdType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/DisableKey AWS API Documentation
+    #
     # @overload disable_key(params = {})
     # @param [Hash] params ({})
     def disable_key(params = {}, options = {})
@@ -765,6 +798,8 @@ module Aws::KMS
     #     key_id: "KeyIdType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/DisableKeyRotation AWS API Documentation
+    #
     # @overload disable_key_rotation(params = {})
     # @param [Hash] params ({})
     def disable_key_rotation(params = {}, options = {})
@@ -792,6 +827,8 @@ module Aws::KMS
     #     key_id: "KeyIdType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/EnableKey AWS API Documentation
+    #
     # @overload enable_key(params = {})
     # @param [Hash] params ({})
     def enable_key(params = {}, options = {})
@@ -819,6 +856,8 @@ module Aws::KMS
     #     key_id: "KeyIdType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/EnableKeyRotation AWS API Documentation
+    #
     # @overload enable_key_rotation(params = {})
     # @param [Hash] params ({})
     def enable_key_rotation(params = {}, options = {})
@@ -910,6 +949,8 @@ module Aws::KMS
     #   resp.ciphertext_blob #=> String
     #   resp.key_id #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/Encrypt AWS API Documentation
+    #
     # @overload encrypt(params = {})
     # @param [Hash] params ({})
     def encrypt(params = {}, options = {})
@@ -1041,6 +1082,8 @@ module Aws::KMS
     #   resp.plaintext #=> String
     #   resp.key_id #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/GenerateDataKey AWS API Documentation
+    #
     # @overload generate_data_key(params = {})
     # @param [Hash] params ({})
     def generate_data_key(params = {}, options = {})
@@ -1137,6 +1180,8 @@ module Aws::KMS
     #   resp.ciphertext_blob #=> String
     #   resp.key_id #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/GenerateDataKeyWithoutPlaintext AWS API Documentation
+    #
     # @overload generate_data_key_without_plaintext(params = {})
     # @param [Hash] params ({})
     def generate_data_key_without_plaintext(params = {}, options = {})
@@ -1163,6 +1208,8 @@ module Aws::KMS
     #
     #   resp.plaintext #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/GenerateRandom AWS API Documentation
+    #
     # @overload generate_random(params = {})
     # @param [Hash] params ({})
     def generate_random(params = {}, options = {})
@@ -1202,6 +1249,8 @@ module Aws::KMS
     #
     #   resp.policy #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/GetKeyPolicy AWS API Documentation
+    #
     # @overload get_key_policy(params = {})
     # @param [Hash] params ({})
     def get_key_policy(params = {}, options = {})
@@ -1236,6 +1285,8 @@ module Aws::KMS
     #
     #   resp.key_rotation_enabled #=> Boolean
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/GetKeyRotationStatus AWS API Documentation
+    #
     # @overload get_key_rotation_status(params = {})
     # @param [Hash] params ({})
     def get_key_rotation_status(params = {}, options = {})
@@ -1314,6 +1365,8 @@ module Aws::KMS
     #   resp.public_key #=> String
     #   resp.parameters_valid_to #=> Time
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/GetParametersForImport AWS API Documentation
+    #
     # @overload get_parameters_for_import(params = {})
     # @param [Hash] params ({})
     def get_parameters_for_import(params = {}, options = {})
@@ -1397,6 +1450,8 @@ module Aws::KMS
     #     expiration_model: "KEY_MATERIAL_EXPIRES", # accepts KEY_MATERIAL_EXPIRES, KEY_MATERIAL_DOES_NOT_EXPIRE
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ImportKeyMaterial AWS API Documentation
+    #
     # @overload import_key_material(params = {})
     # @param [Hash] params ({})
     def import_key_material(params = {}, options = {})
@@ -1407,18 +1462,17 @@ module Aws::KMS
     # Lists all of the key aliases in the account.
     #
     # @option params [Integer] :limit
-    #   When paginating results, specify the maximum number of items to return
-    #   in the response. If additional items exist beyond the number you
-    #   specify, the `Truncated` element in the response is set to true.
+    #   Use this parameter to specify the maximum number of items to return.
+    #   When this value is present, AWS KMS does not return more than the
+    #   specified number of items, but it might return fewer.
     #
     #   This value is optional. If you include a value, it must be between 1
     #   and 100, inclusive. If you do not include a value, it defaults to 50.
     #
     # @option params [String] :marker
-    #   Use this parameter only when paginating results and only in a
-    #   subsequent request after you receive a response with truncated
-    #   results. Set it to the value of `NextMarker` from the response you
-    #   just received.
+    #   Use this parameter in a subsequent request after you receive a
+    #   response with truncated results. Set it to the value of `NextMarker`
+    #   from the truncated response you just received.
     #
     # @return [Types::ListAliasesResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -1442,6 +1496,8 @@ module Aws::KMS
     #   resp.next_marker #=> String
     #   resp.truncated #=> Boolean
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ListAliases AWS API Documentation
+    #
     # @overload list_aliases(params = {})
     # @param [Hash] params ({})
     def list_aliases(params = {}, options = {})
@@ -1452,18 +1508,17 @@ module Aws::KMS
     # List the grants for a specified key.
     #
     # @option params [Integer] :limit
-    #   When paginating results, specify the maximum number of items to return
-    #   in the response. If additional items exist beyond the number you
-    #   specify, the `Truncated` element in the response is set to true.
+    #   Use this parameter to specify the maximum number of items to return.
+    #   When this value is present, AWS KMS does not return more than the
+    #   specified number of items, but it might return fewer.
     #
     #   This value is optional. If you include a value, it must be between 1
     #   and 100, inclusive. If you do not include a value, it defaults to 50.
     #
     # @option params [String] :marker
-    #   Use this parameter only when paginating results and only in a
-    #   subsequent request after you receive a response with truncated
-    #   results. Set it to the value of `NextMarker` from the response you
-    #   just received.
+    #   Use this parameter in a subsequent request after you receive a
+    #   response with truncated results. Set it to the value of `NextMarker`
+    #   from the truncated response you just received.
     #
     # @option params [required, String] :key_id
     #   A unique identifier for the customer master key. This value can be a
@@ -1508,6 +1563,8 @@ module Aws::KMS
     #   resp.next_marker #=> String
     #   resp.truncated #=> Boolean
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ListGrants AWS API Documentation
+    #
     # @overload list_grants(params = {})
     # @param [Hash] params ({})
     def list_grants(params = {}, options = {})
@@ -1527,9 +1584,9 @@ module Aws::KMS
     #     `arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab`
     #
     # @option params [Integer] :limit
-    #   When paginating results, specify the maximum number of items to return
-    #   in the response. If additional items exist beyond the number you
-    #   specify, the `Truncated` element in the response is set to true.
+    #   Use this parameter to specify the maximum number of items to return.
+    #   When this value is present, AWS KMS does not return more than the
+    #   specified number of items, but it might return fewer.
     #
     #   This value is optional. If you include a value, it must be between 1
     #   and 1000, inclusive. If you do not include a value, it defaults to
@@ -1538,10 +1595,9 @@ module Aws::KMS
     #   Currently only 1 policy can be attached to a key.
     #
     # @option params [String] :marker
-    #   Use this parameter only when paginating results and only in a
-    #   subsequent request after you receive a response with truncated
-    #   results. Set it to the value of `NextMarker` from the response you
-    #   just received.
+    #   Use this parameter in a subsequent request after you receive a
+    #   response with truncated results. Set it to the value of `NextMarker`
+    #   from the truncated response you just received.
     #
     # @return [Types::ListKeyPoliciesResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -1564,6 +1620,8 @@ module Aws::KMS
     #   resp.next_marker #=> String
     #   resp.truncated #=> Boolean
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ListKeyPolicies AWS API Documentation
+    #
     # @overload list_key_policies(params = {})
     # @param [Hash] params ({})
     def list_key_policies(params = {}, options = {})
@@ -1574,19 +1632,18 @@ module Aws::KMS
     # Lists the customer master keys.
     #
     # @option params [Integer] :limit
-    #   When paginating results, specify the maximum number of items to return
-    #   in the response. If additional items exist beyond the number you
-    #   specify, the `Truncated` element in the response is set to true.
+    #   Use this parameter to specify the maximum number of items to return.
+    #   When this value is present, AWS KMS does not return more than the
+    #   specified number of items, but it might return fewer.
     #
     #   This value is optional. If you include a value, it must be between 1
     #   and 1000, inclusive. If you do not include a value, it defaults to
     #   100.
     #
     # @option params [String] :marker
-    #   Use this parameter only when paginating results and only in a
-    #   subsequent request after you receive a response with truncated
-    #   results. Set it to the value of `NextMarker` from the response you
-    #   just received.
+    #   Use this parameter in a subsequent request after you receive a
+    #   response with truncated results. Set it to the value of `NextMarker`
+    #   from the truncated response you just received.
     #
     # @return [Types::ListKeysResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -1609,6 +1666,8 @@ module Aws::KMS
     #   resp.next_marker #=> String
     #   resp.truncated #=> Boolean
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ListKeys AWS API Documentation
+    #
     # @overload list_keys(params = {})
     # @param [Hash] params ({})
     def list_keys(params = {}, options = {})
@@ -1616,6 +1675,66 @@ module Aws::KMS
       req.send_request(options)
     end
 
+    # Returns a list of all tags for the specified customer master key
+    # (CMK).
+    #
+    # @option params [required, String] :key_id
+    #   A unique identifier for the CMK whose tags you are listing. You can
+    #   use the unique key ID or the Amazon Resource Name (ARN) of the CMK.
+    #   Examples:
+    #
+    #   * Unique key ID: `1234abcd-12ab-34cd-56ef-1234567890ab`
+    #
+    #   * Key ARN:
+    #     `arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab`
+    #
+    # @option params [Integer] :limit
+    #   Use this parameter to specify the maximum number of items to return.
+    #   When this value is present, AWS KMS does not return more than the
+    #   specified number of items, but it might return fewer.
+    #
+    #   This value is optional. If you include a value, it must be between 1
+    #   and 50, inclusive. If you do not include a value, it defaults to 50.
+    #
+    # @option params [String] :marker
+    #   Use this parameter in a subsequent request after you receive a
+    #   response with truncated results. Set it to the value of `NextMarker`
+    #   from the truncated response you just received.
+    #
+    #   Do not attempt to construct this value. Use only the value of
+    #   `NextMarker` from the truncated response you just received.
+    #
+    # @return [Types::ListResourceTagsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::ListResourceTagsResponse#tags #tags} => Array&lt;Types::Tag&gt;
+    #   * {Types::ListResourceTagsResponse#next_marker #next_marker} => String
+    #   * {Types::ListResourceTagsResponse#truncated #truncated} => Boolean
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.list_resource_tags({
+    #     key_id: "KeyIdType", # required
+    #     limit: 1,
+    #     marker: "MarkerType",
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.tags #=> Array
+    #   resp.tags[0].tag_key #=> String
+    #   resp.tags[0].tag_value #=> String
+    #   resp.next_marker #=> String
+    #   resp.truncated #=> Boolean
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ListResourceTags AWS API Documentation
+    #
+    # @overload list_resource_tags(params = {})
+    # @param [Hash] params ({})
+    def list_resource_tags(params = {}, options = {})
+      req = build_request(:list_resource_tags, params)
+      req.send_request(options)
+    end
+
     # Returns a list of all grants for which the grant's
     # `RetiringPrincipal` matches the one specified.
     #
@@ -1623,18 +1742,17 @@ module Aws::KMS
     # retire a grant, use RetireGrant.
     #
     # @option params [Integer] :limit
-    #   When paginating results, specify the maximum number of items to return
-    #   in the response. If additional items exist beyond the number you
-    #   specify, the `Truncated` element in the response is set to true.
+    #   Use this parameter to specify the maximum number of items to return.
+    #   When this value is present, AWS KMS does not return more than the
+    #   specified number of items, but it might return fewer.
     #
     #   This value is optional. If you include a value, it must be between 1
     #   and 100, inclusive. If you do not include a value, it defaults to 50.
     #
     # @option params [String] :marker
-    #   Use this parameter only when paginating results and only in a
-    #   subsequent request after you receive a response with truncated
-    #   results. Set it to the value of `NextMarker` from the response you
-    #   just received.
+    #   Use this parameter in a subsequent request after you receive a
+    #   response with truncated results. Set it to the value of `NextMarker`
+    #   from the truncated response you just received.
     #
     # @option params [required, String] :retiring_principal
     #   The retiring principal for which to list grants.
@@ -1684,6 +1802,8 @@ module Aws::KMS
     #   resp.next_marker #=> String
     #   resp.truncated #=> Boolean
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ListRetirableGrants AWS API Documentation
+    #
     # @overload list_retirable_grants(params = {})
     # @param [Hash] params ({})
     def list_retirable_grants(params = {}, options = {})
@@ -1722,14 +1842,14 @@ module Aws::KMS
     #   If you do not set `BypassPolicyLockoutSafetyCheck` to true, the policy
     #   must meet the following criteria:
     #
-    #   * It must allow the principal making the `PutKeyPolicy` request to
-    #     make a subsequent `PutKeyPolicy` request on the CMK. This reduces
-    #     the likelihood that the CMK becomes unmanageable. For more
+    #   * It must allow the principal that is making the `PutKeyPolicy`
+    #     request to make a subsequent `PutKeyPolicy` request on the CMK. This
+    #     reduces the likelihood that the CMK becomes unmanageable. For more
     #     information, refer to the scenario in the [Default Key Policy][1]
     #     section in the *AWS Key Management Service Developer Guide*.
     #
-    #   * The principal(s) specified in the key policy must exist and be
-    #     visible to AWS KMS. When you create a new AWS principal (for
+    #   * The principals that are specified in the key policy must exist and
+    #     be visible to AWS KMS. When you create a new AWS principal (for
     #     example, an IAM user or role), you might need to enforce a delay
     #     before specifying the new principal in a key policy because the new
     #     principal might not immediately be visible to AWS KMS. For more
@@ -1754,9 +1874,9 @@ module Aws::KMS
     #   Policy][1] section in the *AWS Key Management Service Developer
     #   Guide*.
     #
-    #   Use this parameter only when you intend to prevent the principal
-    #   making the request from making a subsequent `PutKeyPolicy` request on
-    #   the CMK.
+    #   Use this parameter only when you intend to prevent the principal that
+    #   is making the request from making a subsequent `PutKeyPolicy` request
+    #   on the CMK.
     #
     #   The default value is false.
     #
@@ -1775,6 +1895,8 @@ module Aws::KMS
     #     bypass_policy_lockout_safety_check: false,
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/PutKeyPolicy AWS API Documentation
+    #
     # @overload put_key_policy(params = {})
     # @param [Hash] params ({})
     def put_key_policy(params = {}, options = {})
@@ -1862,6 +1984,8 @@ module Aws::KMS
     #   resp.source_key_id #=> String
     #   resp.key_id #=> String
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ReEncrypt AWS API Documentation
+    #
     # @overload re_encrypt(params = {})
     # @param [Hash] params ({})
     def re_encrypt(params = {}, options = {})
@@ -1917,6 +2041,8 @@ module Aws::KMS
     #     grant_id: "GrantIdType",
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/RetireGrant AWS API Documentation
+    #
     # @overload retire_grant(params = {})
     # @param [Hash] params ({})
     def retire_grant(params = {}, options = {})
@@ -1950,6 +2076,8 @@ module Aws::KMS
     #     grant_id: "GrantIdType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/RevokeGrant AWS API Documentation
+    #
     # @overload revoke_grant(params = {})
     # @param [Hash] params ({})
     def revoke_grant(params = {}, options = {})
@@ -2017,6 +2145,8 @@ module Aws::KMS
     #   resp.key_id #=> String
     #   resp.deletion_date #=> Time
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/ScheduleKeyDeletion AWS API Documentation
+    #
     # @overload schedule_key_deletion(params = {})
     # @param [Hash] params ({})
     def schedule_key_deletion(params = {}, options = {})
@@ -2024,6 +2154,92 @@ module Aws::KMS
       req.send_request(options)
     end
 
+    # Adds or overwrites one or more tags for the specified customer master
+    # key (CMK).
+    #
+    # Each tag consists of a tag key and a tag value. Tag keys and tag
+    # values are both required, but tag values can be empty (null) strings.
+    #
+    # You cannot use the same tag key more than once per CMK. For example,
+    # consider a CMK with one tag whose tag key is `Purpose` and tag value
+    # is `Test`. If you send a `TagResource` request for this CMK with a tag
+    # key of `Purpose` and a tag value of `Prod`, it does not create a
+    # second tag. Instead, the original tag is overwritten with the new tag
+    # value.
+    #
+    # @option params [required, String] :key_id
+    #   A unique identifier for the CMK you are tagging. You can use the
+    #   unique key ID or the Amazon Resource Name (ARN) of the CMK. Examples:
+    #
+    #   * Unique key ID: `1234abcd-12ab-34cd-56ef-1234567890ab`
+    #
+    #   * Key ARN:
+    #     `arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab`
+    #
+    # @option params [required, Array<Types::Tag>] :tags
+    #   One or more tags. Each tag consists of a tag key and a tag value.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.tag_resource({
+    #     key_id: "KeyIdType", # required
+    #     tags: [ # required
+    #       {
+    #         tag_key: "TagKeyType", # required
+    #         tag_value: "TagValueType", # required
+    #       },
+    #     ],
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/TagResource AWS API Documentation
+    #
+    # @overload tag_resource(params = {})
+    # @param [Hash] params ({})
+    def tag_resource(params = {}, options = {})
+      req = build_request(:tag_resource, params)
+      req.send_request(options)
+    end
+
+    # Removes the specified tag or tags from the specified customer master
+    # key (CMK).
+    #
+    # To remove a tag, you specify the tag key for each tag to remove. You
+    # do not specify the tag value. To overwrite the tag value for an
+    # existing tag, use TagResource.
+    #
+    # @option params [required, String] :key_id
+    #   A unique identifier for the CMK from which you are removing tags. You
+    #   can use the unique key ID or the Amazon Resource Name (ARN) of the
+    #   CMK. Examples:
+    #
+    #   * Unique key ID: `1234abcd-12ab-34cd-56ef-1234567890ab`
+    #
+    #   * Key ARN:
+    #     `arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab`
+    #
+    # @option params [required, Array<String>] :tag_keys
+    #   One or more tag keys. Specify only the tag keys, not the tag values.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.untag_resource({
+    #     key_id: "KeyIdType", # required
+    #     tag_keys: ["TagKeyType"], # required
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/UntagResource AWS API Documentation
+    #
+    # @overload untag_resource(params = {})
+    # @param [Hash] params ({})
+    def untag_resource(params = {}, options = {})
+      req = build_request(:untag_resource, params)
+      req.send_request(options)
+    end
+
     # Updates an alias to map it to a different key.
     #
     # An alias is not a property of a key. Therefore, an alias can be mapped
@@ -2067,6 +2283,8 @@ module Aws::KMS
     #     target_key_id: "KeyIdType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/UpdateAlias AWS API Documentation
+    #
     # @overload update_alias(params = {})
     # @param [Hash] params ({})
     def update_alias(params = {}, options = {})
@@ -2098,6 +2316,8 @@ module Aws::KMS
     #     description: "DescriptionType", # required
     #   })
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/kms-2014-11-01/UpdateKeyDescription AWS API Documentation
+    #
     # @overload update_key_description(params = {})
     # @param [Hash] params ({})
     def update_key_description(params = {}, options = {})
@@ -2118,7 +2338,7 @@ module Aws::KMS
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-kms'
-      context[:gem_version] = '1.0.0.rc1'
+      context[:gem_version] = '1.0.0.rc3'
       Seahorse::Client::Request.new(handlers, context)
     end