aws-sdk-ec2 1.118.0 → 1.119.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a28162fa8a14e2263a8026d59a1dffbb40f35c2d
-  data.tar.gz: b06662263e1c83b1f49d2aee15b94577137043bb
+  metadata.gz: e28259b3ceadf907e1b4ee7f63dc7fdeb63d682c
+  data.tar.gz: 726e4ebc7c7a4942111c3337ce6966ad2247f2e0
 SHA512:
-  metadata.gz: 18f0e436e70c33b9754d4cf836730136907f7b9cbb2ebb42be25d262d8558efe4d444384eedc4ef6116bd96f98e5b4a51981a60de6b51e116f1f79311ebbd70c
-  data.tar.gz: b486d8acfda341d87ea0e4009c825250b7821dcc3181381e94ec434e1b61e384da16b681e32f382192f090713ac41df3c6c05e2e3e9f70f0052121f71b5ab2da
+  metadata.gz: 885ca9929ff681a790fcc0217787584507150ff8c27b85d518364902d618c9f72b3d6cfabb19c70ed7be0010e1137ca314ce7ab0a2dc36fbcdea39ae046ab969
+  data.tar.gz: 93ab98661a66d289a7986cefaf6e4640c163739c84bef546f66cea9be6584494c5528d5d0529912f355f756513c00ac1be37b1907aa50f26a0eee008e7952f36

data/lib/aws-sdk-ec2.rb

@@ -66,6 +66,6 @@ require_relative 'aws-sdk-ec2/customizations'
 # @service
 module Aws::EC2
 
-  GEM_VERSION = '1.118.0'
+  GEM_VERSION = '1.119.0'
 
 end

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

@@ -640,8 +640,8 @@ module Aws::EC2
     end
 
     # Allocates a Dedicated Host to your account. At a minimum, specify the
-    # instance size type, Availability Zone, and quantity of hosts to
-    # allocate.
+    # supported instance type or instance family, the Availability Zone in
+    # which to allocate the host, and the number of hosts to allocate.
     #
     # @option params [String] :auto_placement
     #   Indicates whether the host accepts any untargeted instance launches
@@ -668,10 +668,25 @@ module Aws::EC2
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
     #
-    # @option params [required, String] :instance_type
-    #   Specifies the instance type for which to configure your Dedicated
-    #   Hosts. When you specify the instance type, that is the only instance
-    #   type that you can launch onto that host.
+    # @option params [String] :instance_type
+    #   Specifies the instance type to be supported by the Dedicated Hosts. If
+    #   you specify an instance type, the Dedicated Hosts support instances of
+    #   the specified instance type only.
+    #
+    #   If you want the Dedicated Hosts to support multiple instance types in
+    #   a specific instance family, omit this parameter and specify
+    #   **InstanceFamily** instead. You cannot specify **InstanceType** and
+    #   **InstanceFamily** in the same request.
+    #
+    # @option params [String] :instance_family
+    #   Specifies the instance family to be supported by the Dedicated Hosts.
+    #   If you specify an instance family, the Dedicated Hosts support
+    #   multiple instance types within that instance family.
+    #
+    #   If you want the Dedicated Hosts to support a specific instance type
+    #   only, omit this parameter and specify **InstanceType** instead. You
+    #   cannot specify **InstanceFamily** and **InstanceType** in the same
+    #   request.
     #
     # @option params [required, Integer] :quantity
     #   The number of Dedicated Hosts to allocate to your account with these
@@ -701,7 +716,8 @@ module Aws::EC2
     #     auto_placement: "on", # accepts on, off
     #     availability_zone: "String", # required
     #     client_token: "String",
-    #     instance_type: "String", # required
+    #     instance_type: "String",
+    #     instance_family: "String",
     #     quantity: 1, # required
     #     tag_specifications: [
     #       {
@@ -2996,7 +3012,7 @@ module Aws::EC2
     #     client_token: "String",
     #     description: "String",
     #     encrypted: false,
-    #     kms_key_id: "KmsKeyId",
+    #     kms_key_id: "String",
     #     name: "String", # required
     #     source_image_id: "String", # required
     #     source_region: "String", # required
@@ -4642,7 +4658,7 @@ module Aws::EC2
     #     ],
     #     description: "String",
     #     dry_run: false,
-    #     instance_id: "InstanceId", # required
+    #     instance_id: "String", # required
     #     name: "String", # required
     #     no_reboot: false,
     #   })
@@ -10788,7 +10804,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.deregister_image({
-    #     image_id: "ImageId", # required
+    #     image_id: "String", # required
     #     dry_run: false,
     #   })
     #
@@ -13134,11 +13150,11 @@ module Aws::EC2
     # Describes the Dedicated Host reservations that are available to
     # purchase.
     #
-    # The results describe all the Dedicated Host reservation offerings,
-    # including offerings that may not match the instance family and Region
-    # of your Dedicated Hosts. When purchasing an offering, ensure that the
-    # instance family and Region of the offering matches that of the
-    # Dedicated Hosts with which it is to be associated. For more
+    # The results describe all of the Dedicated Host reservation offerings,
+    # including offerings that might not match the instance family and
+    # Region of your Dedicated Hosts. When purchasing an offering, ensure
+    # that the instance family and Region of the offering matches that of
+    # the Dedicated Hosts with which it is to be associated. For more
     # information about supported instance types, see [Dedicated Hosts
     # Overview][1] in the *Amazon Elastic Compute Cloud User Guide*.
     #
@@ -13393,12 +13409,14 @@ module Aws::EC2
     #   resp.hosts[0].host_id #=> String
     #   resp.hosts[0].host_properties.cores #=> Integer
     #   resp.hosts[0].host_properties.instance_type #=> String
+    #   resp.hosts[0].host_properties.instance_family #=> String
     #   resp.hosts[0].host_properties.sockets #=> Integer
     #   resp.hosts[0].host_properties.total_v_cpus #=> Integer
     #   resp.hosts[0].host_reservation_id #=> String
     #   resp.hosts[0].instances #=> Array
     #   resp.hosts[0].instances[0].instance_id #=> String
     #   resp.hosts[0].instances[0].instance_type #=> String
+    #   resp.hosts[0].instances[0].owner_id #=> String
     #   resp.hosts[0].state #=> String, one of "available", "under-assessment", "permanent-failure", "released", "released-permanent-failure", "pending"
     #   resp.hosts[0].allocation_time #=> Time
     #   resp.hosts[0].release_time #=> Time
@@ -13406,6 +13424,9 @@ module Aws::EC2
     #   resp.hosts[0].tags[0].key #=> String
     #   resp.hosts[0].tags[0].value #=> String
     #   resp.hosts[0].host_recovery #=> String, one of "on", "off"
+    #   resp.hosts[0].allows_multiple_instance_types #=> String, one of "on", "off"
+    #   resp.hosts[0].owner_id #=> String
+    #   resp.hosts[0].availability_zone_id #=> String
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeHosts AWS API Documentation
@@ -14040,6 +14061,8 @@ module Aws::EC2
     #   resp.import_image_tasks[0].snapshot_details[0].user_bucket.s3_key #=> String
     #   resp.import_image_tasks[0].status #=> String
     #   resp.import_image_tasks[0].status_message #=> String
+    #   resp.import_image_tasks[0].license_specifications #=> Array
+    #   resp.import_image_tasks[0].license_specifications[0].license_configuration_arn #=> String
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImportImageTasks AWS API Documentation
@@ -24797,6 +24820,9 @@ module Aws::EC2
     #   The name of the role to use when not using the default role,
     #   'vmimport'.
     #
+    # @option params [Array<Types::ImportImageLicenseConfigurationRequest>] :license_specifications
+    #   The ARNs of the license configurations.
+    #
     # @return [Types::ImportImageResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::ImportImageResult#architecture #architecture} => String
@@ -24812,6 +24838,7 @@ module Aws::EC2
     #   * {Types::ImportImageResult#snapshot_details #snapshot_details} => Array&lt;Types::SnapshotDetail&gt;
     #   * {Types::ImportImageResult#status #status} => String
     #   * {Types::ImportImageResult#status_message #status_message} => String
+    #   * {Types::ImportImageResult#license_specifications #license_specifications} => Array&lt;Types::ImportImageLicenseConfigurationResponse&gt;
     #
     # @example Request syntax with placeholder values
     #
@@ -24841,10 +24868,15 @@ module Aws::EC2
     #     dry_run: false,
     #     encrypted: false,
     #     hypervisor: "String",
-    #     kms_key_id: "KmsKeyId",
+    #     kms_key_id: "String",
     #     license_type: "String",
     #     platform: "String",
     #     role_name: "String",
+    #     license_specifications: [
+    #       {
+    #         license_configuration_arn: "String",
+    #       },
+    #     ],
     #   })
     #
     # @example Response structure
@@ -24873,6 +24905,8 @@ module Aws::EC2
     #   resp.snapshot_details[0].user_bucket.s3_key #=> String
     #   resp.status #=> String
     #   resp.status_message #=> String
+    #   resp.license_specifications #=> Array
+    #   resp.license_specifications[0].license_configuration_arn #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImage AWS API Documentation
     #
@@ -25695,6 +25729,10 @@ module Aws::EC2
     # provided, the instance is launched onto a suitable host with
     # auto-placement enabled.
     #
+    # You can also use this API action to modify a Dedicated Host to support
+    # either multiple instance types in an instance family, or to support a
+    # specific instance type only.
+    #
     # @option params [String] :auto_placement
     #   Specify whether to enable or disable auto-placement.
     #
@@ -25710,6 +25748,26 @@ module Aws::EC2
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-recovery.html
     #
+    # @option params [String] :instance_type
+    #   Specifies the instance type to be supported by the Dedicated Host.
+    #   Specify this parameter to modify a Dedicated Host to support only a
+    #   specific instance type.
+    #
+    #   If you want to modify a Dedicated Host to support multiple instance
+    #   types in its current instance family, omit this parameter and specify
+    #   **InstanceFamily** instead. You cannot specify **InstanceType** and
+    #   **InstanceFamily** in the same request.
+    #
+    # @option params [String] :instance_family
+    #   Specifies the instance family to be supported by the Dedicated Host.
+    #   Specify this parameter to modify a Dedicated Host to support multiple
+    #   instance types within its current instance family.
+    #
+    #   If you want to modify a Dedicated Host to support a specific instance
+    #   type only, omit this parameter and specify **InstanceType** instead.
+    #   You cannot specify **InstanceFamily** and **InstanceType** in the same
+    #   request.
+    #
     # @return [Types::ModifyHostsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::ModifyHostsResult#successful #successful} => Array&lt;String&gt;
@@ -25721,6 +25779,8 @@ module Aws::EC2
     #     auto_placement: "on", # accepts on, off
     #     host_ids: ["String"], # required
     #     host_recovery: "on", # accepts on, off
+    #     instance_type: "String",
+    #     instance_family: "String",
     #   })
     #
     # @example Response structure
@@ -25986,7 +26046,7 @@ module Aws::EC2
     #   resp = client.modify_image_attribute({
     #     attribute: "String",
     #     description: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
-    #     image_id: "ImageId", # required
+    #     image_id: "String", # required
     #     launch_permission: {
     #       add: [
     #         {
@@ -29112,10 +29172,10 @@ module Aws::EC2
     #     description: "String",
     #     dry_run: false,
     #     ena_support: false,
-    #     kernel_id: "KernelId",
+    #     kernel_id: "String",
     #     name: "String", # required
     #     billing_products: ["String"],
-    #     ramdisk_id: "RamdiskId",
+    #     ramdisk_id: "String",
     #     root_device_name: "String",
     #     sriov_net_support: "String",
     #     virtualization_type: "String",
@@ -30700,7 +30760,7 @@ module Aws::EC2
     #
     #   resp = client.reset_image_attribute({
     #     attribute: "launchPermission", # required, accepts launchPermission
-    #     image_id: "ImageId", # required
+    #     image_id: "String", # required
     #     dry_run: false,
     #   })
     #
@@ -33073,7 +33133,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.118.0'
+      context[:gem_version] = '1.119.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -43,6 +43,7 @@ module Aws::EC2
     AllocationStrategy = Shapes::StringShape.new(name: 'AllocationStrategy')
     AllowedPrincipal = Shapes::StructureShape.new(name: 'AllowedPrincipal')
     AllowedPrincipalSet = Shapes::ListShape.new(name: 'AllowedPrincipalSet')
+    AllowsMultipleInstanceTypes = Shapes::StringShape.new(name: 'AllowsMultipleInstanceTypes')
     ApplySecurityGroupsToClientVpnTargetNetworkRequest = Shapes::StructureShape.new(name: 'ApplySecurityGroupsToClientVpnTargetNetworkRequest')
     ApplySecurityGroupsToClientVpnTargetNetworkResult = Shapes::StructureShape.new(name: 'ApplySecurityGroupsToClientVpnTargetNetworkResult')
     ArchitectureValues = Shapes::StringShape.new(name: 'ArchitectureValues')
@@ -890,6 +891,10 @@ module Aws::EC2
     ImageTypeValues = Shapes::StringShape.new(name: 'ImageTypeValues')
     ImportClientVpnClientCertificateRevocationListRequest = Shapes::StructureShape.new(name: 'ImportClientVpnClientCertificateRevocationListRequest')
     ImportClientVpnClientCertificateRevocationListResult = Shapes::StructureShape.new(name: 'ImportClientVpnClientCertificateRevocationListResult')
+    ImportImageLicenseConfigurationRequest = Shapes::StructureShape.new(name: 'ImportImageLicenseConfigurationRequest')
+    ImportImageLicenseConfigurationResponse = Shapes::StructureShape.new(name: 'ImportImageLicenseConfigurationResponse')
+    ImportImageLicenseSpecificationListRequest = Shapes::ListShape.new(name: 'ImportImageLicenseSpecificationListRequest')
+    ImportImageLicenseSpecificationListResponse = Shapes::ListShape.new(name: 'ImportImageLicenseSpecificationListResponse')
     ImportImageRequest = Shapes::StructureShape.new(name: 'ImportImageRequest')
     ImportImageResult = Shapes::StructureShape.new(name: 'ImportImageResult')
     ImportImageTask = Shapes::StructureShape.new(name: 'ImportImageTask')
@@ -991,7 +996,6 @@ module Aws::EC2
     Ipv6Range = Shapes::StructureShape.new(name: 'Ipv6Range')
     Ipv6RangeList = Shapes::ListShape.new(name: 'Ipv6RangeList')
     Ipv6SupportValue = Shapes::StringShape.new(name: 'Ipv6SupportValue')
-    KernelId = Shapes::StringShape.new(name: 'KernelId')
     KeyNameStringList = Shapes::ListShape.new(name: 'KeyNameStringList')
     KeyPair = Shapes::StructureShape.new(name: 'KeyPair')
     KeyPairInfo = Shapes::StructureShape.new(name: 'KeyPairInfo')
@@ -1279,7 +1283,6 @@ module Aws::EC2
     PurchaseSet = Shapes::ListShape.new(name: 'PurchaseSet')
     PurchasedScheduledInstanceSet = Shapes::ListShape.new(name: 'PurchasedScheduledInstanceSet')
     RIProductDescription = Shapes::StringShape.new(name: 'RIProductDescription')
-    RamdiskId = Shapes::StringShape.new(name: 'RamdiskId')
     ReasonCodesList = Shapes::ListShape.new(name: 'ReasonCodesList')
     RebootInstancesRequest = Shapes::StructureShape.new(name: 'RebootInstancesRequest')
     RecurringCharge = Shapes::StructureShape.new(name: 'RecurringCharge')
@@ -1791,7 +1794,8 @@ module Aws::EC2
     AllocateHostsRequest.add_member(:auto_placement, Shapes::ShapeRef.new(shape: AutoPlacement, location_name: "autoPlacement"))
     AllocateHostsRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, required: true, location_name: "availabilityZone"))
     AllocateHostsRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
-    AllocateHostsRequest.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, required: true, location_name: "instanceType"))
+    AllocateHostsRequest.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
+    AllocateHostsRequest.add_member(:instance_family, Shapes::ShapeRef.new(shape: String, location_name: "InstanceFamily"))
     AllocateHostsRequest.add_member(:quantity, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "quantity"))
     AllocateHostsRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     AllocateHostsRequest.add_member(:host_recovery, Shapes::ShapeRef.new(shape: HostRecovery, location_name: "HostRecovery"))
@@ -2375,7 +2379,7 @@ module Aws::EC2
     CopyImageRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
     CopyImageRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
     CopyImageRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
-    CopyImageRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, location_name: "kmsKeyId"))
+    CopyImageRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "kmsKeyId"))
     CopyImageRequest.add_member(:name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Name"))
     CopyImageRequest.add_member(:source_image_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "SourceImageId"))
     CopyImageRequest.add_member(:source_region, Shapes::ShapeRef.new(shape: String, required: true, location_name: "SourceRegion"))
@@ -2566,7 +2570,7 @@ module Aws::EC2
     CreateImageRequest.add_member(:block_device_mappings, Shapes::ShapeRef.new(shape: BlockDeviceMappingRequestList, location_name: "blockDeviceMapping"))
     CreateImageRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
     CreateImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
-    CreateImageRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "instanceId"))
+    CreateImageRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "instanceId"))
     CreateImageRequest.add_member(:name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "name"))
     CreateImageRequest.add_member(:no_reboot, Shapes::ShapeRef.new(shape: Boolean, location_name: "noReboot"))
     CreateImageRequest.struct_class = Types::CreateImageRequest
@@ -3277,7 +3281,7 @@ module Aws::EC2
     DeprovisionByoipCidrResult.add_member(:byoip_cidr, Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "byoipCidr"))
     DeprovisionByoipCidrResult.struct_class = Types::DeprovisionByoipCidrResult
 
-    DeregisterImageRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    DeregisterImageRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ImageId"))
     DeregisterImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeregisterImageRequest.struct_class = Types::DeregisterImageRequest
 
@@ -5102,10 +5106,14 @@ module Aws::EC2
     Host.add_member(:release_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "releaseTime"))
     Host.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     Host.add_member(:host_recovery, Shapes::ShapeRef.new(shape: HostRecovery, location_name: "hostRecovery"))
+    Host.add_member(:allows_multiple_instance_types, Shapes::ShapeRef.new(shape: AllowsMultipleInstanceTypes, location_name: "allowsMultipleInstanceTypes"))
+    Host.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    Host.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     Host.struct_class = Types::Host
 
     HostInstance.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
     HostInstance.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
+    HostInstance.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
     HostInstance.struct_class = Types::HostInstance
 
     HostInstanceList.member = Shapes::ShapeRef.new(shape: HostInstance, location_name: "item")
@@ -5125,6 +5133,7 @@ module Aws::EC2
 
     HostProperties.add_member(:cores, Shapes::ShapeRef.new(shape: Integer, location_name: "cores"))
     HostProperties.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
+    HostProperties.add_member(:instance_family, Shapes::ShapeRef.new(shape: String, location_name: "instanceFamily"))
     HostProperties.add_member(:sockets, Shapes::ShapeRef.new(shape: Integer, location_name: "sockets"))
     HostProperties.add_member(:total_v_cpus, Shapes::ShapeRef.new(shape: Integer, location_name: "totalVCpus"))
     HostProperties.struct_class = Types::HostProperties
@@ -5245,6 +5254,16 @@ module Aws::EC2
     ImportClientVpnClientCertificateRevocationListResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     ImportClientVpnClientCertificateRevocationListResult.struct_class = Types::ImportClientVpnClientCertificateRevocationListResult
 
+    ImportImageLicenseConfigurationRequest.add_member(:license_configuration_arn, Shapes::ShapeRef.new(shape: String, location_name: "LicenseConfigurationArn"))
+    ImportImageLicenseConfigurationRequest.struct_class = Types::ImportImageLicenseConfigurationRequest
+
+    ImportImageLicenseConfigurationResponse.add_member(:license_configuration_arn, Shapes::ShapeRef.new(shape: String, location_name: "licenseConfigurationArn"))
+    ImportImageLicenseConfigurationResponse.struct_class = Types::ImportImageLicenseConfigurationResponse
+
+    ImportImageLicenseSpecificationListRequest.member = Shapes::ShapeRef.new(shape: ImportImageLicenseConfigurationRequest, location_name: "item")
+
+    ImportImageLicenseSpecificationListResponse.member = Shapes::ShapeRef.new(shape: ImportImageLicenseConfigurationResponse, location_name: "item")
+
     ImportImageRequest.add_member(:architecture, Shapes::ShapeRef.new(shape: String, location_name: "Architecture"))
     ImportImageRequest.add_member(:client_data, Shapes::ShapeRef.new(shape: ClientData, location_name: "ClientData"))
     ImportImageRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
@@ -5253,10 +5272,11 @@ module Aws::EC2
     ImportImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ImportImageRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "Encrypted"))
     ImportImageRequest.add_member(:hypervisor, Shapes::ShapeRef.new(shape: String, location_name: "Hypervisor"))
-    ImportImageRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, location_name: "KmsKeyId"))
+    ImportImageRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "KmsKeyId"))
     ImportImageRequest.add_member(:license_type, Shapes::ShapeRef.new(shape: String, location_name: "LicenseType"))
     ImportImageRequest.add_member(:platform, Shapes::ShapeRef.new(shape: String, location_name: "Platform"))
     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.struct_class = Types::ImportImageRequest
 
     ImportImageResult.add_member(:architecture, Shapes::ShapeRef.new(shape: String, location_name: "architecture"))
@@ -5272,6 +5292,7 @@ module Aws::EC2
     ImportImageResult.add_member(:snapshot_details, Shapes::ShapeRef.new(shape: SnapshotDetailList, location_name: "snapshotDetailSet"))
     ImportImageResult.add_member(:status, Shapes::ShapeRef.new(shape: String, location_name: "status"))
     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.struct_class = Types::ImportImageResult
 
     ImportImageTask.add_member(:architecture, Shapes::ShapeRef.new(shape: String, location_name: "architecture"))
@@ -5287,6 +5308,7 @@ module Aws::EC2
     ImportImageTask.add_member(:snapshot_details, Shapes::ShapeRef.new(shape: SnapshotDetailList, location_name: "snapshotDetailSet"))
     ImportImageTask.add_member(:status, Shapes::ShapeRef.new(shape: String, location_name: "status"))
     ImportImageTask.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
+    ImportImageTask.add_member(:license_specifications, Shapes::ShapeRef.new(shape: ImportImageLicenseSpecificationListResponse, location_name: "licenseSpecifications"))
     ImportImageTask.struct_class = Types::ImportImageTask
 
     ImportImageTaskList.member = Shapes::ShapeRef.new(shape: ImportImageTask, location_name: "item")
@@ -6035,6 +6057,8 @@ module Aws::EC2
     ModifyHostsRequest.add_member(:auto_placement, Shapes::ShapeRef.new(shape: AutoPlacement, location_name: "autoPlacement"))
     ModifyHostsRequest.add_member(:host_ids, Shapes::ShapeRef.new(shape: RequestHostIdList, required: true, location_name: "hostId"))
     ModifyHostsRequest.add_member(:host_recovery, Shapes::ShapeRef.new(shape: HostRecovery, location_name: "HostRecovery"))
+    ModifyHostsRequest.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "InstanceType"))
+    ModifyHostsRequest.add_member(:instance_family, Shapes::ShapeRef.new(shape: String, location_name: "InstanceFamily"))
     ModifyHostsRequest.struct_class = Types::ModifyHostsRequest
 
     ModifyHostsResult.add_member(:successful, Shapes::ShapeRef.new(shape: ResponseHostIdList, location_name: "successful"))
@@ -6052,7 +6076,7 @@ module Aws::EC2
 
     ModifyImageAttributeRequest.add_member(:attribute, Shapes::ShapeRef.new(shape: String, location_name: "Attribute"))
     ModifyImageAttributeRequest.add_member(:description, Shapes::ShapeRef.new(shape: AttributeValue, location_name: "Description"))
-    ModifyImageAttributeRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    ModifyImageAttributeRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ImageId"))
     ModifyImageAttributeRequest.add_member(:launch_permission, Shapes::ShapeRef.new(shape: LaunchPermissionModifications, location_name: "LaunchPermission"))
     ModifyImageAttributeRequest.add_member(:operation_type, Shapes::ShapeRef.new(shape: OperationType, location_name: "OperationType"))
     ModifyImageAttributeRequest.add_member(:product_codes, Shapes::ShapeRef.new(shape: ProductCodeStringList, location_name: "ProductCode"))
@@ -6818,10 +6842,10 @@ module Aws::EC2
     RegisterImageRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
     RegisterImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     RegisterImageRequest.add_member(:ena_support, Shapes::ShapeRef.new(shape: Boolean, location_name: "enaSupport"))
-    RegisterImageRequest.add_member(:kernel_id, Shapes::ShapeRef.new(shape: KernelId, location_name: "kernelId"))
+    RegisterImageRequest.add_member(:kernel_id, Shapes::ShapeRef.new(shape: String, location_name: "kernelId"))
     RegisterImageRequest.add_member(:name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "name"))
     RegisterImageRequest.add_member(:billing_products, Shapes::ShapeRef.new(shape: BillingProductList, location_name: "BillingProduct"))
-    RegisterImageRequest.add_member(:ramdisk_id, Shapes::ShapeRef.new(shape: RamdiskId, location_name: "ramdiskId"))
+    RegisterImageRequest.add_member(:ramdisk_id, Shapes::ShapeRef.new(shape: String, location_name: "ramdiskId"))
     RegisterImageRequest.add_member(:root_device_name, Shapes::ShapeRef.new(shape: String, location_name: "rootDeviceName"))
     RegisterImageRequest.add_member(:sriov_net_support, Shapes::ShapeRef.new(shape: String, location_name: "sriovNetSupport"))
     RegisterImageRequest.add_member(:virtualization_type, Shapes::ShapeRef.new(shape: String, location_name: "virtualizationType"))
@@ -7139,7 +7163,7 @@ module Aws::EC2
     ResetFpgaImageAttributeResult.struct_class = Types::ResetFpgaImageAttributeResult
 
     ResetImageAttributeRequest.add_member(:attribute, Shapes::ShapeRef.new(shape: ResetImageAttributeName, required: true, location_name: "Attribute"))
-    ResetImageAttributeRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    ResetImageAttributeRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ImageId"))
     ResetImageAttributeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     ResetImageAttributeRequest.struct_class = Types::ResetImageAttributeRequest
 

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

@@ -1170,10 +1170,10 @@ module Aws::EC2
     #     description: "String",
     #     dry_run: false,
     #     ena_support: false,
-    #     kernel_id: "KernelId",
+    #     kernel_id: "String",
     #     name: "String", # required
     #     billing_products: ["String"],
-    #     ramdisk_id: "RamdiskId",
+    #     ramdisk_id: "String",
     #     root_device_name: "String",
     #     sriov_net_support: "String",
     #     virtualization_type: "String",

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

@@ -429,7 +429,8 @@ module Aws::EC2
     #         auto_placement: "on", # accepts on, off
     #         availability_zone: "String", # required
     #         client_token: "String",
-    #         instance_type: "String", # required
+    #         instance_type: "String",
+    #         instance_family: "String",
     #         quantity: 1, # required
     #         tag_specifications: [
     #           {
@@ -474,9 +475,25 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   Specifies the instance type for which to configure your Dedicated
-    #   Hosts. When you specify the instance type, that is the only instance
-    #   type that you can launch onto that host.
+    #   Specifies the instance type to be supported by the Dedicated Hosts.
+    #   If you specify an instance type, the Dedicated Hosts support
+    #   instances of the specified instance type only.
+    #
+    #   If you want the Dedicated Hosts to support multiple instance types
+    #   in a specific instance family, omit this parameter and specify
+    #   **InstanceFamily** instead. You cannot specify **InstanceType** and
+    #   **InstanceFamily** in the same request.
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_family
+    #   Specifies the instance family to be supported by the Dedicated
+    #   Hosts. If you specify an instance family, the Dedicated Hosts
+    #   support multiple instance types within that instance family.
+    #
+    #   If you want the Dedicated Hosts to support a specific instance type
+    #   only, omit this parameter and specify **InstanceType** instead. You
+    #   cannot specify **InstanceFamily** and **InstanceType** in the same
+    #   request.
     #   @return [String]
     #
     # @!attribute [rw] quantity
@@ -508,6 +525,7 @@ module Aws::EC2
       :availability_zone,
       :client_token,
       :instance_type,
+      :instance_family,
       :quantity,
       :tag_specifications,
       :host_recovery)
@@ -1868,15 +1886,20 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # The capacity information for instances launched onto the Dedicated
-    # Host.
+    # The capacity information for instances that can be launched onto the
+    # Dedicated Host.
     #
     # @!attribute [rw] available_instance_capacity
-    #   The total number of instances supported by the Dedicated Host.
+    #   The number of instances that can be launched onto the Dedicated Host
+    #   depending on the host's available capacity. For Dedicated Hosts
+    #   that support multiple instance types, this parameter represents the
+    #   number of instances for each instance size that is supported on the
+    #   host.
     #   @return [Array<Types::InstanceCapacity>]
     #
     # @!attribute [rw] available_v_cpus
-    #   The number of vCPUs available on the Dedicated Host.
+    #   The number of vCPUs available for launching instances onto the
+    #   Dedicated Host.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AvailableCapacity AWS API Documentation
@@ -3697,7 +3720,7 @@ module Aws::EC2
     #         client_token: "String",
     #         description: "String",
     #         encrypted: false,
-    #         kms_key_id: "KmsKeyId",
+    #         kms_key_id: "String",
     #         name: "String", # required
     #         source_image_id: "String", # required
     #         source_region: "String", # required
@@ -5252,7 +5275,7 @@ module Aws::EC2
     #         ],
     #         description: "String",
     #         dry_run: false,
-    #         instance_id: "InstanceId", # required
+    #         instance_id: "String", # required
     #         name: "String", # required
     #         no_reboot: false,
     #       }
@@ -10153,7 +10176,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         image_id: "ImageId", # required
+    #         image_id: "String", # required
     #         dry_run: false,
     #       }
     #
@@ -22986,8 +23009,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] available_capacity
-    #   The number of new instances that can be launched onto the Dedicated
-    #   Host.
+    #   Information about the instances running on the Dedicated Host.
     #   @return [Types::AvailableCapacity]
     #
     # @!attribute [rw] client_token
@@ -23040,6 +23062,23 @@ module Aws::EC2
     #   Dedicated Host.
     #   @return [String]
     #
+    # @!attribute [rw] allows_multiple_instance_types
+    #   Indicates whether the Dedicated Host supports multiple instance
+    #   types of the same instance family, or a specific instance type only.
+    #   `one` indicates that the Dedicated Host supports multiple instance
+    #   types in the instance family. `off` indicates that the Dedicated
+    #   Host supports a single instance type only.
+    #   @return [String]
+    #
+    # @!attribute [rw] owner_id
+    #   The ID of the AWS account that owns the Dedicated Host.
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   The ID of the Availability Zone in which the Dedicated Host is
+    #   allocated.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Host AWS API Documentation
     #
     class Host < Struct.new(
@@ -23055,26 +23094,34 @@ module Aws::EC2
       :allocation_time,
       :release_time,
       :tags,
-      :host_recovery)
+      :host_recovery,
+      :allows_multiple_instance_types,
+      :owner_id,
+      :availability_zone_id)
       include Aws::Structure
     end
 
     # Describes an instance running on a Dedicated Host.
     #
     # @!attribute [rw] instance_id
-    #   the IDs of instances that are running on the Dedicated Host.
+    #   The ID of instance that is running on the Dedicated Host.
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   The instance type size (for example, `m3.medium`) of the running
+    #   The instance type (for example, `m3.medium`) of the running
     #   instance.
     #   @return [String]
     #
+    # @!attribute [rw] owner_id
+    #   The ID of the AWS account that owns the instance.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/HostInstance AWS API Documentation
     #
     class HostInstance < Struct.new(
       :instance_id,
-      :instance_type)
+      :instance_type,
+      :owner_id)
       include Aws::Structure
     end
 
@@ -23122,15 +23169,21 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes properties of a Dedicated Host.
+    # Describes the properties of a Dedicated Host.
     #
     # @!attribute [rw] cores
     #   The number of cores on the Dedicated Host.
     #   @return [Integer]
     #
     # @!attribute [rw] instance_type
-    #   The instance type size that the Dedicated Host supports (for
-    #   example, `m3.medium`).
+    #   The instance type supported by the Dedicated Host. For example,
+    #   `m5.large`. If the host supports multiple instance types, no
+    #   **instanceType** is returned.
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_family
+    #   The instance family supported by the Dedicated Host. For example,
+    #   `m5`.
     #   @return [String]
     #
     # @!attribute [rw] sockets
@@ -23138,7 +23191,7 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] total_v_cpus
-    #   The number of vCPUs on the Dedicated Host.
+    #   The total number of vCPUs on the Dedicated Host.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/HostProperties AWS API Documentation
@@ -23146,6 +23199,7 @@ module Aws::EC2
     class HostProperties < Struct.new(
       :cores,
       :instance_type,
+      :instance_family,
       :sockets,
       :total_v_cpus)
       include Aws::Structure
@@ -23695,6 +23749,39 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The request information of license configurations.
+    #
+    # @note When making an API call, you may pass ImportImageLicenseConfigurationRequest
+    #   data as a hash:
+    #
+    #       {
+    #         license_configuration_arn: "String",
+    #       }
+    #
+    # @!attribute [rw] license_configuration_arn
+    #   The ARN of a license configuration.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageLicenseConfigurationRequest AWS API Documentation
+    #
+    class ImportImageLicenseConfigurationRequest < Struct.new(
+      :license_configuration_arn)
+      include Aws::Structure
+    end
+
+    # The response information of license configurations.
+    #
+    # @!attribute [rw] license_configuration_arn
+    #   The ARN of a license configuration.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageLicenseConfigurationResponse AWS API Documentation
+    #
+    class ImportImageLicenseConfigurationResponse < Struct.new(
+      :license_configuration_arn)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ImportImageRequest
     #   data as a hash:
     #
@@ -23724,10 +23811,15 @@ module Aws::EC2
     #         dry_run: false,
     #         encrypted: false,
     #         hypervisor: "String",
-    #         kms_key_id: "KmsKeyId",
+    #         kms_key_id: "String",
     #         license_type: "String",
     #         platform: "String",
     #         role_name: "String",
+    #         license_specifications: [
+    #           {
+    #             license_configuration_arn: "String",
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] architecture
@@ -23842,6 +23934,10 @@ module Aws::EC2
     #   'vmimport'.
     #   @return [String]
     #
+    # @!attribute [rw] license_specifications
+    #   The ARNs of the license configurations.
+    #   @return [Array<Types::ImportImageLicenseConfigurationRequest>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageRequest AWS API Documentation
     #
     class ImportImageRequest < Struct.new(
@@ -23856,7 +23952,8 @@ module Aws::EC2
       :kms_key_id,
       :license_type,
       :platform,
-      :role_name)
+      :role_name,
+      :license_specifications)
       include Aws::Structure
     end
 
@@ -23913,6 +24010,10 @@ module Aws::EC2
     #   A detailed status message of the import task.
     #   @return [String]
     #
+    # @!attribute [rw] license_specifications
+    #   The ARNs of the license configurations.
+    #   @return [Array<Types::ImportImageLicenseConfigurationResponse>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageResult AWS API Documentation
     #
     class ImportImageResult < Struct.new(
@@ -23928,7 +24029,8 @@ module Aws::EC2
       :progress,
       :snapshot_details,
       :status,
-      :status_message)
+      :status_message,
+      :license_specifications)
       include Aws::Structure
     end
 
@@ -23992,6 +24094,11 @@ module Aws::EC2
     #   A descriptive status message for the import image task.
     #   @return [String]
     #
+    # @!attribute [rw] license_specifications
+    #   The ARNs of the license configurations associated to the import
+    #   image task.
+    #   @return [Array<Types::ImportImageLicenseConfigurationResponse>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageTask AWS API Documentation
     #
     class ImportImageTask < Struct.new(
@@ -24007,7 +24114,8 @@ module Aws::EC2
       :progress,
       :snapshot_details,
       :status,
-      :status_message)
+      :status_message,
+      :license_specifications)
       include Aws::Structure
     end
 
@@ -25000,20 +25108,21 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Information about the instance type that the Dedicated Host supports.
+    # Information about the number of instances that can be launched onto
+    # the Dedicated Host.
     #
     # @!attribute [rw] available_capacity
-    #   The number of instances that can still be launched onto the
-    #   Dedicated Host.
+    #   The number of instances that can be launched onto the Dedicated Host
+    #   based on the host's available capacity.
     #   @return [Integer]
     #
     # @!attribute [rw] instance_type
-    #   The instance type size supported by the Dedicated Host.
+    #   The instance type supported by the Dedicated Host.
     #   @return [String]
     #
     # @!attribute [rw] total_capacity
     #   The total number of instances that can be launched onto the
-    #   Dedicated Host.
+    #   Dedicated Host if there are no instances running on it.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceCapacity AWS API Documentation
@@ -28114,6 +28223,8 @@ module Aws::EC2
     #         auto_placement: "on", # accepts on, off
     #         host_ids: ["String"], # required
     #         host_recovery: "on", # accepts on, off
+    #         instance_type: "String",
+    #         instance_family: "String",
     #       }
     #
     # @!attribute [rw] auto_placement
@@ -28134,12 +28245,36 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-recovery.html
     #   @return [String]
     #
+    # @!attribute [rw] instance_type
+    #   Specifies the instance type to be supported by the Dedicated Host.
+    #   Specify this parameter to modify a Dedicated Host to support only a
+    #   specific instance type.
+    #
+    #   If you want to modify a Dedicated Host to support multiple instance
+    #   types in its current instance family, omit this parameter and
+    #   specify **InstanceFamily** instead. You cannot specify
+    #   **InstanceType** and **InstanceFamily** in the same request.
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_family
+    #   Specifies the instance family to be supported by the Dedicated Host.
+    #   Specify this parameter to modify a Dedicated Host to support
+    #   multiple instance types within its current instance family.
+    #
+    #   If you want to modify a Dedicated Host to support a specific
+    #   instance type only, omit this parameter and specify **InstanceType**
+    #   instead. You cannot specify **InstanceFamily** and **InstanceType**
+    #   in the same request.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyHostsRequest AWS API Documentation
     #
     class ModifyHostsRequest < Struct.new(
       :auto_placement,
       :host_ids,
-      :host_recovery)
+      :host_recovery,
+      :instance_type,
+      :instance_family)
       include Aws::Structure
     end
 
@@ -28250,7 +28385,7 @@ module Aws::EC2
     #       {
     #         attribute: "String",
     #         description: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
-    #         image_id: "ImageId", # required
+    #         image_id: "String", # required
     #         launch_permission: {
     #           add: [
     #             {
@@ -32543,10 +32678,10 @@ module Aws::EC2
     #         description: "String",
     #         dry_run: false,
     #         ena_support: false,
-    #         kernel_id: "KernelId",
+    #         kernel_id: "String",
     #         name: "String", # required
     #         billing_products: ["String"],
-    #         ramdisk_id: "RamdiskId",
+    #         ramdisk_id: "String",
     #         root_device_name: "String",
     #         sriov_net_support: "String",
     #         virtualization_type: "String",
@@ -34850,7 +34985,7 @@ module Aws::EC2
     #
     #       {
     #         attribute: "launchPermission", # required, accepts launchPermission
-    #         image_id: "ImageId", # required
+    #         image_id: "String", # required
     #         dry_run: false,
     #       }
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.118.0
+  version: 1.119.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4