aws-sdk-ec2 1.255.0 → 1.256.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b992423b0b82c86a55e765379f5d255170b0e1416d3dc99e7139ab038f921d4
-  data.tar.gz: ce8cbedbe5d4bfe3786f09eea60b8f84e624d7ac26ff2f1f006c36b55f57521b
+  metadata.gz: 91c08c2d64f0dab974dd33bd2ca05aa8860ed18bc90bb347d0f914170cc2c3b9
+  data.tar.gz: 929ca266433078f42b56005b95c7a1aefae1a1b115d42f00bbeea4c685717bec
 SHA512:
-  metadata.gz: 894abc7e045b4b6915e7dce3c0d7f1794e0e7ca8ef4918d8386bd92274155b323fb51bc746481e9385a652bebf1991abe438db381f0c2be480b1cbd03ccfc372
-  data.tar.gz: 7da76aab16b5b4846ec6b43da30cc0ab82d761417e2f26f826b23cb620f0d31f01971e6f4e584b148503219f02db8751c194368f04974d716d5ef6fddc9a0d60
+  metadata.gz: 370eb759b30c39b30e63387e0ae305cee53eb75926567d7e67d7c7321d4f747ae2237518ed350bf44459b35064dac2066cb6ad14503e8e705fe3e9cefd32384c
+  data.tar.gz: f634e298a9f2e5b71736c353f64b53f81d4903360921e77ede0f40c9bc9acf59a3c277a54fc3b5726594d165932d36100c2ac80ba45a8bf507df6622d5287810

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.256.0 (2021-08-19)
+------------------
+
+* Feature - The ImportImage API now supports the ability to create AMIs with AWS-managed licenses for Microsoft SQL Server for both Windows and Linux.
+
 1.255.0 (2021-08-17)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.255.0
+1.256.0

data/lib/aws-sdk-ec2.rb

@@ -72,6 +72,6 @@ require_relative 'aws-sdk-ec2/customizations'
 # @!group service
 module Aws::EC2
 
-  GEM_VERSION = '1.255.0'
+  GEM_VERSION = '1.256.0'
 
 end

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

@@ -18372,6 +18372,7 @@ module Aws::EC2
     #   resp.import_image_tasks[0].tags[0].value #=> String
     #   resp.import_image_tasks[0].license_specifications #=> Array
     #   resp.import_image_tasks[0].license_specifications[0].license_configuration_arn #=> String
+    #   resp.import_image_tasks[0].usage_operation #=> String
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImportImageTasks AWS API Documentation
@@ -31061,8 +31062,8 @@ module Aws::EC2
     #
     # @option params [required, Types::ExportTaskS3LocationRequest] :s3_export_location
     #   Information about the destination Amazon S3 bucket. The bucket must
-    #   exist and grant WRITE and READ\_ACP permissions to the AWS account
-    #   vm-import-export@amazon.com.
+    #   exist and grant WRITE and READ\_ACP permissions to the Amazon Web
+    #   Services account vm-import-export@amazon.com.
     #
     # @option params [String] :role_name
     #   The name of the role that grants VM Import/Export permission to export
@@ -32929,10 +32930,10 @@ module Aws::EC2
     #
     # @option params [Boolean] :encrypted
     #   Specifies whether the destination AMI of the imported image should be
-    #   encrypted. The default CMK for EBS is used unless you specify a
-    #   non-default AWS Key Management Service (AWS KMS) CMK using `KmsKeyId`.
-    #   For more information, see [Amazon EBS Encryption][1] in the *Amazon
-    #   Elastic Compute Cloud User Guide*.
+    #   encrypted. The default KMS key for EBS is used unless you specify a
+    #   non-default KMS key using `KmsKeyId`. For more information, see
+    #   [Amazon EBS Encryption][1] in the *Amazon Elastic Compute Cloud User
+    #   Guide*.
     #
     #
     #
@@ -32944,40 +32945,43 @@ module Aws::EC2
     #   Valid values: `xen`
     #
     # @option params [String] :kms_key_id
-    #   An identifier for the symmetric AWS Key Management Service (AWS KMS)
-    #   customer master key (CMK) to use when creating the encrypted AMI. 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. If a
-    #   `KmsKeyId` is specified, the `Encrypted` flag must also be set.
+    #   An identifier for the symmetric KMS key to use when creating the
+    #   encrypted AMI. This parameter is only required if you want to use a
+    #   non-default KMS key; if this parameter is not specified, the default
+    #   KMS key 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:
+    #   The KMS key identifier may be provided in any of the following
+    #   formats:
     #
     #   * Key ID
     #
     #   * 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,
+    #     followed by the Region of the key, the Amazon Web Services account
+    #     ID of the key owner, the `alias` namespace, and then the key alias.
+    #     For example,
     #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
     #
     #   * 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,
+    #     followed by the Region of the key, the Amazon Web Services account
+    #     ID of the key owner, the `key` namespace, and then the key 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,
+    #     namespace, followed by the Region of the key, the Amazon Web
+    #     Services account ID of the key owner, the `alias` namespace, and
+    #     then the key 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.
-    #   This action will eventually report failure.
+    #   Amazon Web Services parses `KmsKeyId` asynchronously, meaning that the
+    #   action you call may appear to complete even though you provided an
+    #   invalid identifier. This action will eventually report failure.
     #
-    #   The specified CMK must exist in the Region that the AMI is being
+    #   The specified KMS key must exist in the Region that the AMI is being
     #   copied to.
     #
-    #   Amazon EBS does not support asymmetric CMKs.
+    #   Amazon EBS does not support asymmetric KMS keys.
     #
     # @option params [String] :license_type
     #   The license type to be used for the Amazon Machine Image (AMI) after
@@ -32985,13 +32989,14 @@ module Aws::EC2
     #
     #   By default, we detect the source-system operating system (OS) and
     #   apply the appropriate license. Specify `AWS` to replace the
-    #   source-system license with an AWS license, if appropriate. Specify
-    #   `BYOL` to retain the source-system license, if appropriate.
+    #   source-system license with an Amazon Web Services license, if
+    #   appropriate. Specify `BYOL` to retain the source-system license, if
+    #   appropriate.
     #
     #   To use `BYOL`, you must have existing licenses with rights to use
-    #   these licenses in a third party cloud, such as AWS. For more
-    #   information, see [Prerequisites][1] in the VM Import/Export User
-    #   Guide.
+    #   these licenses in a third party cloud, such as Amazon Web Services.
+    #   For more information, see [Prerequisites][1] in the VM Import/Export
+    #   User Guide.
     #
     #
     #
@@ -33012,6 +33017,15 @@ module Aws::EC2
     # @option params [Array<Types::TagSpecification>] :tag_specifications
     #   The tags to apply to the import image task during creation.
     #
+    # @option params [String] :usage_operation
+    #   The usage operation value. For more information, see [AMI billing
+    #   information fields][1] in the *Amazon Elastic Compute Cloud User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html
+    #
     # @return [Types::ImportImageResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::ImportImageResult#architecture #architecture} => String
@@ -33029,6 +33043,7 @@ module Aws::EC2
     #   * {Types::ImportImageResult#status_message #status_message} => String
     #   * {Types::ImportImageResult#license_specifications #license_specifications} => Array&lt;Types::ImportImageLicenseConfigurationResponse&gt;
     #   * {Types::ImportImageResult#tags #tags} => Array&lt;Types::Tag&gt;
+    #   * {Types::ImportImageResult#usage_operation #usage_operation} => String
     #
     # @example Request syntax with placeholder values
     #
@@ -33078,6 +33093,7 @@ module Aws::EC2
     #         ],
     #       },
     #     ],
+    #     usage_operation: "String",
     #   })
     #
     # @example Response structure
@@ -33111,6 +33127,7 @@ module Aws::EC2
     #   resp.tags #=> Array
     #   resp.tags[0].key #=> String
     #   resp.tags[0].value #=> String
+    #   resp.usage_operation #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImage AWS API Documentation
     #
@@ -33127,10 +33144,10 @@ module Aws::EC2
     # This API action supports only single-volume VMs. To import
     # multi-volume VMs, use ImportImage instead.
     #
-    # This API action is not supported by the AWS Command Line Interface
-    # (AWS CLI). For information about using the Amazon EC2 CLI, which is
-    # deprecated, see [Importing a VM to Amazon EC2][1] in the *Amazon EC2
-    # CLI Reference* PDF file.
+    # This API action is not supported by the Command Line Interface (CLI).
+    # For information about using the Amazon EC2 CLI, which is deprecated,
+    # see [Importing a VM to Amazon EC2][1] in the *Amazon EC2 CLI
+    # Reference* PDF file.
     #
     # For information about the import manifest referenced by this API
     # action, see [VM Import Manifest][2].
@@ -33354,50 +33371,53 @@ module Aws::EC2
     #
     # @option params [Boolean] :encrypted
     #   Specifies whether the destination snapshot of the imported image
-    #   should be encrypted. The default CMK for EBS is used unless you
-    #   specify a non-default AWS Key Management Service (AWS KMS) CMK using
-    #   `KmsKeyId`. For more information, see [Amazon EBS Encryption][1] in
-    #   the *Amazon Elastic Compute Cloud User Guide*.
+    #   should be encrypted. The default KMS key for EBS is used unless you
+    #   specify a non-default KMS key using `KmsKeyId`. For more information,
+    #   see [Amazon EBS Encryption][1] in the *Amazon Elastic Compute Cloud
+    #   User Guide*.
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
     #
     # @option params [String] :kms_key_id
-    #   An identifier for the symmetric AWS Key Management Service (AWS KMS)
-    #   customer master key (CMK) to use when creating the encrypted snapshot.
-    #   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.
-    #   If a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
+    #   An identifier for the symmetric KMS key to use when creating the
+    #   encrypted snapshot. This parameter is only required if you want to use
+    #   a non-default KMS key; if this parameter is not specified, the default
+    #   KMS key 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:
+    #   The KMS key identifier may be provided in any of the following
+    #   formats:
     #
     #   * Key ID
     #
     #   * 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,
+    #     followed by the Region of the key, the Amazon Web Services account
+    #     ID of the key owner, the `alias` namespace, and then the key alias.
+    #     For example,
     #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
     #
     #   * 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,
+    #     followed by the Region of the key, the Amazon Web Services account
+    #     ID of the key owner, the `key` namespace, and then the key 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,
+    #     namespace, followed by the Region of the key, the Amazon Web
+    #     Services account ID of the key owner, the `alias` namespace, and
+    #     then the key 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.
-    #   This action will eventually report failure.
+    #   Amazon Web Services parses `KmsKeyId` asynchronously, meaning that the
+    #   action you call may appear to complete even though you provided an
+    #   invalid identifier. This action will eventually report failure.
     #
-    #   The specified CMK must exist in the Region that the snapshot is being
-    #   copied to.
+    #   The specified KMS key must exist in the Region that the snapshot is
+    #   being copied to.
     #
-    #   Amazon EBS does not support asymmetric CMKs.
+    #   Amazon EBS does not support asymmetric KMS keys.
     #
     # @option params [String] :role_name
     #   The name of the role to use when not using the default role,
@@ -33486,10 +33506,10 @@ module Aws::EC2
     # multi-volume VMs, use ImportImage instead. To import a disk to a
     # snapshot, use ImportSnapshot instead.
     #
-    # This API action is not supported by the AWS Command Line Interface
-    # (AWS CLI). For information about using the Amazon EC2 CLI, which is
-    # deprecated, see [Importing Disks to Amazon EBS][1] in the *Amazon EC2
-    # CLI Reference* PDF file.
+    # This API action is not supported by the Command Line Interface (CLI).
+    # For information about using the Amazon EC2 CLI, which is deprecated,
+    # see [Importing Disks to Amazon EBS][1] in the *Amazon EC2 CLI
+    # Reference* PDF file.
     #
     # For information about the import manifest referenced by this API
     # action, see [VM Import Manifest][2].
@@ -43562,7 +43582,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.255.0'
+      context[:gem_version] = '1.256.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-ec2/client_api.rb

@@ -7161,6 +7161,7 @@ module Aws::EC2
     ImportImageRequest.add_member(:role_name, Shapes::ShapeRef.new(shape: String, location_name: "RoleName"))
     ImportImageRequest.add_member(:license_specifications, Shapes::ShapeRef.new(shape: ImportImageLicenseSpecificationListRequest, location_name: "LicenseSpecifications"))
     ImportImageRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    ImportImageRequest.add_member(:usage_operation, Shapes::ShapeRef.new(shape: String, location_name: "UsageOperation"))
     ImportImageRequest.struct_class = Types::ImportImageRequest
 
     ImportImageResult.add_member(:architecture, Shapes::ShapeRef.new(shape: String, location_name: "architecture"))
@@ -7178,6 +7179,7 @@ module Aws::EC2
     ImportImageResult.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
     ImportImageResult.add_member(:license_specifications, Shapes::ShapeRef.new(shape: ImportImageLicenseSpecificationListResponse, location_name: "licenseSpecifications"))
     ImportImageResult.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    ImportImageResult.add_member(:usage_operation, Shapes::ShapeRef.new(shape: String, location_name: "usageOperation"))
     ImportImageResult.struct_class = Types::ImportImageResult
 
     ImportImageTask.add_member(:architecture, Shapes::ShapeRef.new(shape: String, location_name: "architecture"))
@@ -7195,6 +7197,7 @@ module Aws::EC2
     ImportImageTask.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
     ImportImageTask.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ImportImageTask.add_member(:license_specifications, Shapes::ShapeRef.new(shape: ImportImageLicenseSpecificationListResponse, location_name: "licenseSpecifications"))
+    ImportImageTask.add_member(:usage_operation, Shapes::ShapeRef.new(shape: String, location_name: "usageOperation"))
     ImportImageTask.struct_class = Types::ImportImageTask
 
     ImportImageTaskList.member = Shapes::ShapeRef.new(shape: ImportImageTask, location_name: "item")

data/lib/aws-sdk-ec2/types.rb

@@ -29358,8 +29358,8 @@ module Aws::EC2
     #
     # @!attribute [rw] s3_export_location
     #   Information about the destination Amazon S3 bucket. The bucket must
-    #   exist and grant WRITE and READ\_ACP permissions to the AWS account
-    #   vm-import-export@amazon.com.
+    #   exist and grant WRITE and READ\_ACP permissions to the Amazon Web
+    #   Services account vm-import-export@amazon.com.
     #   @return [Types::ExportTaskS3LocationRequest]
     #
     # @!attribute [rw] role_name
@@ -29600,7 +29600,7 @@ module Aws::EC2
     # @!attribute [rw] s3_bucket
     #   The Amazon S3 bucket for the destination image. The destination
     #   bucket must exist and grant WRITE and READ\_ACP permissions to the
-    #   AWS account `vm-import-export@amazon.com`.
+    #   Amazon Web Services account `vm-import-export@amazon.com`.
     #   @return [String]
     #
     # @!attribute [rw] s3_key
@@ -29642,7 +29642,7 @@ module Aws::EC2
     # @!attribute [rw] s3_bucket
     #   The Amazon S3 bucket for the destination image. The destination
     #   bucket must exist and grant WRITE and READ\_ACP permissions to the
-    #   AWS account `vm-import-export@amazon.com`.
+    #   Amazon Web Services account `vm-import-export@amazon.com`.
     #   @return [String]
     #
     # @!attribute [rw] s3_prefix
@@ -33409,6 +33409,7 @@ module Aws::EC2
     #             ],
     #           },
     #         ],
+    #         usage_operation: "String",
     #       }
     #
     # @!attribute [rw] architecture
@@ -33442,10 +33443,10 @@ module Aws::EC2
     #
     # @!attribute [rw] encrypted
     #   Specifies whether the destination AMI of the imported image should
-    #   be encrypted. The default CMK for EBS is used unless you specify a
-    #   non-default AWS Key Management Service (AWS KMS) CMK using
-    #   `KmsKeyId`. For more information, see [Amazon EBS Encryption][1] in
-    #   the *Amazon Elastic Compute Cloud User Guide*.
+    #   be encrypted. The default KMS key for EBS is used unless you specify
+    #   a non-default KMS key using `KmsKeyId`. For more information, see
+    #   [Amazon EBS Encryption][1] in the *Amazon Elastic Compute Cloud User
+    #   Guide*.
     #
     #
     #
@@ -33459,41 +33460,43 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] kms_key_id
-    #   An identifier for the symmetric AWS Key Management Service (AWS KMS)
-    #   customer master key (CMK) to use when creating the encrypted AMI.
-    #   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. If a `KmsKeyId` is specified, the `Encrypted` flag must also
-    #   be set.
+    #   An identifier for the symmetric KMS key to use when creating the
+    #   encrypted AMI. This parameter is only required if you want to use a
+    #   non-default KMS key; if this parameter is not specified, the default
+    #   KMS key 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:
+    #   The KMS key identifier may be provided in any of the following
+    #   formats:
     #
     #   * Key ID
     #
     #   * 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,
+    #     followed by the Region of the key, the Amazon Web Services account
+    #     ID of the key owner, the `alias` namespace, and then the key
+    #     alias. For example,
     #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
     #
     #   * 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,
+    #     followed by the Region of the key, the Amazon Web Services account
+    #     ID of the key owner, the `key` namespace, and then the key 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,
+    #     namespace, followed by the Region of the key, the Amazon Web
+    #     Services account ID of the key owner, the `alias` namespace, and
+    #     then the key 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. This action will eventually report failure.
+    #   Amazon Web Services parses `KmsKeyId` asynchronously, meaning that
+    #   the action you call may appear to complete even though you provided
+    #   an invalid identifier. This action will eventually report failure.
     #
-    #   The specified CMK must exist in the Region that the AMI is being
+    #   The specified KMS key must exist in the Region that the AMI is being
     #   copied to.
     #
-    #   Amazon EBS does not support asymmetric CMKs.
+    #   Amazon EBS does not support asymmetric KMS keys.
     #   @return [String]
     #
     # @!attribute [rw] license_type
@@ -33502,13 +33505,14 @@ module Aws::EC2
     #
     #   By default, we detect the source-system operating system (OS) and
     #   apply the appropriate license. Specify `AWS` to replace the
-    #   source-system license with an AWS license, if appropriate. Specify
-    #   `BYOL` to retain the source-system license, if appropriate.
+    #   source-system license with an Amazon Web Services license, if
+    #   appropriate. Specify `BYOL` to retain the source-system license, if
+    #   appropriate.
     #
     #   To use `BYOL`, you must have existing licenses with rights to use
-    #   these licenses in a third party cloud, such as AWS. For more
-    #   information, see [Prerequisites][1] in the VM Import/Export User
-    #   Guide.
+    #   these licenses in a third party cloud, such as Amazon Web Services.
+    #   For more information, see [Prerequisites][1] in the VM Import/Export
+    #   User Guide.
     #
     #
     #
@@ -33534,6 +33538,16 @@ module Aws::EC2
     #   The tags to apply to the import image task during creation.
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] usage_operation
+    #   The usage operation value. For more information, see [AMI billing
+    #   information fields][1] in the *Amazon Elastic Compute Cloud User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageRequest AWS API Documentation
     #
     class ImportImageRequest < Struct.new(
@@ -33550,7 +33564,8 @@ module Aws::EC2
       :platform,
       :role_name,
       :license_specifications,
-      :tag_specifications)
+      :tag_specifications,
+      :usage_operation)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -33580,9 +33595,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] kms_key_id
-    #   The identifier for the symmetric AWS Key Management Service (AWS
-    #   KMS) customer master key (CMK) that was used to create the encrypted
-    #   AMI.
+    #   The identifier for the symmetric KMS key that was used to create the
+    #   encrypted AMI.
     #   @return [String]
     #
     # @!attribute [rw] license_type
@@ -33617,6 +33631,10 @@ module Aws::EC2
     #   Any tags assigned to the import image task.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] usage_operation
+    #   The usage operation value.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageResult AWS API Documentation
     #
     class ImportImageResult < Struct.new(
@@ -33634,7 +33652,8 @@ module Aws::EC2
       :status,
       :status_message,
       :license_specifications,
-      :tags)
+      :tags,
+      :usage_operation)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -33671,8 +33690,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] kms_key_id
-    #   The identifier for the AWS Key Management Service (AWS KMS) customer
-    #   master key (CMK) that was used to create the encrypted image.
+    #   The identifier for the KMS key that was used to create the encrypted
+    #   image.
     #   @return [String]
     #
     # @!attribute [rw] license_type
@@ -33708,6 +33727,10 @@ module Aws::EC2
     #   import image task.
     #   @return [Array<Types::ImportImageLicenseConfigurationResponse>]
     #
+    # @!attribute [rw] usage_operation
+    #   The usage operation value.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageTask AWS API Documentation
     #
     class ImportImageTask < Struct.new(
@@ -33725,7 +33748,8 @@ module Aws::EC2
       :status,
       :status_message,
       :tags,
-      :license_specifications)
+      :license_specifications,
+      :usage_operation)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -34139,10 +34163,10 @@ module Aws::EC2
     #
     # @!attribute [rw] encrypted
     #   Specifies whether the destination snapshot of the imported image
-    #   should be encrypted. The default CMK for EBS is used unless you
-    #   specify a non-default AWS Key Management Service (AWS KMS) CMK using
-    #   `KmsKeyId`. For more information, see [Amazon EBS Encryption][1] in
-    #   the *Amazon Elastic Compute Cloud User Guide*.
+    #   should be encrypted. The default KMS key for EBS is used unless you
+    #   specify a non-default KMS key using `KmsKeyId`. For more
+    #   information, see [Amazon EBS Encryption][1] in the *Amazon Elastic
+    #   Compute Cloud User Guide*.
     #
     #
     #
@@ -34150,41 +34174,43 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] kms_key_id
-    #   An identifier for the symmetric AWS Key Management Service (AWS KMS)
-    #   customer master key (CMK) to use when creating the encrypted
-    #   snapshot. 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. If a `KmsKeyId` is specified, the `Encrypted` flag
-    #   must also be set.
+    #   An identifier for the symmetric KMS key to use when creating the
+    #   encrypted snapshot. This parameter is only required if you want to
+    #   use a non-default KMS key; if this parameter is not specified, the
+    #   default KMS key 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:
+    #   The KMS key identifier may be provided in any of the following
+    #   formats:
     #
     #   * Key ID
     #
     #   * 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,
+    #     followed by the Region of the key, the Amazon Web Services account
+    #     ID of the key owner, the `alias` namespace, and then the key
+    #     alias. For example,
     #     arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
     #
     #   * 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,
+    #     followed by the Region of the key, the Amazon Web Services account
+    #     ID of the key owner, the `key` namespace, and then the key 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,
+    #     namespace, followed by the Region of the key, the Amazon Web
+    #     Services account ID of the key owner, the `alias` namespace, and
+    #     then the key 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. This action will eventually report failure.
+    #   Amazon Web Services parses `KmsKeyId` asynchronously, meaning that
+    #   the action you call may appear to complete even though you provided
+    #   an invalid identifier. This action will eventually report failure.
     #
-    #   The specified CMK must exist in the Region that the snapshot is
+    #   The specified KMS key must exist in the Region that the snapshot is
     #   being copied to.
     #
-    #   Amazon EBS does not support asymmetric CMKs.
+    #   Amazon EBS does not support asymmetric KMS keys.
     #   @return [String]
     #
     # @!attribute [rw] role_name
@@ -52634,8 +52660,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] kms_key_id
-    #   The identifier for the AWS Key Management Service (AWS KMS) customer
-    #   master key (CMK) that was used to create the encrypted snapshot.
+    #   The identifier for the KMS key that was used to create the encrypted
+    #   snapshot.
     #   @return [String]
     #
     # @!attribute [rw] progress
@@ -57473,9 +57499,10 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] data
-    #   The user data. If you are using an AWS SDK or command line tool,
-    #   Base64-encoding is performed for you, and you can load the text from
-    #   a file. Otherwise, you must provide Base64-encoded text.
+    #   The user data. If you are using an Amazon Web Services SDK or
+    #   command line tool, Base64-encoding is performed for you, and you can
+    #   load the text from a file. Otherwise, you must provide
+    #   Base64-encoded text.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/UserData AWS API Documentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.255.0
+  version: 1.256.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4