aws-sdk-ec2 1.232.0 → 1.233.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a13230b8cf8f435b939934156d642062e16b24508436a09b0404d131ef4f6b
-  data.tar.gz: 869509762a55a5f38f3303d43c19f1d9fdcad1450b2a8c3a66ebe5bbc55b8b8b
+  metadata.gz: f0da339a81ce955d4eff0fcfbcfea49048e85b0fdf227a8637731228746f8ec4
+  data.tar.gz: 486397d90c2ebb9adf7fe642eda8b26e32d582d1c1fb8dfac161e03bda27629e
 SHA512:
-  metadata.gz: a8b22854ddff5bb007df9f7d3f5fba7be71ce5a4a7c53e6032ef8194b1cf3c46d9e4666c34841aa775bd0b1501d84a3dc23cfcce939e3795c56c49d34a11e240
-  data.tar.gz: 9062295bfc6e517990410b21acf22e8b80d50c9412e72cc47d4edb642b90442fa1a349eb3decf4c6c326210dd880854b09492790f0776a2ac6877398c416adb2
+  metadata.gz: 8dd8049994bdedeb41dc8e93d34df65b2ebd69c9fbad83ca8b41424c72453de2ef851b6062a5cd389d8e36142ac64eb26b464efe9c838e5e0b277f3ccc020ccf
+  data.tar.gz: 152d1fbb23b0ebf379c12116ae46dd645697b32c89899e6d2e3b60cb18597ac50d97da7d06f43bb99cb4f2db96dd1922bb6481f8cc33a25ea42a229561892ef3

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.233.0 (2021-04-06)
+------------------
+
+* Feature - This release adds support for storing EBS-backed AMIs in S3 and restoring them from S3 to enable cross-partition copying of AMIs
+
 1.232.0 (2021-04-01)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.232.0
+1.233.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.232.0'
+  GEM_VERSION = '1.233.0'
 
 end

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

@@ -3332,7 +3332,8 @@ module Aws::EC2
     # Initiates the copy of an AMI. You can copy an AMI from one Region to
     # another, or from a Region to an AWS Outpost. You can't copy an AMI
     # from an Outpost to a Region, from one Outpost to another, or within
-    # the same Outpost.
+    # the same Outpost. To copy an AMI to another partition, see
+    # [CreateStoreImageTask][1].
     #
     # To copy an AMI from one Region to another, specify the source Region
     # using the **SourceRegion** parameter, and specify the destination
@@ -3348,18 +3349,17 @@ module Aws::EC2
     # encryption key for the Region, or a different key that you specify in
     # the request using **KmsKeyId**. Outposts do not support unencrypted
     # snapshots. For more information, [ Amazon EBS local snapshots on
-    # Outposts][1] in the *Amazon Elastic Compute Cloud User Guide*.
-    #
-    #
+    # Outposts][2] in the *Amazon Elastic Compute Cloud User Guide*.
     #
     # For more information about the prerequisites and limits when copying
-    # an AMI, see [Copying an AMI][2] in the *Amazon Elastic Compute Cloud
+    # an AMI, see [Copying an AMI][3] in the *Amazon Elastic Compute Cloud
     # User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#ami
-    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/CopyingAMIs.html
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateStoreImageTask.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#ami
+    # [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/CopyingAMIs.html
     #
     # @option params [String] :client_token
     #   Unique, case-sensitive identifier you provide to ensure idempotency of
@@ -7547,6 +7547,86 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Starts a task that restores an AMI from an S3 object that was
+    # previously created by using [CreateStoreImageTask][1].
+    #
+    # To use this API, you must have the required permissions. For more
+    # information, see [Permissions for storing and restoring AMIs using
+    # S3][2] in the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    # For more information, see [Store and restore an AMI using S3][3] in
+    # the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateStoreImageTask.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions
+    # [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html
+    #
+    # @option params [required, String] :bucket
+    #   The name of the S3 bucket that contains the stored AMI object.
+    #
+    # @option params [required, String] :object_key
+    #   The name of the stored AMI object in the bucket.
+    #
+    # @option params [String] :name
+    #   The name for the restored AMI. The name must be unique for AMIs in the
+    #   Region for this account. If you do not provide a name, the new AMI
+    #   gets the same name as the original AMI.
+    #
+    # @option params [Array<Types::TagSpecification>] :tag_specifications
+    #   The tags to apply to the AMI and snapshots on restoration. You can tag
+    #   the AMI, the snapshots, or both.
+    #
+    #   * To tag the AMI, the value for `ResourceType` must be `image`.
+    #
+    #   * To tag the snapshots, the value for `ResourceType` must be
+    #     `snapshot`. The same tag is applied to all of the snapshots that are
+    #     created.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @return [Types::CreateRestoreImageTaskResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::CreateRestoreImageTaskResult#image_id #image_id} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.create_restore_image_task({
+    #     bucket: "String", # required
+    #     object_key: "String", # required
+    #     name: "String",
+    #     tag_specifications: [
+    #       {
+    #         resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, internet-gateway, key-pair, launch-template, local-gateway-route-table-vpc-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-connect-peer, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       },
+    #     ],
+    #     dry_run: false,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.image_id #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateRestoreImageTask AWS API Documentation
+    #
+    # @overload create_restore_image_task(params = {})
+    # @param [Hash] params ({})
+    def create_restore_image_task(params = {}, options = {})
+      req = build_request(:create_restore_image_task, params)
+      req.send_request(options)
+    end
+
     # Creates a route in a route table within a VPC.
     #
     # You must specify one of the following targets: internet gateway or
@@ -8285,6 +8365,70 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Stores an AMI as a single object in an S3 bucket.
+    #
+    # To use this API, you must have the required permissions. For more
+    # information, see [Permissions for storing and restoring AMIs using
+    # S3][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    # For more information, see [Store and restore an AMI using S3][2] in
+    # the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html
+    #
+    # @option params [required, String] :image_id
+    #   The ID of the AMI.
+    #
+    # @option params [required, String] :bucket
+    #   The name of the S3 bucket in which the AMI object will be stored. The
+    #   bucket must be in the Region in which the request is being made. The
+    #   AMI object appears in the bucket only after the upload task has
+    #   completed.
+    #
+    # @option params [Array<Types::S3ObjectTag>] :s3_object_tags
+    #   The tags to apply to the AMI object that will be stored in the S3
+    #   bucket.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @return [Types::CreateStoreImageTaskResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::CreateStoreImageTaskResult#object_key #object_key} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.create_store_image_task({
+    #     image_id: "ImageId", # required
+    #     bucket: "String", # required
+    #     s3_object_tags: [
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       },
+    #     ],
+    #     dry_run: false,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.object_key #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateStoreImageTask AWS API Documentation
+    #
+    # @overload create_store_image_task(params = {})
+    # @param [Hash] params ({})
+    def create_store_image_task(params = {}, options = {})
+      req = build_request(:create_store_image_task, params)
+      req.send_request(options)
+    end
+
     # Creates a subnet in a specified VPC.
     #
     # You must specify an IPv4 CIDR block for the subnet. After you create a
@@ -24726,6 +24870,98 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Describes the progress of the AMI store tasks. You can describe the
+    # store tasks for specified AMIs. If you don't specify the AMIs, you
+    # get a paginated list of store tasks from the last 31 days.
+    #
+    # For each AMI task, the response indicates if the task is `InProgress`,
+    # `Completed`, or `Failed`. For tasks `InProgress`, the response shows
+    # the estimated progress as a percentage.
+    #
+    # Tasks are listed in reverse chronological order. Currently, only tasks
+    # from the past 31 days can be viewed.
+    #
+    # To use this API, you must have the required permissions. For more
+    # information, see [Permissions for storing and restoring AMIs using
+    # S3][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    # For more information, see [Store and restore an AMI using S3][2] in
+    # the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html
+    #
+    # @option params [Array<String>] :image_ids
+    #   The AMI IDs for which to show progress. Up to 20 AMI IDs can be
+    #   included in a request.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [Array<Types::Filter>] :filters
+    #   The filters.
+    #
+    #   * `task-state` - Returns tasks in a certain state (`InProgress` \|
+    #     `Completed` \| `Failed`)
+    #
+    #   * `bucket` - Returns task information for tasks that targeted a
+    #     specific bucket. For the filter value, specify the bucket name.
+    #
+    # @option params [String] :next_token
+    #   The token for the next page of results.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of results to return in a single call. To retrieve
+    #   the remaining results, make another call with the returned `NextToken`
+    #   value. This value can be between 1 and 200. You cannot specify this
+    #   parameter and the `ImageIDs` parameter in the same call.
+    #
+    # @return [Types::DescribeStoreImageTasksResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeStoreImageTasksResult#store_image_task_results #store_image_task_results} => Array&lt;Types::StoreImageTaskResult&gt;
+    #   * {Types::DescribeStoreImageTasksResult#next_token #next_token} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_store_image_tasks({
+    #     image_ids: ["ImageId"],
+    #     dry_run: false,
+    #     filters: [
+    #       {
+    #         name: "String",
+    #         values: ["String"],
+    #       },
+    #     ],
+    #     next_token: "String",
+    #     max_results: 1,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.store_image_task_results #=> Array
+    #   resp.store_image_task_results[0].ami_id #=> String
+    #   resp.store_image_task_results[0].task_start_time #=> Time
+    #   resp.store_image_task_results[0].bucket #=> String
+    #   resp.store_image_task_results[0].s3object_key #=> String
+    #   resp.store_image_task_results[0].progress_percentage #=> Integer
+    #   resp.store_image_task_results[0].store_task_state #=> String
+    #   resp.store_image_task_results[0].store_task_failure_reason #=> String
+    #   resp.next_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeStoreImageTasks AWS API Documentation
+    #
+    # @overload describe_store_image_tasks(params = {})
+    # @param [Hash] params ({})
+    def describe_store_image_tasks(params = {}, options = {})
+      req = build_request(:describe_store_image_tasks, params)
+      req.send_request(options)
+    end
+
     # Describes one or more of your subnets.
     #
     # For more information, see [Your VPC and Subnets][1] in the *Amazon
@@ -41206,12 +41442,12 @@ module Aws::EC2
 
     # Unassigns one or more IPv6 addresses from a network interface.
     #
-    # @option params [required, Array<String>] :ipv_6_addresses
-    #   The IPv6 addresses to unassign from the network interface.
-    #
     # @option params [required, String] :network_interface_id
     #   The ID of the network interface.
     #
+    # @option params [required, Array<String>] :ipv_6_addresses
+    #   The IPv6 addresses to unassign from the network interface.
+    #
     # @return [Types::UnassignIpv6AddressesResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::UnassignIpv6AddressesResult#network_interface_id #network_interface_id} => String
@@ -41220,8 +41456,8 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.unassign_ipv_6_addresses({
-    #     ipv_6_addresses: ["String"], # required
     #     network_interface_id: "NetworkInterfaceId", # required
+    #     ipv_6_addresses: ["String"], # required
     #   })
     #
     # @example Response structure
@@ -41609,7 +41845,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.232.0'
+      context[:gem_version] = '1.233.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -349,6 +349,8 @@ module Aws::EC2
     CreateReplaceRootVolumeTaskResult = Shapes::StructureShape.new(name: 'CreateReplaceRootVolumeTaskResult')
     CreateReservedInstancesListingRequest = Shapes::StructureShape.new(name: 'CreateReservedInstancesListingRequest')
     CreateReservedInstancesListingResult = Shapes::StructureShape.new(name: 'CreateReservedInstancesListingResult')
+    CreateRestoreImageTaskRequest = Shapes::StructureShape.new(name: 'CreateRestoreImageTaskRequest')
+    CreateRestoreImageTaskResult = Shapes::StructureShape.new(name: 'CreateRestoreImageTaskResult')
     CreateRouteRequest = Shapes::StructureShape.new(name: 'CreateRouteRequest')
     CreateRouteResult = Shapes::StructureShape.new(name: 'CreateRouteResult')
     CreateRouteTableRequest = Shapes::StructureShape.new(name: 'CreateRouteTableRequest')
@@ -360,6 +362,8 @@ module Aws::EC2
     CreateSnapshotsResult = Shapes::StructureShape.new(name: 'CreateSnapshotsResult')
     CreateSpotDatafeedSubscriptionRequest = Shapes::StructureShape.new(name: 'CreateSpotDatafeedSubscriptionRequest')
     CreateSpotDatafeedSubscriptionResult = Shapes::StructureShape.new(name: 'CreateSpotDatafeedSubscriptionResult')
+    CreateStoreImageTaskRequest = Shapes::StructureShape.new(name: 'CreateStoreImageTaskRequest')
+    CreateStoreImageTaskResult = Shapes::StructureShape.new(name: 'CreateStoreImageTaskResult')
     CreateSubnetRequest = Shapes::StructureShape.new(name: 'CreateSubnetRequest')
     CreateSubnetResult = Shapes::StructureShape.new(name: 'CreateSubnetResult')
     CreateTagsRequest = Shapes::StructureShape.new(name: 'CreateTagsRequest')
@@ -761,6 +765,9 @@ module Aws::EC2
     DescribeStaleSecurityGroupsNextToken = Shapes::StringShape.new(name: 'DescribeStaleSecurityGroupsNextToken')
     DescribeStaleSecurityGroupsRequest = Shapes::StructureShape.new(name: 'DescribeStaleSecurityGroupsRequest')
     DescribeStaleSecurityGroupsResult = Shapes::StructureShape.new(name: 'DescribeStaleSecurityGroupsResult')
+    DescribeStoreImageTasksRequest = Shapes::StructureShape.new(name: 'DescribeStoreImageTasksRequest')
+    DescribeStoreImageTasksRequestMaxResults = Shapes::IntegerShape.new(name: 'DescribeStoreImageTasksRequestMaxResults')
+    DescribeStoreImageTasksResult = Shapes::StructureShape.new(name: 'DescribeStoreImageTasksResult')
     DescribeSubnetsMaxResults = Shapes::IntegerShape.new(name: 'DescribeSubnetsMaxResults')
     DescribeSubnetsRequest = Shapes::StructureShape.new(name: 'DescribeSubnetsRequest')
     DescribeSubnetsResult = Shapes::StructureShape.new(name: 'DescribeSubnetsResult')
@@ -1151,6 +1158,7 @@ module Aws::EC2
     ImageDiskContainer = Shapes::StructureShape.new(name: 'ImageDiskContainer')
     ImageDiskContainerList = Shapes::ListShape.new(name: 'ImageDiskContainerList')
     ImageId = Shapes::StringShape.new(name: 'ImageId')
+    ImageIdList = Shapes::ListShape.new(name: 'ImageIdList')
     ImageIdStringList = Shapes::ListShape.new(name: 'ImageIdStringList')
     ImageList = Shapes::ListShape.new(name: 'ImageList')
     ImageState = Shapes::StringShape.new(name: 'ImageState')
@@ -1852,6 +1860,8 @@ module Aws::EC2
     RunInstancesRequest = Shapes::StructureShape.new(name: 'RunInstancesRequest')
     RunScheduledInstancesRequest = Shapes::StructureShape.new(name: 'RunScheduledInstancesRequest')
     RunScheduledInstancesResult = Shapes::StructureShape.new(name: 'RunScheduledInstancesResult')
+    S3ObjectTag = Shapes::StructureShape.new(name: 'S3ObjectTag')
+    S3ObjectTagList = Shapes::ListShape.new(name: 'S3ObjectTagList')
     S3Storage = Shapes::StructureShape.new(name: 'S3Storage')
     ScheduledInstance = Shapes::StructureShape.new(name: 'ScheduledInstance')
     ScheduledInstanceAvailability = Shapes::StructureShape.new(name: 'ScheduledInstanceAvailability')
@@ -1963,6 +1973,8 @@ module Aws::EC2
     StopInstancesResult = Shapes::StructureShape.new(name: 'StopInstancesResult')
     Storage = Shapes::StructureShape.new(name: 'Storage')
     StorageLocation = Shapes::StructureShape.new(name: 'StorageLocation')
+    StoreImageTaskResult = Shapes::StructureShape.new(name: 'StoreImageTaskResult')
+    StoreImageTaskResultSet = Shapes::ListShape.new(name: 'StoreImageTaskResultSet')
     String = Shapes::StringShape.new(name: 'String')
     StringList = Shapes::ListShape.new(name: 'StringList')
     Subnet = Shapes::StructureShape.new(name: 'Subnet')
@@ -3548,6 +3560,16 @@ module Aws::EC2
     CreateReservedInstancesListingResult.add_member(:reserved_instances_listings, Shapes::ShapeRef.new(shape: ReservedInstancesListingList, location_name: "reservedInstancesListingsSet"))
     CreateReservedInstancesListingResult.struct_class = Types::CreateReservedInstancesListingResult
 
+    CreateRestoreImageTaskRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Bucket"))
+    CreateRestoreImageTaskRequest.add_member(:object_key, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ObjectKey"))
+    CreateRestoreImageTaskRequest.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "Name"))
+    CreateRestoreImageTaskRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateRestoreImageTaskRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateRestoreImageTaskRequest.struct_class = Types::CreateRestoreImageTaskRequest
+
+    CreateRestoreImageTaskResult.add_member(:image_id, Shapes::ShapeRef.new(shape: String, location_name: "imageId"))
+    CreateRestoreImageTaskResult.struct_class = Types::CreateRestoreImageTaskResult
+
     CreateRouteRequest.add_member(:destination_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "destinationCidrBlock"))
     CreateRouteRequest.add_member(:destination_ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "destinationIpv6CidrBlock"))
     CreateRouteRequest.add_member(:destination_prefix_list_id, Shapes::ShapeRef.new(shape: PrefixListResourceId, location_name: "DestinationPrefixListId"))
@@ -3613,6 +3635,15 @@ module Aws::EC2
     CreateSpotDatafeedSubscriptionResult.add_member(:spot_datafeed_subscription, Shapes::ShapeRef.new(shape: SpotDatafeedSubscription, location_name: "spotDatafeedSubscription"))
     CreateSpotDatafeedSubscriptionResult.struct_class = Types::CreateSpotDatafeedSubscriptionResult
 
+    CreateStoreImageTaskRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    CreateStoreImageTaskRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Bucket"))
+    CreateStoreImageTaskRequest.add_member(:s3_object_tags, Shapes::ShapeRef.new(shape: S3ObjectTagList, location_name: "S3ObjectTag"))
+    CreateStoreImageTaskRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateStoreImageTaskRequest.struct_class = Types::CreateStoreImageTaskRequest
+
+    CreateStoreImageTaskResult.add_member(:object_key, Shapes::ShapeRef.new(shape: String, location_name: "objectKey"))
+    CreateStoreImageTaskResult.struct_class = Types::CreateStoreImageTaskResult
+
     CreateSubnetRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateSubnetRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZone"))
     CreateSubnetRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZoneId"))
@@ -5332,6 +5363,17 @@ module Aws::EC2
     DescribeStaleSecurityGroupsResult.add_member(:stale_security_group_set, Shapes::ShapeRef.new(shape: StaleSecurityGroupSet, location_name: "staleSecurityGroupSet"))
     DescribeStaleSecurityGroupsResult.struct_class = Types::DescribeStaleSecurityGroupsResult
 
+    DescribeStoreImageTasksRequest.add_member(:image_ids, Shapes::ShapeRef.new(shape: ImageIdList, location_name: "ImageId"))
+    DescribeStoreImageTasksRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeStoreImageTasksRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeStoreImageTasksRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeStoreImageTasksRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeStoreImageTasksRequestMaxResults, location_name: "MaxResults"))
+    DescribeStoreImageTasksRequest.struct_class = Types::DescribeStoreImageTasksRequest
+
+    DescribeStoreImageTasksResult.add_member(:store_image_task_results, Shapes::ShapeRef.new(shape: StoreImageTaskResultSet, location_name: "storeImageTaskResultSet"))
+    DescribeStoreImageTasksResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeStoreImageTasksResult.struct_class = Types::DescribeStoreImageTasksResult
+
     DescribeSubnetsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeSubnetsRequest.add_member(:subnet_ids, Shapes::ShapeRef.new(shape: SubnetIdStringList, location_name: "SubnetId"))
     DescribeSubnetsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -6820,6 +6862,8 @@ module Aws::EC2
 
     ImageDiskContainerList.member = Shapes::ShapeRef.new(shape: ImageDiskContainer, location_name: "item")
 
+    ImageIdList.member = Shapes::ShapeRef.new(shape: ImageId, location_name: "item")
+
     ImageIdStringList.member = Shapes::ShapeRef.new(shape: ImageId, location_name: "ImageId")
 
     ImageList.member = Shapes::ShapeRef.new(shape: Image, location_name: "item")
@@ -9544,6 +9588,12 @@ module Aws::EC2
     RunScheduledInstancesResult.add_member(:instance_id_set, Shapes::ShapeRef.new(shape: InstanceIdSet, location_name: "instanceIdSet"))
     RunScheduledInstancesResult.struct_class = Types::RunScheduledInstancesResult
 
+    S3ObjectTag.add_member(:key, Shapes::ShapeRef.new(shape: String, location_name: "Key"))
+    S3ObjectTag.add_member(:value, Shapes::ShapeRef.new(shape: String, location_name: "Value"))
+    S3ObjectTag.struct_class = Types::S3ObjectTag
+
+    S3ObjectTagList.member = Shapes::ShapeRef.new(shape: S3ObjectTag, location_name: "item")
+
     S3Storage.add_member(:aws_access_key_id, Shapes::ShapeRef.new(shape: String, location_name: "AWSAccessKeyId"))
     S3Storage.add_member(:bucket, Shapes::ShapeRef.new(shape: String, location_name: "bucket"))
     S3Storage.add_member(:prefix, Shapes::ShapeRef.new(shape: String, location_name: "prefix"))
@@ -10072,6 +10122,17 @@ module Aws::EC2
     StorageLocation.add_member(:key, Shapes::ShapeRef.new(shape: String, location_name: "Key"))
     StorageLocation.struct_class = Types::StorageLocation
 
+    StoreImageTaskResult.add_member(:ami_id, Shapes::ShapeRef.new(shape: String, location_name: "amiId"))
+    StoreImageTaskResult.add_member(:task_start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "taskStartTime"))
+    StoreImageTaskResult.add_member(:bucket, Shapes::ShapeRef.new(shape: String, location_name: "bucket"))
+    StoreImageTaskResult.add_member(:s3object_key, Shapes::ShapeRef.new(shape: String, location_name: "s3objectKey"))
+    StoreImageTaskResult.add_member(:progress_percentage, Shapes::ShapeRef.new(shape: Integer, location_name: "progressPercentage"))
+    StoreImageTaskResult.add_member(:store_task_state, Shapes::ShapeRef.new(shape: String, location_name: "storeTaskState"))
+    StoreImageTaskResult.add_member(:store_task_failure_reason, Shapes::ShapeRef.new(shape: String, location_name: "storeTaskFailureReason"))
+    StoreImageTaskResult.struct_class = Types::StoreImageTaskResult
+
+    StoreImageTaskResultSet.member = Shapes::ShapeRef.new(shape: StoreImageTaskResult, location_name: "item")
+
     StringList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
     Subnet.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
@@ -10597,8 +10658,8 @@ module Aws::EC2
 
     TunnelOptionsList.member = Shapes::ShapeRef.new(shape: TunnelOption, location_name: "item")
 
-    UnassignIpv6AddressesRequest.add_member(:ipv_6_addresses, Shapes::ShapeRef.new(shape: Ipv6AddressList, required: true, location_name: "ipv6Addresses"))
     UnassignIpv6AddressesRequest.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, required: true, location_name: "networkInterfaceId"))
+    UnassignIpv6AddressesRequest.add_member(:ipv_6_addresses, Shapes::ShapeRef.new(shape: Ipv6AddressList, required: true, location_name: "ipv6Addresses"))
     UnassignIpv6AddressesRequest.struct_class = Types::UnassignIpv6AddressesRequest
 
     UnassignIpv6AddressesResult.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: String, location_name: "networkInterfaceId"))
@@ -11633,6 +11694,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateReservedInstancesListingResult)
       end)
 
+      api.add_operation(:create_restore_image_task, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateRestoreImageTask"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateRestoreImageTaskRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateRestoreImageTaskResult)
+      end)
+
       api.add_operation(:create_route, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateRoute"
         o.http_method = "POST"
@@ -11681,6 +11750,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateSpotDatafeedSubscriptionResult)
       end)
 
+      api.add_operation(:create_store_image_task, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateStoreImageTask"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateStoreImageTaskRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateStoreImageTaskResult)
+      end)
+
       api.add_operation(:create_subnet, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateSubnet"
         o.http_method = "POST"
@@ -13444,6 +13521,14 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:describe_store_image_tasks, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeStoreImageTasks"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeStoreImageTasksRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeStoreImageTasksResult)
+      end)
+
       api.add_operation(:describe_subnets, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeSubnets"
         o.http_method = "POST"

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

@@ -8569,6 +8569,83 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass CreateRestoreImageTaskRequest
+    #   data as a hash:
+    #
+    #       {
+    #         bucket: "String", # required
+    #         object_key: "String", # required
+    #         name: "String",
+    #         tag_specifications: [
+    #           {
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, internet-gateway, key-pair, launch-template, local-gateway-route-table-vpc-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-connect-peer, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log
+    #             tags: [
+    #               {
+    #                 key: "String",
+    #                 value: "String",
+    #               },
+    #             ],
+    #           },
+    #         ],
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] bucket
+    #   The name of the S3 bucket that contains the stored AMI object.
+    #   @return [String]
+    #
+    # @!attribute [rw] object_key
+    #   The name of the stored AMI object in the bucket.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   The name for the restored AMI. The name must be unique for AMIs in
+    #   the Region for this account. If you do not provide a name, the new
+    #   AMI gets the same name as the original AMI.
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_specifications
+    #   The tags to apply to the AMI and snapshots on restoration. You can
+    #   tag the AMI, the snapshots, or both.
+    #
+    #   * To tag the AMI, the value for `ResourceType` must be `image`.
+    #
+    #   * To tag the snapshots, the value for `ResourceType` must be
+    #     `snapshot`. The same tag is applied to all of the snapshots that
+    #     are created.
+    #   @return [Array<Types::TagSpecification>]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateRestoreImageTaskRequest AWS API Documentation
+    #
+    class CreateRestoreImageTaskRequest < Struct.new(
+      :bucket,
+      :object_key,
+      :name,
+      :tag_specifications,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] image_id
+    #   The AMI ID.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateRestoreImageTaskResult AWS API Documentation
+    #
+    class CreateRestoreImageTaskResult < Struct.new(
+      :image_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateRouteRequest
     #   data as a hash:
     #
@@ -9076,6 +9153,67 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass CreateStoreImageTaskRequest
+    #   data as a hash:
+    #
+    #       {
+    #         image_id: "ImageId", # required
+    #         bucket: "String", # required
+    #         s3_object_tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] image_id
+    #   The ID of the AMI.
+    #   @return [String]
+    #
+    # @!attribute [rw] bucket
+    #   The name of the S3 bucket in which the AMI object will be stored.
+    #   The bucket must be in the Region in which the request is being made.
+    #   The AMI object appears in the bucket only after the upload task has
+    #   completed.
+    #   @return [String]
+    #
+    # @!attribute [rw] s3_object_tags
+    #   The tags to apply to the AMI object that will be stored in the S3
+    #   bucket.
+    #   @return [Array<Types::S3ObjectTag>]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateStoreImageTaskRequest AWS API Documentation
+    #
+    class CreateStoreImageTaskRequest < Struct.new(
+      :image_id,
+      :bucket,
+      :s3_object_tags,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] object_key
+    #   The name of the stored AMI object in the S3 bucket.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateStoreImageTaskResult AWS API Documentation
+    #
+    class CreateStoreImageTaskResult < Struct.new(
+      :object_key)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateSubnetRequest
     #   data as a hash:
     #
@@ -22417,6 +22555,86 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeStoreImageTasksRequest
+    #   data as a hash:
+    #
+    #       {
+    #         image_ids: ["ImageId"],
+    #         dry_run: false,
+    #         filters: [
+    #           {
+    #             name: "String",
+    #             values: ["String"],
+    #           },
+    #         ],
+    #         next_token: "String",
+    #         max_results: 1,
+    #       }
+    #
+    # @!attribute [rw] image_ids
+    #   The AMI IDs for which to show progress. Up to 20 AMI IDs can be
+    #   included in a request.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] filters
+    #   The filters.
+    #
+    #   * `task-state` - Returns tasks in a certain state (`InProgress` \|
+    #     `Completed` \| `Failed`)
+    #
+    #   * `bucket` - Returns task information for tasks that targeted a
+    #     specific bucket. For the filter value, specify the bucket name.
+    #   @return [Array<Types::Filter>]
+    #
+    # @!attribute [rw] next_token
+    #   The token for the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return in a single call. To
+    #   retrieve the remaining results, make another call with the returned
+    #   `NextToken` value. This value can be between 1 and 200. You cannot
+    #   specify this parameter and the `ImageIDs` parameter in the same
+    #   call.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeStoreImageTasksRequest AWS API Documentation
+    #
+    class DescribeStoreImageTasksRequest < Struct.new(
+      :image_ids,
+      :dry_run,
+      :filters,
+      :next_token,
+      :max_results)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] store_image_task_results
+    #   The information about the AMI store tasks.
+    #   @return [Array<Types::StoreImageTaskResult>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeStoreImageTasksResult AWS API Documentation
+    #
+    class DescribeStoreImageTasksResult < Struct.new(
+      :store_image_task_results,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DescribeSubnetsRequest
     #   data as a hash:
     #
@@ -48256,6 +48474,45 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The tags to apply to the AMI object that will be stored in the S3
+    # bucket. For more information, see [Categorizing your storage using
+    # tags][1] in the *Amazon Simple Storage Service User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-tagging.html
+    #
+    # @note When making an API call, you may pass S3ObjectTag
+    #   data as a hash:
+    #
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       }
+    #
+    # @!attribute [rw] key
+    #   The key of the tag.
+    #
+    #   Constraints: Tag keys are case-sensitive and can be up to 128
+    #   Unicode characters in length. May not begin with `aws`\:.
+    #   @return [String]
+    #
+    # @!attribute [rw] value
+    #   The value of the tag.
+    #
+    #   Constraints: Tag values are case-sensitive and can be up to 256
+    #   Unicode characters in length.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/S3ObjectTag AWS API Documentation
+    #
+    class S3ObjectTag < Struct.new(
+      :key,
+      :value)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes the storage parameters for S3 and S3 buckets for an instance
     # store-backed AMI.
     #
@@ -51861,6 +52118,53 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The information about the AMI store task, including the progress of
+    # the task.
+    #
+    # @!attribute [rw] ami_id
+    #   The ID of the AMI that is being stored.
+    #   @return [String]
+    #
+    # @!attribute [rw] task_start_time
+    #   The time the task started.
+    #   @return [Time]
+    #
+    # @!attribute [rw] bucket
+    #   The name of the S3 bucket that contains the stored AMI object.
+    #   @return [String]
+    #
+    # @!attribute [rw] s3object_key
+    #   The name of the stored AMI object in the bucket.
+    #   @return [String]
+    #
+    # @!attribute [rw] progress_percentage
+    #   The progress of the task as a percentage.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] store_task_state
+    #   The state of the store task (`InProgress`, `Completed`, or
+    #   `Failed`).
+    #   @return [String]
+    #
+    # @!attribute [rw] store_task_failure_reason
+    #   If the tasks fails, the reason for the failure is returned. If the
+    #   task succeeds, `null` is returned.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/StoreImageTaskResult AWS API Documentation
+    #
+    class StoreImageTaskResult < Struct.new(
+      :ami_id,
+      :task_start_time,
+      :bucket,
+      :s3object_key,
+      :progress_percentage,
+      :store_task_state,
+      :store_task_failure_reason)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes a subnet.
     #
     # @!attribute [rw] availability_zone
@@ -54184,23 +54488,23 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         ipv_6_addresses: ["String"], # required
     #         network_interface_id: "NetworkInterfaceId", # required
+    #         ipv_6_addresses: ["String"], # required
     #       }
     #
-    # @!attribute [rw] ipv_6_addresses
-    #   The IPv6 addresses to unassign from the network interface.
-    #   @return [Array<String>]
-    #
     # @!attribute [rw] network_interface_id
     #   The ID of the network interface.
     #   @return [String]
     #
+    # @!attribute [rw] ipv_6_addresses
+    #   The IPv6 addresses to unassign from the network interface.
+    #   @return [Array<String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/UnassignIpv6AddressesRequest AWS API Documentation
     #
     class UnassignIpv6AddressesRequest < Struct.new(
-      :ipv_6_addresses,
-      :network_interface_id)
+      :network_interface_id,
+      :ipv_6_addresses)
       SENSITIVE = []
       include Aws::Structure
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.232.0
+  version: 1.233.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4