resource.rb in aws-sdk-ec2-1.27.0

- old
+ new
@@ -759,18 +759,35 @@
     #   operations per second (IOPS) to provision for the volume, with a
     #   maximum ratio of 50 IOPS/GiB.
     #
     #   Constraint: Range is 100 to 20000 for Provisioned IOPS SSD volumes
     # @option options [String] :kms_key_id
-    #   The full ARN of the AWS Key Management Service (AWS KMS) customer
+    #   An identifier for the AWS Key Management Service (AWS KMS) customer
     #   master key (CMK) to use when creating the encrypted volume. This
     #   parameter is only required if you want to use a non-default CMK; if
-    #   this parameter is not specified, the default CMK for EBS is used. The
-    #   ARN contains the `arn:aws:kms` namespace, followed by the region of
-    #   the CMK, the AWS account ID of the CMK owner, the `key` namespace, and
-    #   then the CMK ID. For example,
-    #   arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
-    #   If a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
+    #   this parameter is not specified, the default CMK for EBS is used. If a
+    #   `KmsKeyId` is specified, the `Encrypted` flag must also be set.
+    #
+    #   The CMK identifier may be provided in any of the following formats:
+    #
+    #   * Key ID
+    #
+    #   * Key alias
+    #
+    #   * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
+    #     followed by the region of the CMK, the AWS account ID of the CMK
+    #     owner, the `key` namespace, and then the CMK ID. For example,
+    #     arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
+    #
+    #   * ARN using key alias. The alias ARN contains the `arn:aws:kms`
+    #     namespace, followed by the region of the CMK, the AWS account ID of
+    #     the CMK owner, the `alias` namespace, and then the CMK alias. For
+    #     example,
+    #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
+    #
+    #   AWS parses `KmsKeyId` asynchronously, meaning that the action you call
+    #   may appear to complete even though you provided an invalid identifier.
+    #   The action will eventually fail.
     # @option options [Integer] :size
     #   The size of the volume, in GiBs.
     #
     #   Constraints: 1-16384 for `gp2`, 4-16384 for `io1`, 500-16384 for
     #   `st1`, 500-16384 for `sc1`, and 1-1024 for `standard`. If you specify