diff --git a/.changes/2.14.0.json b/.changes/2.14.0.json new file mode 100644 index 0000000000..f278c9ed4d --- /dev/null +++ b/.changes/2.14.0.json @@ -0,0 +1,7 @@ +[ + { + "type": "feature", + "category": "KMS", + "description": "This release of AWS Key Management Service introduces the ability to tag keys. Tagging keys can help you organize your keys and track your KMS costs in the cost allocation report. This release also increases the maximum length of a key ID to accommodate ARNs that include a long key alias." + } +] \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 54716f4872..90a51037b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # Changelog for AWS SDK for JavaScript - + +## 2.14.0 +* feature: KMS: This release of AWS Key Management Service introduces the ability to tag keys. Tagging keys can help you organize your keys and track your KMS costs in the cost allocation report. This release also increases the maximum length of a key ID to accommodate ARNs that include a long key alias. + ## 2.13.0 * feature: Ec2: Adds support for the new Modify Volumes apis. diff --git a/README.md b/README.md index 0d40721f36..e0b8d23c8f 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ to work with the new major version. To use the SDK in the browser, simply add the following script tag to your HTML pages: - + You can also build a custom browser SDK with your specified set of AWS services. This can allow you to reduce the SDK's size, specify different API versions of diff --git a/apis/kms-2014-11-01.examples.json b/apis/kms-2014-11-01.examples.json index feafe0b1ff..75ccccf648 100644 --- a/apis/kms-2014-11-01.examples.json +++ b/apis/kms-2014-11-01.examples.json @@ -71,11 +71,19 @@ ], "CreateKey": [ { + "input": { + "Tags": [ + { + "TagKey": "CreatedBy", + "TagValue": "ExampleUser" + } + ] + }, "output": { "KeyMetadata": { "AWSAccountId": "111122223333", "Arn": "arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab", - "CreationDate": "2016-11-01T10:15:42-07:00", + "CreationDate": "2017-01-09T12:00:07-08:00", "Description": "", "Enabled": true, "KeyId": "1234abcd-12ab-34cd-56ef-1234567890ab", @@ -85,6 +93,9 @@ } }, "comments": { + "input": { + "Tags": "One or more tags. Each tag consists of a tag key and a tag value." + }, "output": { "KeyMetadata": "An object that contains information about the CMK created by this operation." } @@ -636,6 +647,42 @@ "title": "To list customer master keys (CMKs)" } ], + "ListResourceTags": [ + { + "input": { + "KeyId": "1234abcd-12ab-34cd-56ef-1234567890ab" + }, + "output": { + "Tags": [ + { + "TagKey": "CostCenter", + "TagValue": "87654" + }, + { + "TagKey": "CreatedBy", + "TagValue": "ExampleUser" + }, + { + "TagKey": "Purpose", + "TagValue": "Test" + } + ], + "Truncated": false + }, + "comments": { + "input": { + "KeyId": "The identifier of the CMK whose tags you are listing. You can use the key ID or the Amazon Resource Name (ARN) of the CMK." + }, + "output": { + "Tags": "A list of tags.", + "Truncated": "A boolean that indicates whether there are more items in the list. Returns true when there are more items, or false when there are not." + } + }, + "description": "The following example lists tags for a CMK.", + "id": "to-list-tags-for-a-cmk-1483996855796", + "title": "To list tags for a customer master key (CMK)" + } + ], "ListRetirableGrants": [ { "input": { diff --git a/apis/kms-2014-11-01.min.json b/apis/kms-2014-11-01.min.json index c6bcb83377..0e6f577f3c 100644 --- a/apis/kms-2014-11-01.min.json +++ b/apis/kms-2014-11-01.min.json @@ -83,6 +83,9 @@ "Origin": {}, "BypassPolicyLockoutSafetyCheck": { "type": "boolean" + }, + "Tags": { + "shape": "Sp" } } }, @@ -90,7 +93,7 @@ "type": "structure", "members": { "KeyMetadata": { - "shape": "Sq" + "shape": "Su" } } } @@ -118,7 +121,7 @@ "members": { "KeyId": {}, "Plaintext": { - "shape": "Sz" + "shape": "S13" } } } @@ -162,7 +165,7 @@ "type": "structure", "members": { "KeyMetadata": { - "shape": "Sq" + "shape": "Su" } } } @@ -221,7 +224,7 @@ "members": { "KeyId": {}, "Plaintext": { - "shape": "Sz" + "shape": "S13" }, "EncryptionContext": { "shape": "Sb" @@ -268,7 +271,7 @@ "type": "blob" }, "Plaintext": { - "shape": "Sz" + "shape": "S13" }, "KeyId": {} } @@ -317,7 +320,7 @@ "type": "structure", "members": { "Plaintext": { - "shape": "Sz" + "shape": "S13" } } } @@ -382,7 +385,7 @@ "type": "blob" }, "PublicKey": { - "shape": "Sz" + "shape": "S13" }, "ParametersValidTo": { "type": "timestamp" @@ -463,7 +466,7 @@ } }, "output": { - "shape": "S20" + "shape": "S24" } }, "ListKeyPolicies": { @@ -524,6 +527,33 @@ } } }, + "ListResourceTags": { + "input": { + "type": "structure", + "required": [ + "KeyId" + ], + "members": { + "KeyId": {}, + "Limit": { + "type": "integer" + }, + "Marker": {} + } + }, + "output": { + "type": "structure", + "members": { + "Tags": { + "shape": "Sp" + }, + "NextMarker": {}, + "Truncated": { + "type": "boolean" + } + } + } + }, "ListRetirableGrants": { "input": { "type": "structure", @@ -539,7 +569,7 @@ } }, "output": { - "shape": "S20" + "shape": "S24" } }, "PutKeyPolicy": { @@ -640,6 +670,37 @@ } } }, + "TagResource": { + "input": { + "type": "structure", + "required": [ + "KeyId", + "Tags" + ], + "members": { + "KeyId": {}, + "Tags": { + "shape": "Sp" + } + } + } + }, + "UntagResource": { + "input": { + "type": "structure", + "required": [ + "KeyId", + "TagKeys" + ], + "members": { + "KeyId": {}, + "TagKeys": { + "type": "list", + "member": {} + } + } + } + }, "UpdateAlias": { "input": { "type": "structure", @@ -692,7 +753,21 @@ "type": "list", "member": {} }, - "Sq": { + "Sp": { + "type": "list", + "member": { + "type": "structure", + "required": [ + "TagKey", + "TagValue" + ], + "members": { + "TagKey": {}, + "TagValue": {} + } + } + }, + "Su": { "type": "structure", "required": [ "KeyId" @@ -720,11 +795,11 @@ "ExpirationModel": {} } }, - "Sz": { + "S13": { "type": "blob", "sensitive": true }, - "S20": { + "S24": { "type": "structure", "members": { "Grants": { diff --git a/apis/kms-2014-11-01.normal.json b/apis/kms-2014-11-01.normal.json index 5f32d2275a..5390604cb1 100644 --- a/apis/kms-2014-11-01.normal.json +++ b/apis/kms-2014-11-01.normal.json @@ -81,7 +81,8 @@ {"shape":"InvalidArnException"}, {"shape":"UnsupportedOperationException"}, {"shape":"KMSInternalException"}, - {"shape":"LimitExceededException"} + {"shape":"LimitExceededException"}, + {"shape":"TagException"} ], "documentation":"
Creates a customer master key (CMK).
You can use a CMK to encrypt small amounts of data (4 KiB or less) directly, but CMKs are more commonly used to encrypt data encryption keys (DEKs), which are used to encrypt raw data. For more information about DEKs and the difference between CMKs and DEKs, see the following:
The GenerateDataKey operation
AWS Key Management Service Concepts in the AWS Key Management Service Developer Guide
Lists the customer master keys.
" }, + "ListResourceTags":{ + "name":"ListResourceTags", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"ListResourceTagsRequest"}, + "output":{"shape":"ListResourceTagsResponse"}, + "errors":[ + {"shape":"KMSInternalException"}, + {"shape":"NotFoundException"}, + {"shape":"InvalidArnException"}, + {"shape":"InvalidMarkerException"} + ], + "documentation":"Returns a list of all tags for the specified customer master key (CMK).
" + }, "ListRetirableGrants":{ "name":"ListRetirableGrants", "http":{ @@ -544,6 +561,39 @@ ], "documentation":"Schedules the deletion of a customer master key (CMK). You may provide a waiting period, specified in days, before deletion occurs. If you do not provide a waiting period, the default period of 30 days is used. When this operation is successful, the state of the CMK changes to PendingDeletion
. Before the waiting period ends, you can use CancelKeyDeletion to cancel the deletion of the CMK. After the waiting period ends, AWS KMS deletes the CMK and all AWS KMS data associated with it, including all aliases that refer to it.
Deleting a CMK is a destructive and potentially dangerous operation. When a CMK is deleted, all data that was encrypted under the CMK is rendered unrecoverable. To restrict the use of a CMK without deleting it, use DisableKey.
For more information about scheduling a CMK for deletion, see Deleting Customer Master Keys in the AWS Key Management Service Developer Guide.
" }, + "TagResource":{ + "name":"TagResource", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"TagResourceRequest"}, + "errors":[ + {"shape":"KMSInternalException"}, + {"shape":"NotFoundException"}, + {"shape":"InvalidArnException"}, + {"shape":"KMSInvalidStateException"}, + {"shape":"LimitExceededException"}, + {"shape":"TagException"} + ], + "documentation":"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.
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.
" + }, "UpdateAlias":{ "name":"UpdateAlias", "http":{ @@ -724,7 +774,7 @@ "members":{ "Policy":{ "shape":"PolicyType", - "documentation":"The key policy to attach to the CMK.
If you specify a policy and do not set 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 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 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 information, see Changes that I make are not always immediately visible in the IAM User Guide.
If you do not specify a policy, AWS KMS attaches a default key policy to the CMK. For more information, see Default Key Policy in the AWS Key Management Service Developer Guide.
The policy size limit is 32 KiB (32768 bytes).
" + "documentation":"The key policy to attach to the CMK.
If you specify a policy and do not set BypassPolicyLockoutSafetyCheck
to true, the policy must meet the following criteria:
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 section in the AWS Key Management Service Developer Guide.
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 information, see Changes that I make are not always immediately visible in the IAM User Guide.
If you do not specify a policy, AWS KMS attaches a default key policy to the CMK. For more information, see Default Key Policy in the AWS Key Management Service Developer Guide.
The policy size limit is 32 KiB (32768 bytes).
" }, "Description":{ "shape":"DescriptionType", @@ -740,7 +790,11 @@ }, "BypassPolicyLockoutSafetyCheck":{ "shape":"BooleanType", - "documentation":"A flag to indicate whether to bypass the key policy lockout safety check.
Setting this value to true increases the likelihood that the CMK becomes unmanageable. Do not set this value to true indiscriminately.
For more information, refer to the scenario in the Default Key Policy section in the AWS Key Management Service Developer 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.
The default value is false.
" + "documentation":"A flag to indicate whether to bypass the key policy lockout safety check.
Setting this value to true increases the likelihood that the CMK becomes unmanageable. Do not set this value to true indiscriminately.
For more information, refer to the scenario in the Default Key Policy section in the AWS Key Management Service Developer Guide.
Use this parameter only when you include a policy in the request and 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.
" + }, + "Tags":{ + "shape":"TagList", + "documentation":"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.
" } } }, @@ -1371,7 +1425,7 @@ }, "KeyIdType":{ "type":"string", - "max":256, + "max":2048, "min":1 }, "KeyList":{ @@ -1487,11 +1541,11 @@ "members":{ "Limit":{ "shape":"LimitType", - "documentation":"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.
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.
" + "documentation":"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.
" }, "Marker":{ "shape":"MarkerType", - "documentation":"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.
When Truncated
is true, this value is present and contains the value to use for the Marker
parameter in a subsequent pagination request.
When Truncated
is true, this element is present and contains the value to use for the Marker
parameter in a subsequent request.
A flag that indicates whether there are more items in the list. If your results were truncated, you can use the Marker
parameter to make a subsequent pagination request to retrieve more items in the list.
A flag that indicates whether there are more items in the list. When this value is true, the list in this response is truncated. To retrieve more items, pass the value of the NextMarker
element in this response to the Marker
parameter in a subsequent request.
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.
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.
" + "documentation":"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.
" }, "Marker":{ "shape":"MarkerType", - "documentation":"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.
When Truncated
is true, this value is present and contains the value to use for the Marker
parameter in a subsequent pagination request.
When Truncated
is true, this element is present and contains the value to use for the Marker
parameter in a subsequent request.
A flag that indicates whether there are more items in the list. If your results were truncated, you can use the Marker
parameter to make a subsequent pagination request to retrieve more items in the list.
A flag that indicates whether there are more items in the list. When this value is true, the list in this response is truncated. To retrieve more items, pass the value of the NextMarker
element in this response to the Marker
parameter in a subsequent request.
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.
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.
Currently only 1 policy can be attached to a key.
" + "documentation":"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.
Currently only 1 policy can be attached to a key.
" }, "Marker":{ "shape":"MarkerType", - "documentation":"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.
When Truncated
is true, this value is present and contains the value to use for the Marker
parameter in a subsequent pagination request.
When Truncated
is true, this element is present and contains the value to use for the Marker
parameter in a subsequent request.
A flag that indicates whether there are more items in the list. If your results were truncated, you can use the Marker
parameter to make a subsequent pagination request to retrieve more items in the list.
A flag that indicates whether there are more items in the list. When this value is true, the list in this response is truncated. To retrieve more items, pass the value of the NextMarker
element in this response to the Marker
parameter in a subsequent request.
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.
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.
" + "documentation":"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.
" }, "Marker":{ "shape":"MarkerType", - "documentation":"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.
When Truncated
is true, this value is present and contains the value to use for the Marker
parameter in a subsequent pagination request.
When Truncated
is true, this element is present and contains the value to use for the Marker
parameter in a subsequent request.
A flag that indicates whether there are more items in the list. If your results were truncated, you can use the Marker
parameter to make a subsequent pagination request to retrieve more items in the list.
A flag that indicates whether there are more items in the list. When this value is true, the list in this response is truncated. To retrieve more items, pass the value of the NextMarker
element in this response to the Marker
parameter in a subsequent request.
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
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.
" + }, + "Marker":{ + "shape":"MarkerType", + "documentation":"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.
A list of tags. Each tag consists of a tag key and a tag value.
" + }, + "NextMarker":{ + "shape":"MarkerType", + "documentation":"When Truncated
is true, this element is present and contains the value to use for the Marker
parameter in a subsequent request.
Do not assume or infer any information from this value.
" + }, + "Truncated":{ + "shape":"BooleanType", + "documentation":"A flag that indicates whether there are more items in the list. When this value is true, the list in this response is truncated. To retrieve more items, pass the value of the NextMarker
element in this response to the Marker
parameter in a subsequent request.
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.
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.
" + "documentation":"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.
" }, "Marker":{ "shape":"MarkerType", - "documentation":"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.
The key policy to attach to the CMK.
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 information, refer to the scenario in the Default Key Policy 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 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 information, see Changes that I make are not always immediately visible in the IAM User Guide.
The policy size limit is 32 KiB (32768 bytes).
" + "documentation":"The key policy to attach to the CMK.
If you do not set BypassPolicyLockoutSafetyCheck
to true, the policy must meet the following criteria:
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 section in the AWS Key Management Service Developer Guide.
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 information, see Changes that I make are not always immediately visible in the IAM User Guide.
The policy size limit is 32 KiB (32768 bytes).
" }, "BypassPolicyLockoutSafetyCheck":{ "shape":"BooleanType", - "documentation":"A flag to indicate whether to bypass the key policy lockout safety check.
Setting this value to true increases the likelihood that the CMK becomes unmanageable. Do not set this value to true indiscriminately.
For more information, refer to the scenario in the Default Key Policy 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.
The default value is false.
" + "documentation":"A flag to indicate whether to bypass the key policy lockout safety check.
Setting this value to true increases the likelihood that the CMK becomes unmanageable. Do not set this value to true indiscriminately.
For more information, refer to the scenario in the Default Key Policy section in the AWS Key Management Service Developer Guide.
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.
" } } }, @@ -1829,6 +1918,67 @@ } } }, + "Tag":{ + "type":"structure", + "required":[ + "TagKey", + "TagValue" + ], + "members":{ + "TagKey":{ + "shape":"TagKeyType", + "documentation":"The key of the tag.
" + }, + "TagValue":{ + "shape":"TagValueType", + "documentation":"The value of the tag.
" + } + }, + "documentation":"A key-value pair. A 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.
" + }, + "TagException":{ + "type":"structure", + "members":{ + "message":{"shape":"ErrorMessageType"} + }, + "documentation":"The request was rejected because one or more tags are not valid.
", + "exception":true + }, + "TagKeyList":{ + "type":"list", + "member":{"shape":"TagKeyType"} + }, + "TagKeyType":{ + "type":"string", + "max":128, + "min":1 + }, + "TagList":{ + "type":"list", + "member":{"shape":"Tag"} + }, + "TagResourceRequest":{ + "type":"structure", + "required":[ + "KeyId", + "Tags" + ], + "members":{ + "KeyId":{ + "shape":"KeyIdType", + "documentation":"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
One or more tags. Each tag consists of a tag key and a tag value.
" + } + } + }, + "TagValueType":{ + "type":"string", + "max":256, + "min":0 + }, "UnsupportedOperationException":{ "type":"structure", "members":{ @@ -1837,6 +1987,23 @@ "documentation":"The request was rejected because a specified parameter is not supported or a specified resource is not valid for this operation.
", "exception":true }, + "UntagResourceRequest":{ + "type":"structure", + "required":[ + "KeyId", + "TagKeys" + ], + "members":{ + "KeyId":{ + "shape":"KeyIdType", + "documentation":"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
One or more tag keys. Specify only the tag keys, not the tag values.
" + } + } + }, "UpdateAliasRequest":{ "type":"structure", "required":[ diff --git a/apis/kms-2014-11-01.paginators.json b/apis/kms-2014-11-01.paginators.json index 522d171f9f..6b5be67fd3 100644 --- a/apis/kms-2014-11-01.paginators.json +++ b/apis/kms-2014-11-01.paginators.json @@ -1,32 +1,32 @@ { "pagination": { "ListAliases": { - "limit_key": "Limit", "input_token": "Marker", - "output_token": "NextMarker", + "limit_key": "Limit", "more_results": "Truncated", + "output_token": "NextMarker", "result_key": "Aliases" }, "ListGrants": { - "limit_key": "Limit", "input_token": "Marker", - "output_token": "NextMarker", + "limit_key": "Limit", "more_results": "Truncated", + "output_token": "NextMarker", "result_key": "Grants" }, "ListKeyPolicies": { - "limit_key": "Limit", "input_token": "Marker", - "output_token": "NextMarker", + "limit_key": "Limit", "more_results": "Truncated", + "output_token": "NextMarker", "result_key": "PolicyNames" }, "ListKeys": { - "limit_key": "Limit", "input_token": "Marker", - "output_token": "NextMarker", + "limit_key": "Limit", "more_results": "Truncated", + "output_token": "NextMarker", "result_key": "Keys" } } -} +} \ No newline at end of file diff --git a/clients/kms.d.ts b/clients/kms.d.ts index d63760f9be..311e413fc0 100644 --- a/clients/kms.d.ts +++ b/clients/kms.d.ts @@ -203,6 +203,14 @@ declare class KMS extends Service { * Lists the customer master keys. */ listKeys(callback?: (err: AWSError, data: KMS.Types.ListKeysResponse) => void): Requestw((N-r)/S)&&s("overflow"),r+=(p-t)*S,t=p,u=0;u =0?(m=b.substr(0,h),l=b.substr(h+1)):(m=b,l=""),d=decodeURIComponent(m),y=decodeURIComponent(l),a(n,d)?s(n[d])?n[d].push(y):n[d]=[n[d],y]:n[d]=y}return n};var s=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)}},{}],268:[function(e,t,r){"use strict";function a(e,t){if(e.map)return e.map(t);for(var r=[],a=0;a >1,l=23===s?Math.pow(2,-24)-Math.pow(2,-77):0,d=a?0:i-1,y=a?1:-1,b=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(o=isNaN(t)?1:0,n=c):(n=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-n))<1&&(n--,u*=2),t+=n+m>=1?l/u:l*Math.pow(2,1-m),t*u>=2&&(n++,u/=2),n+m>=c?(o=0,n=c):n+m>=1?(o=(t*u-1)*Math.pow(2,s),n+=m):(o=t*Math.pow(2,m-1)*Math.pow(2,s),n=0));s>=8;e[r+d]=255&o,d+=y,o/=256,s-=8);for(n=n< w((N-r)/S)&&s("overflow"),r+=(p-t)*S,t=p,u=0;u =0?(m=b.substr(0,h),l=b.substr(h+1)):(m=b,l=""),d=decodeURIComponent(m),y=decodeURIComponent(l),a(n,d)?s(n[d])?n[d].push(y):n[d]=[n[d],y]:n[d]=y}return n};var s=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)}},{}],268:[function(e,t,r){"use strict";function a(e,t){if(e.map)return e.map(t);for(var r=[],a=0;a >1,l=23===s?Math.pow(2,-24)-Math.pow(2,-77):0,d=a?0:i-1,y=a?1:-1,b=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(o=isNaN(t)?1:0,n=c):(n=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-n))<1&&(n--,u*=2),t+=n+m>=1?l/u:l*Math.pow(2,1-m),t*u>=2&&(n++,u/=2),n+m>=c?(o=0,n=c):n+m>=1?(o=(t*u-1)*Math.pow(2,s),n+=m):(o=t*Math.pow(2,m-1)*Math.pow(2,s),n=0));s>=8;e[r+d]=255&o,d+=y,o/=256,s-=8);for(n=n<>16&255,o[p++]=i>>8&255,o[p++]=255&i;return 2===n?(i=c[e.charCodeAt(t)]<<2|c[e.charCodeAt(t+1)]>>4,o[p++]=255&i):1===n&&(i=c[e.charCodeAt(t)]<<10|c[e.charCodeAt(t+1)]<<4|c[e.charCodeAt(t+2)]>>2,o[p++]=i>>8&255,o[p++]=255&i),o}function n(e){return p[e>>18&63]+p[e>>12&63]+p[e>>6&63]+p[63&e]}function o(e,t,r){for(var a,s=[],i=t;i0;e[r+d]=255&n,d+=y,n/=256,p-=8);e[r+d-y]|=128*b}},{}],276:[function(e,t,r){var a={}.toString;t.exports=Array.isArray||function(e){return"[object Array]"==a.call(e)}},{}],277:[function(e,t,r){function a(e,t){if(e.length%o!==0){var r=e.length+(o-e.length%o);e=n.concat([e,u],r)}for(var a=[],s=t?e.readInt32BE:e.readInt32LE,i=0;ie.partSize&&(e.partSize=t)}else e.totalBytes=void 0},isDoneChunking:!1,partPos:0,totalChunkedBytes:0,totalUploadedBytes:0,totalBytes:void 0,numParts:0,totalPartNumbers:0,activeParts:0,doneParts:0,parts:null,completeInfo:null,failed:!1,multipartReq:null,partBuffers:null,partBufferLength:0,fillBuffer:function(){var e=this,t=s(e.body);if(0===t)return e.isDoneChunking=!0,e.numParts=1,void e.nextChunk(e.body);for(;e.activeParts>16&255,o[p++]=i>>8&255,o[p++]=255&i;return 2===n?(i=c[e.charCodeAt(t)]<<2|c[e.charCodeAt(t+1)]>>4,o[p++]=255&i):1===n&&(i=c[e.charCodeAt(t)]<<10|c[e.charCodeAt(t+1)]<<4|c[e.charCodeAt(t+2)]>>2,o[p++]=i>>8&255,o[p++]=255&i),o}function n(e){return p[e>>18&63]+p[e>>12&63]+p[e>>6&63]+p[63&e]}function o(e,t,r){for(var a,s=[],i=t;i0;e[r+d]=255&n,d+=y,n/=256,p-=8);e[r+d-y]|=128*b}},{}],276:[function(e,t,r){var a={}.toString;t.exports=Array.isArray||function(e){return"[object Array]"==a.call(e)}},{}],277:[function(e,t,r){function a(e,t){if(e.length%o!==0){var r=e.length+(o-e.length%o);e=n.concat([e,u],r)}for(var a=[],s=t?e.readInt32BE:e.readInt32LE,i=0;i