aws-sdk-ec2 1.133.0 → 1.134.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34485e575745035b37fdd7c4fb870774232288c9
-  data.tar.gz: b295ce946a2931d8796480b90f8e4de95ddb19c7
+  metadata.gz: 7c38419a501151e322489f1ec9df137a876d38d9
+  data.tar.gz: 7bfbffd0844e5b56181bea4247069c17af2d148c
 SHA512:
-  metadata.gz: d1a136b42f1a5d9461fdab3a957764982417dd8f5acda5c0e10541c34fbe7a9c1809dbbbbdcaad3f3a013343bd0b44998ff2a89454d270261f66e3e91dad6b2a
-  data.tar.gz: 70ed54841223614f12e633e4b77e2355f9367f16ba6f7c890675fceba907d45dd13625bef9e5df5e95418bb28e741702f67096159e36831015c1673f57752c12
+  metadata.gz: dd1a8e15d727ad7606bb33d92ce3b4759d776ccd59e109916984f2a6f67d3441d41813ac483242c65f302d18cd6539b4ff380632b64babe6ef7293dc5626a4d2
+  data.tar.gz: d866db77a9ab4300b916e50578c65a6c7bcbe0944a537ad04eebcdcccf28d04e06e27dfc77721d9bbd8cfe6f4c6e079027e958b0e693e3734b8380d5575c6ba0

data/lib/aws-sdk-ec2.rb

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

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

@@ -290,7 +290,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   classic_address.disassociate({
-    #     association_id: "String",
+    #     association_id: "ElasticIpAssociationId",
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})
@@ -311,7 +311,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   classic_address.release({
-    #     allocation_id: "String",
+    #     allocation_id: "AllocationId",
     #     network_border_group: "String",
     #     dry_run: false,
     #   })

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

@@ -1288,7 +1288,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.associate_dhcp_options({
-    #     dhcp_options_id: "DhcpOptionsId", # required
+    #     dhcp_options_id: "DefaultingDhcpOptionsId", # required
     #     vpc_id: "VpcId", # required
     #     dry_run: false,
     #   })
@@ -1462,7 +1462,7 @@ module Aws::EC2
     #
     #   resp = client.associate_subnet_cidr_block({
     #     ipv_6_cidr_block: "String", # required
-    #     subnet_id: "String", # required
+    #     subnet_id: "SubnetId", # required
     #   })
     #
     # @example Response structure
@@ -2544,7 +2544,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.cancel_bundle_task({
-    #     bundle_id: "String", # required
+    #     bundle_id: "BundleId", # required
     #     dry_run: false,
     #   })
     #
@@ -3175,7 +3175,7 @@ module Aws::EC2
     #     client_token: "String",
     #     description: "String",
     #     encrypted: false,
-    #     kms_key_id: "String",
+    #     kms_key_id: "KmsKeyId",
     #     name: "String", # required
     #     source_image_id: "String", # required
     #     source_region: "String", # required
@@ -4825,15 +4825,15 @@ module Aws::EC2
     #           snapshot_id: "String",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           encrypted: false,
     #           kms_key_id: "String",
+    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       },
     #     ],
     #     description: "String",
     #     dry_run: false,
-    #     instance_id: "String", # required
+    #     instance_id: "InstanceId", # required
     #     name: "String", # required
     #     no_reboot: false,
     #   })
@@ -7227,7 +7227,7 @@ module Aws::EC2
     #     cidr_block: "String", # required
     #     ipv_6_cidr_block: "String",
     #     outpost_arn: "String",
-    #     vpc_id: "String", # required
+    #     vpc_id: "VpcId", # required
     #     dry_run: false,
     #   })
     #
@@ -10541,7 +10541,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.delete_subnet({
-    #     subnet_id: "String", # required
+    #     subnet_id: "SubnetId", # required
     #     dry_run: false,
     #   })
     #
@@ -11483,7 +11483,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.deregister_image({
-    #     image_id: "String", # required
+    #     image_id: "ImageId", # required
     #     dry_run: false,
     #   })
     #
@@ -12459,6 +12459,14 @@ module Aws::EC2
     # @option params [Array<Types::Filter>] :filters
     #   One or more filters. Filter names and values are case-sensitive.
     #
+    #   * `description` - The description of the authorization rule.
+    #
+    #   * `destination-cidr` - The CIDR of the network to which the
+    #     authorization rule applies.
+    #
+    #   * `group-id` - The ID of the Active Directory group to which the
+    #     authorization rule grants access.
+    #
     # @option params [Integer] :max_results
     #   The maximum number of results to return for the request in a single
     #   page. The remaining results can be seen by sending another request
@@ -12515,6 +12523,11 @@ module Aws::EC2
     # @option params [Array<Types::Filter>] :filters
     #   One or more filters. Filter names and values are case-sensitive.
     #
+    #   * `connection-id` - The ID of the connection.
+    #
+    #   * `username` - For Active Directory client authentication, the user
+    #     name of the client who established the client connection.
+    #
     # @option params [String] :next_token
     #   The token to retrieve the next page of results.
     #
@@ -12593,6 +12606,10 @@ module Aws::EC2
     # @option params [Array<Types::Filter>] :filters
     #   One or more filters. Filter names and values are case-sensitive.
     #
+    #   * `endpoint-id` - The ID of the Client VPN endpoint.
+    #
+    #   * `transport-protocol` - The transport protocol (`tcp` \| `udp`).
+    #
     # @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.
@@ -12668,6 +12685,14 @@ module Aws::EC2
     # @option params [Array<Types::Filter>] :filters
     #   One or more filters. Filter names and values are case-sensitive.
     #
+    #   * `destination-cidr` - The CIDR of the route destination.
+    #
+    #   * `origin` - How the route was associated with the Client VPN endpoint
+    #     (`associate` \| `add-route`).
+    #
+    #   * `target-subnet` - The ID of the subnet through which traffic is
+    #     routed.
+    #
     # @option params [Integer] :max_results
     #   The maximum number of results to return for the request in a single
     #   page. The remaining results can be seen by sending another request
@@ -12744,6 +12769,13 @@ module Aws::EC2
     # @option params [Array<Types::Filter>] :filters
     #   One or more filters. Filter names and values are case-sensitive.
     #
+    #   * `association-id` - The ID of the association.
+    #
+    #   * `target-network-id` - The ID of the subnet specified as the target
+    #     network.
+    #
+    #   * `vpc-id` - The ID of the VPC in which the target network is located.
+    #
     # @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.
@@ -13410,6 +13442,7 @@ module Aws::EC2
     #   The export task IDs.
     #
     # @option params [Array<Types::Filter>] :filters
+    #   the filters for the export tasks.
     #
     # @return [Types::DescribeExportTasksResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -14647,8 +14680,8 @@ module Aws::EC2
     #   resp.block_device_mappings[0].ebs.snapshot_id #=> String
     #   resp.block_device_mappings[0].ebs.volume_size #=> Integer
     #   resp.block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "gp2", "sc1", "st1"
-    #   resp.block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.block_device_mappings[0].no_device #=> String
     #   resp.image_id #=> String
     #   resp.launch_permissions #=> Array
@@ -14885,8 +14918,8 @@ module Aws::EC2
     #   resp.images[0].block_device_mappings[0].ebs.snapshot_id #=> String
     #   resp.images[0].block_device_mappings[0].ebs.volume_size #=> Integer
     #   resp.images[0].block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "gp2", "sc1", "st1"
-    #   resp.images[0].block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.images[0].block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.images[0].block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.images[0].block_device_mappings[0].no_device #=> String
     #   resp.images[0].description #=> String
     #   resp.images[0].ena_support #=> Boolean
@@ -15683,7 +15716,7 @@ module Aws::EC2
     #     instance type.
     #
     #   * `vcpu-info.default-threads-per-core` - The default number of threads
-    #     per cores for the instance type.
+    #     per core for the instance type.
     #
     #   * `vcpu-info.default-vcpus` - The default number of vCPUs for the
     #     instance type.
@@ -20594,8 +20627,8 @@ module Aws::EC2
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].block_device_mappings[0].ebs.snapshot_id #=> String
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].block_device_mappings[0].ebs.volume_size #=> Integer
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "gp2", "sc1", "st1"
-    #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].block_device_mappings[0].no_device #=> String
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].ebs_optimized #=> Boolean
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].iam_instance_profile.arn #=> String
@@ -20933,8 +20966,8 @@ module Aws::EC2
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.snapshot_id #=> String
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.volume_size #=> Integer
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "gp2", "sc1", "st1"
-    #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].no_device #=> String
     #   resp.spot_instance_requests[0].launch_specification.ebs_optimized #=> Boolean
     #   resp.spot_instance_requests[0].launch_specification.iam_instance_profile.arn #=> String
@@ -24260,7 +24293,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.detach_network_interface({
-    #     attachment_id: "AttachmentId", # required
+    #     attachment_id: "NetworkInterfaceAttachmentId", # required
     #     dry_run: false,
     #     force: false,
     #   })
@@ -24719,7 +24752,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.disassociate_address({
-    #     association_id: "String",
+    #     association_id: "ElasticIpAssociationId",
     #     public_ip: "String",
     #     dry_run: false,
     #   })
@@ -24908,7 +24941,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.disassociate_subnet_cidr_block({
-    #     association_id: "String", # required
+    #     association_id: "SubnetCidrAssociationId", # required
     #   })
     #
     # @example Response structure
@@ -26893,7 +26926,7 @@ module Aws::EC2
     #     dry_run: false,
     #     encrypted: false,
     #     hypervisor: "String",
-    #     kms_key_id: "String",
+    #     kms_key_id: "KmsKeyId",
     #     license_type: "String",
     #     platform: "String",
     #     role_name: "String",
@@ -28138,7 +28171,7 @@ module Aws::EC2
     #   resp = client.modify_image_attribute({
     #     attribute: "String",
     #     description: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
-    #     image_id: "String", # required
+    #     image_id: "ImageId", # required
     #     launch_permission: {
     #       add: [
     #         {
@@ -28343,7 +28376,7 @@ module Aws::EC2
     #         device_name: "String",
     #         ebs: {
     #           delete_on_termination: false,
-    #           volume_id: "String",
+    #           volume_id: "VolumeId",
     #         },
     #         no_device: "String",
     #         virtual_name: "String",
@@ -29244,7 +29277,7 @@ module Aws::EC2
     #     map_public_ip_on_launch: {
     #       value: false,
     #     },
-    #     subnet_id: "String", # required
+    #     subnet_id: "SubnetId", # required
     #   })
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifySubnetAttribute AWS API Documentation
@@ -31284,8 +31317,8 @@ module Aws::EC2
     #           snapshot_id: "String",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           encrypted: false,
     #           kms_key_id: "String",
+    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       },
@@ -31293,10 +31326,10 @@ module Aws::EC2
     #     description: "String",
     #     dry_run: false,
     #     ena_support: false,
-    #     kernel_id: "String",
+    #     kernel_id: "KernelId",
     #     name: "String", # required
     #     billing_products: ["String"],
-    #     ramdisk_id: "String",
+    #     ramdisk_id: "RamdiskId",
     #     root_device_name: "String",
     #     sriov_net_support: "String",
     #     virtualization_type: "String",
@@ -31693,7 +31726,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.release_address({
-    #     allocation_id: "String",
+    #     allocation_id: "AllocationId",
     #     public_ip: "String",
     #     network_border_group: "String",
     #     dry_run: false,
@@ -32502,8 +32535,8 @@ module Aws::EC2
     #                 snapshot_id: "String",
     #                 volume_size: 1,
     #                 volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #                 encrypted: false,
     #                 kms_key_id: "String",
+    #                 encrypted: false,
     #               },
     #               no_device: "String",
     #             },
@@ -32816,8 +32849,8 @@ module Aws::EC2
     #             snapshot_id: "String",
     #             volume_size: 1,
     #             volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #             encrypted: false,
     #             kms_key_id: "String",
+    #             encrypted: false,
     #           },
     #           no_device: "String",
     #         },
@@ -32900,8 +32933,8 @@ module Aws::EC2
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.snapshot_id #=> String
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.volume_size #=> Integer
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "gp2", "sc1", "st1"
-    #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].ebs.encrypted #=> Boolean
     #   resp.spot_instance_requests[0].launch_specification.block_device_mappings[0].no_device #=> String
     #   resp.spot_instance_requests[0].launch_specification.ebs_optimized #=> Boolean
     #   resp.spot_instance_requests[0].launch_specification.iam_instance_profile.arn #=> String
@@ -33080,7 +33113,7 @@ module Aws::EC2
     #
     #   resp = client.reset_image_attribute({
     #     attribute: "launchPermission", # required, accepts launchPermission
-    #     image_id: "String", # required
+    #     image_id: "ImageId", # required
     #     dry_run: false,
     #   })
     #
@@ -34043,8 +34076,8 @@ module Aws::EC2
     #           snapshot_id: "String",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           encrypted: false,
     #           kms_key_id: "String",
+    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       },
@@ -35660,7 +35693,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.133.0'
+      context[:gem_version] = '1.134.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -88,7 +88,6 @@ module Aws::EC2
     AttachVolumeRequest = Shapes::StructureShape.new(name: 'AttachVolumeRequest')
     AttachVpnGatewayRequest = Shapes::StructureShape.new(name: 'AttachVpnGatewayRequest')
     AttachVpnGatewayResult = Shapes::StructureShape.new(name: 'AttachVpnGatewayResult')
-    AttachmentId = Shapes::StringShape.new(name: 'AttachmentId')
     AttachmentStatus = Shapes::StringShape.new(name: 'AttachmentStatus')
     AttributeBooleanValue = Shapes::StructureShape.new(name: 'AttributeBooleanValue')
     AttributeValue = Shapes::StructureShape.new(name: 'AttributeValue')
@@ -119,6 +118,7 @@ module Aws::EC2
     BlockDeviceMappingList = Shapes::ListShape.new(name: 'BlockDeviceMappingList')
     BlockDeviceMappingRequestList = Shapes::ListShape.new(name: 'BlockDeviceMappingRequestList')
     Boolean = Shapes::BooleanShape.new(name: 'Boolean')
+    BundleId = Shapes::StringShape.new(name: 'BundleId')
     BundleIdStringList = Shapes::ListShape.new(name: 'BundleIdStringList')
     BundleInstanceRequest = Shapes::StructureShape.new(name: 'BundleInstanceRequest')
     BundleInstanceResult = Shapes::StructureShape.new(name: 'BundleInstanceResult')
@@ -357,6 +357,7 @@ module Aws::EC2
     DefaultRouteTableAssociationValue = Shapes::StringShape.new(name: 'DefaultRouteTableAssociationValue')
     DefaultRouteTablePropagationValue = Shapes::StringShape.new(name: 'DefaultRouteTablePropagationValue')
     DefaultTargetCapacityType = Shapes::StringShape.new(name: 'DefaultTargetCapacityType')
+    DefaultingDhcpOptionsId = Shapes::StringShape.new(name: 'DefaultingDhcpOptionsId')
     DeleteClientVpnEndpointRequest = Shapes::StructureShape.new(name: 'DeleteClientVpnEndpointRequest')
     DeleteClientVpnEndpointResult = Shapes::StructureShape.new(name: 'DeleteClientVpnEndpointResult')
     DeleteClientVpnRouteRequest = Shapes::StructureShape.new(name: 'DeleteClientVpnRouteRequest')
@@ -809,6 +810,7 @@ module Aws::EC2
     ElasticInferenceAcceleratorAssociationList = Shapes::ListShape.new(name: 'ElasticInferenceAcceleratorAssociationList')
     ElasticInferenceAcceleratorCount = Shapes::IntegerShape.new(name: 'ElasticInferenceAcceleratorCount')
     ElasticInferenceAccelerators = Shapes::ListShape.new(name: 'ElasticInferenceAccelerators')
+    ElasticIpAssociationId = Shapes::StringShape.new(name: 'ElasticIpAssociationId')
     EnaSupport = Shapes::StringShape.new(name: 'EnaSupport')
     EnableEbsEncryptionByDefaultRequest = Shapes::StructureShape.new(name: 'EnableEbsEncryptionByDefaultRequest')
     EnableEbsEncryptionByDefaultResult = Shapes::StructureShape.new(name: 'EnableEbsEncryptionByDefaultResult')
@@ -1115,6 +1117,7 @@ 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')
     KeyPairIdStringList = Shapes::ListShape.new(name: 'KeyPairIdStringList')
@@ -1332,6 +1335,7 @@ module Aws::EC2
     NetworkInterfaceAssociation = Shapes::StructureShape.new(name: 'NetworkInterfaceAssociation')
     NetworkInterfaceAttachment = Shapes::StructureShape.new(name: 'NetworkInterfaceAttachment')
     NetworkInterfaceAttachmentChanges = Shapes::StructureShape.new(name: 'NetworkInterfaceAttachmentChanges')
+    NetworkInterfaceAttachmentId = Shapes::StringShape.new(name: 'NetworkInterfaceAttachmentId')
     NetworkInterfaceAttribute = Shapes::StringShape.new(name: 'NetworkInterfaceAttribute')
     NetworkInterfaceCreationType = Shapes::StringShape.new(name: 'NetworkInterfaceCreationType')
     NetworkInterfaceId = Shapes::StringShape.new(name: 'NetworkInterfaceId')
@@ -1456,6 +1460,7 @@ 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')
@@ -1680,6 +1685,7 @@ module Aws::EC2
     Subnet = Shapes::StructureShape.new(name: 'Subnet')
     SubnetAssociation = Shapes::StructureShape.new(name: 'SubnetAssociation')
     SubnetAssociationList = Shapes::ListShape.new(name: 'SubnetAssociationList')
+    SubnetCidrAssociationId = Shapes::StringShape.new(name: 'SubnetCidrAssociationId')
     SubnetCidrBlockState = Shapes::StructureShape.new(name: 'SubnetCidrBlockState')
     SubnetCidrBlockStateCode = Shapes::StringShape.new(name: 'SubnetCidrBlockStateCode')
     SubnetId = Shapes::StringShape.new(name: 'SubnetId')
@@ -2098,7 +2104,7 @@ module Aws::EC2
     AssociateClientVpnTargetNetworkResult.add_member(:status, Shapes::ShapeRef.new(shape: AssociationStatus, location_name: "status"))
     AssociateClientVpnTargetNetworkResult.struct_class = Types::AssociateClientVpnTargetNetworkResult
 
-    AssociateDhcpOptionsRequest.add_member(:dhcp_options_id, Shapes::ShapeRef.new(shape: DhcpOptionsId, required: true, location_name: "DhcpOptionsId"))
+    AssociateDhcpOptionsRequest.add_member(:dhcp_options_id, Shapes::ShapeRef.new(shape: DefaultingDhcpOptionsId, required: true, location_name: "DhcpOptionsId"))
     AssociateDhcpOptionsRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, required: true, location_name: "VpcId"))
     AssociateDhcpOptionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     AssociateDhcpOptionsRequest.struct_class = Types::AssociateDhcpOptionsRequest
@@ -2121,7 +2127,7 @@ module Aws::EC2
     AssociateRouteTableResult.struct_class = Types::AssociateRouteTableResult
 
     AssociateSubnetCidrBlockRequest.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ipv6CidrBlock"))
-    AssociateSubnetCidrBlockRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "subnetId"))
+    AssociateSubnetCidrBlockRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, required: true, location_name: "subnetId"))
     AssociateSubnetCidrBlockRequest.struct_class = Types::AssociateSubnetCidrBlockRequest
 
     AssociateSubnetCidrBlockResult.add_member(:ipv_6_cidr_block_association, Shapes::ShapeRef.new(shape: SubnetIpv6CidrBlockAssociation, location_name: "ipv6CidrBlockAssociation"))
@@ -2330,7 +2336,7 @@ module Aws::EC2
 
     ByoipCidrSet.member = Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "item")
 
-    CancelBundleTaskRequest.add_member(:bundle_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "BundleId"))
+    CancelBundleTaskRequest.add_member(:bundle_id, Shapes::ShapeRef.new(shape: BundleId, required: true, location_name: "BundleId"))
     CancelBundleTaskRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CancelBundleTaskRequest.struct_class = Types::CancelBundleTaskRequest
 
@@ -2649,7 +2655,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: String, location_name: "kmsKeyId"))
+    CopyImageRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, 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"))
@@ -2842,7 +2848,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: String, required: true, location_name: "instanceId"))
+    CreateImageRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, 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
@@ -3039,7 +3045,7 @@ module Aws::EC2
     CreateSubnetRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, required: true, location_name: "CidrBlock"))
     CreateSubnetRequest.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlock"))
     CreateSubnetRequest.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "OutpostArn"))
-    CreateSubnetRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "VpcId"))
+    CreateSubnetRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, required: true, location_name: "VpcId"))
     CreateSubnetRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateSubnetRequest.struct_class = Types::CreateSubnetRequest
 
@@ -3488,7 +3494,7 @@ module Aws::EC2
     DeleteSpotDatafeedSubscriptionRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteSpotDatafeedSubscriptionRequest.struct_class = Types::DeleteSpotDatafeedSubscriptionRequest
 
-    DeleteSubnetRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "SubnetId"))
+    DeleteSubnetRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, required: true, location_name: "SubnetId"))
     DeleteSubnetRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteSubnetRequest.struct_class = Types::DeleteSubnetRequest
 
@@ -3623,7 +3629,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: String, required: true, location_name: "ImageId"))
+    DeregisterImageRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
     DeregisterImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeregisterImageRequest.struct_class = Types::DeregisterImageRequest
 
@@ -4855,7 +4861,7 @@ module Aws::EC2
     DetachInternetGatewayRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, required: true, location_name: "vpcId"))
     DetachInternetGatewayRequest.struct_class = Types::DetachInternetGatewayRequest
 
-    DetachNetworkInterfaceRequest.add_member(:attachment_id, Shapes::ShapeRef.new(shape: AttachmentId, required: true, location_name: "attachmentId"))
+    DetachNetworkInterfaceRequest.add_member(:attachment_id, Shapes::ShapeRef.new(shape: NetworkInterfaceAttachmentId, required: true, location_name: "attachmentId"))
     DetachNetworkInterfaceRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DetachNetworkInterfaceRequest.add_member(:force, Shapes::ShapeRef.new(shape: Boolean, location_name: "force"))
     DetachNetworkInterfaceRequest.struct_class = Types::DetachNetworkInterfaceRequest
@@ -4967,7 +4973,7 @@ module Aws::EC2
     DisableVpcClassicLinkResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     DisableVpcClassicLinkResult.struct_class = Types::DisableVpcClassicLinkResult
 
-    DisassociateAddressRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: String, location_name: "AssociationId"))
+    DisassociateAddressRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: ElasticIpAssociationId, location_name: "AssociationId"))
     DisassociateAddressRequest.add_member(:public_ip, Shapes::ShapeRef.new(shape: String, location_name: "PublicIp"))
     DisassociateAddressRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DisassociateAddressRequest.struct_class = Types::DisassociateAddressRequest
@@ -4991,7 +4997,7 @@ module Aws::EC2
     DisassociateRouteTableRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DisassociateRouteTableRequest.struct_class = Types::DisassociateRouteTableRequest
 
-    DisassociateSubnetCidrBlockRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "associationId"))
+    DisassociateSubnetCidrBlockRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: SubnetCidrAssociationId, required: true, location_name: "associationId"))
     DisassociateSubnetCidrBlockRequest.struct_class = Types::DisassociateSubnetCidrBlockRequest
 
     DisassociateSubnetCidrBlockResult.add_member(:ipv_6_cidr_block_association, Shapes::ShapeRef.new(shape: SubnetIpv6CidrBlockAssociation, location_name: "ipv6CidrBlockAssociation"))
@@ -5067,8 +5073,8 @@ module Aws::EC2
     EbsBlockDevice.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
     EbsBlockDevice.add_member(:volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "volumeSize"))
     EbsBlockDevice.add_member(:volume_type, Shapes::ShapeRef.new(shape: VolumeType, location_name: "volumeType"))
-    EbsBlockDevice.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
     EbsBlockDevice.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "KmsKeyId"))
+    EbsBlockDevice.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
     EbsBlockDevice.struct_class = Types::EbsBlockDevice
 
     EbsInfo.add_member(:ebs_optimized_support, Shapes::ShapeRef.new(shape: EbsOptimizedSupport, location_name: "ebsOptimizedSupport"))
@@ -5082,7 +5088,7 @@ module Aws::EC2
     EbsInstanceBlockDevice.struct_class = Types::EbsInstanceBlockDevice
 
     EbsInstanceBlockDeviceSpecification.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "deleteOnTermination"))
-    EbsInstanceBlockDeviceSpecification.add_member(:volume_id, Shapes::ShapeRef.new(shape: String, location_name: "volumeId"))
+    EbsInstanceBlockDeviceSpecification.add_member(:volume_id, Shapes::ShapeRef.new(shape: VolumeId, location_name: "volumeId"))
     EbsInstanceBlockDeviceSpecification.struct_class = Types::EbsInstanceBlockDeviceSpecification
 
     EgressOnlyInternetGateway.add_member(:attachments, Shapes::ShapeRef.new(shape: InternetGatewayAttachmentList, location_name: "attachmentSet"))
@@ -5843,7 +5849,7 @@ 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: String, location_name: "KmsKeyId"))
+    ImportImageRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, 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"))
@@ -6818,7 +6824,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: String, required: true, location_name: "ImageId"))
+    ModifyImageAttributeRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, 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"))
@@ -6941,7 +6947,7 @@ module Aws::EC2
 
     ModifySubnetAttributeRequest.add_member(:assign_ipv_6_address_on_creation, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "AssignIpv6AddressOnCreation"))
     ModifySubnetAttributeRequest.add_member(:map_public_ip_on_launch, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "MapPublicIpOnLaunch"))
-    ModifySubnetAttributeRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "subnetId"))
+    ModifySubnetAttributeRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, required: true, location_name: "subnetId"))
     ModifySubnetAttributeRequest.struct_class = Types::ModifySubnetAttributeRequest
 
     ModifyTrafficMirrorFilterNetworkServicesRequest.add_member(:traffic_mirror_filter_id, Shapes::ShapeRef.new(shape: TrafficMirrorFilterId, required: true, location_name: "TrafficMirrorFilterId"))
@@ -7627,10 +7633,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: String, location_name: "kernelId"))
+    RegisterImageRequest.add_member(:kernel_id, Shapes::ShapeRef.new(shape: KernelId, 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: String, location_name: "ramdiskId"))
+    RegisterImageRequest.add_member(:ramdisk_id, Shapes::ShapeRef.new(shape: RamdiskId, 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"))
@@ -7686,7 +7692,7 @@ module Aws::EC2
     RejectVpcPeeringConnectionResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     RejectVpcPeeringConnectionResult.struct_class = Types::RejectVpcPeeringConnectionResult
 
-    ReleaseAddressRequest.add_member(:allocation_id, Shapes::ShapeRef.new(shape: String, location_name: "AllocationId"))
+    ReleaseAddressRequest.add_member(:allocation_id, Shapes::ShapeRef.new(shape: AllocationId, location_name: "AllocationId"))
     ReleaseAddressRequest.add_member(:public_ip, Shapes::ShapeRef.new(shape: String, location_name: "PublicIp"))
     ReleaseAddressRequest.add_member(:network_border_group, Shapes::ShapeRef.new(shape: String, location_name: "NetworkBorderGroup"))
     ReleaseAddressRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -7980,7 +7986,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: String, required: true, location_name: "ImageId"))
+    ResetImageAttributeRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, 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/instance.rb

@@ -636,8 +636,8 @@ module Aws::EC2
     #           snapshot_id: "String",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           encrypted: false,
     #           kms_key_id: "String",
+    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       },
@@ -808,7 +808,7 @@ module Aws::EC2
     #         device_name: "String",
     #         ebs: {
     #           delete_on_termination: false,
-    #           volume_id: "String",
+    #           volume_id: "VolumeId",
     #         },
     #         no_device: "String",
     #         virtual_name: "String",

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

@@ -63,8 +63,8 @@ module Aws::EC2
     #           snapshot_id: "String",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           encrypted: false,
     #           kms_key_id: "String",
+    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       },
@@ -830,7 +830,7 @@ module Aws::EC2
     #     cidr_block: "String", # required
     #     ipv_6_cidr_block: "String",
     #     outpost_arn: "String",
-    #     vpc_id: "String", # required
+    #     vpc_id: "VpcId", # required
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})
@@ -1185,8 +1185,8 @@ module Aws::EC2
     #           snapshot_id: "String",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           encrypted: false,
     #           kms_key_id: "String",
+    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       },
@@ -1194,10 +1194,10 @@ module Aws::EC2
     #     description: "String",
     #     dry_run: false,
     #     ena_support: false,
-    #     kernel_id: "String",
+    #     kernel_id: "KernelId",
     #     name: "String", # required
     #     billing_products: ["String"],
-    #     ramdisk_id: "String",
+    #     ramdisk_id: "RamdiskId",
     #     root_device_name: "String",
     #     sriov_net_support: "String",
     #     virtualization_type: "String",

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

@@ -266,8 +266,8 @@ module Aws::EC2
     #           snapshot_id: "String",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           encrypted: false,
     #           kms_key_id: "String",
+    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       },

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

@@ -995,7 +995,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         dhcp_options_id: "DhcpOptionsId", # required
+    #         dhcp_options_id: "DefaultingDhcpOptionsId", # required
     #         vpc_id: "VpcId", # required
     #         dry_run: false,
     #       }
@@ -1124,7 +1124,7 @@ module Aws::EC2
     #
     #       {
     #         ipv_6_cidr_block: "String", # required
-    #         subnet_id: "String", # required
+    #         subnet_id: "SubnetId", # required
     #       }
     #
     # @!attribute [rw] ipv_6_cidr_block
@@ -2137,8 +2137,8 @@ module Aws::EC2
     #           snapshot_id: "String",
     #           volume_size: 1,
     #           volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #           encrypted: false,
     #           kms_key_id: "String",
+    #           encrypted: false,
     #         },
     #         no_device: "String",
     #       }
@@ -2352,7 +2352,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         bundle_id: "String", # required
+    #         bundle_id: "BundleId", # required
     #         dry_run: false,
     #       }
     #
@@ -4065,7 +4065,7 @@ module Aws::EC2
     #         client_token: "String",
     #         description: "String",
     #         encrypted: false,
-    #         kms_key_id: "String",
+    #         kms_key_id: "KmsKeyId",
     #         name: "String", # required
     #         source_image_id: "String", # required
     #         source_region: "String", # required
@@ -5622,15 +5622,15 @@ module Aws::EC2
     #               snapshot_id: "String",
     #               volume_size: 1,
     #               volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #               encrypted: false,
     #               kms_key_id: "String",
+    #               encrypted: false,
     #             },
     #             no_device: "String",
     #           },
     #         ],
     #         description: "String",
     #         dry_run: false,
-    #         instance_id: "String", # required
+    #         instance_id: "InstanceId", # required
     #         name: "String", # required
     #         no_reboot: false,
     #       }
@@ -7203,7 +7203,7 @@ module Aws::EC2
     #         cidr_block: "String", # required
     #         ipv_6_cidr_block: "String",
     #         outpost_arn: "String",
-    #         vpc_id: "String", # required
+    #         vpc_id: "VpcId", # required
     #         dry_run: false,
     #       }
     #
@@ -10169,7 +10169,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         subnet_id: "String", # required
+    #         subnet_id: "SubnetId", # required
     #         dry_run: false,
     #       }
     #
@@ -10973,7 +10973,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         image_id: "String", # required
+    #         image_id: "ImageId", # required
     #         dry_run: false,
     #       }
     #
@@ -11671,6 +11671,14 @@ module Aws::EC2
     #
     # @!attribute [rw] filters
     #   One or more filters. Filter names and values are case-sensitive.
+    #
+    #   * `description` - The description of the authorization rule.
+    #
+    #   * `destination-cidr` - The CIDR of the network to which the
+    #     authorization rule applies.
+    #
+    #   * `group-id` - The ID of the Active Directory group to which the
+    #     authorization rule grants access.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] max_results
@@ -11729,6 +11737,11 @@ module Aws::EC2
     #
     # @!attribute [rw] filters
     #   One or more filters. Filter names and values are case-sensitive.
+    #
+    #   * `connection-id` - The ID of the connection.
+    #
+    #   * `username` - For Active Directory client authentication, the user
+    #     name of the client who established the client connection.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] next_token
@@ -11808,6 +11821,10 @@ module Aws::EC2
     #
     # @!attribute [rw] filters
     #   One or more filters. Filter names and values are case-sensitive.
+    #
+    #   * `endpoint-id` - The ID of the Client VPN endpoint.
+    #
+    #   * `transport-protocol` - The transport protocol (`tcp` \| `udp`).
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] dry_run
@@ -11867,6 +11884,14 @@ module Aws::EC2
     #
     # @!attribute [rw] filters
     #   One or more filters. Filter names and values are case-sensitive.
+    #
+    #   * `destination-cidr` - The CIDR of the route destination.
+    #
+    #   * `origin` - How the route was associated with the Client VPN
+    #     endpoint (`associate` \| `add-route`).
+    #
+    #   * `target-subnet` - The ID of the subnet through which traffic is
+    #     routed.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] max_results
@@ -11951,6 +11976,14 @@ module Aws::EC2
     #
     # @!attribute [rw] filters
     #   One or more filters. Filter names and values are case-sensitive.
+    #
+    #   * `association-id` - The ID of the association.
+    #
+    #   * `target-network-id` - The ID of the subnet specified as the target
+    #     network.
+    #
+    #   * `vpc-id` - The ID of the VPC in which the target network is
+    #     located.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] dry_run
@@ -12532,6 +12565,7 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] filters
+    #   the filters for the export tasks.
     #   @return [Array<Types::Filter>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeExportTasksRequest AWS API Documentation
@@ -14444,7 +14478,7 @@ module Aws::EC2
     #     instance type.
     #
     #   * `vcpu-info.default-threads-per-core` - The default number of
-    #     threads per cores for the instance type.
+    #     threads per core for the instance type.
     #
     #   * `vcpu-info.default-vcpus` - The default number of vCPUs for the
     #     instance type.
@@ -20908,7 +20942,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         attachment_id: "AttachmentId", # required
+    #         attachment_id: "NetworkInterfaceAttachmentId", # required
     #         dry_run: false,
     #         force: false,
     #       }
@@ -21483,7 +21517,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         association_id: "String",
+    #         association_id: "ElasticIpAssociationId",
     #         public_ip: "String",
     #         dry_run: false,
     #       }
@@ -21623,7 +21657,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         association_id: "String", # required
+    #         association_id: "SubnetCidrAssociationId", # required
     #       }
     #
     # @!attribute [rw] association_id
@@ -22009,8 +22043,8 @@ module Aws::EC2
     #         snapshot_id: "String",
     #         volume_size: 1,
     #         volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #         encrypted: false,
     #         kms_key_id: "String",
+    #         encrypted: false,
     #       }
     #
     # @!attribute [rw] delete_on_termination
@@ -22074,6 +22108,21 @@ module Aws::EC2
     #   Default: `gp2`
     #   @return [String]
     #
+    # @!attribute [rw] kms_key_id
+    #   Identifier (key ID, key alias, ID ARN, or alias ARN) for a customer
+    #   managed CMK under which the EBS volume is encrypted.
+    #
+    #   This parameter is only supported on `BlockDeviceMapping` objects
+    #   called by [RunInstances][1], [RequestSpotFleet][2], and
+    #   [RequestSpotInstances][3].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html
+    #   [3]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html
+    #   @return [String]
+    #
     # @!attribute [rw] encrypted
     #   Indicates whether the encryption state of an EBS volume is changed
     #   while being restored from a backing snapshot. The effect of setting
@@ -22094,21 +22143,6 @@ module Aws::EC2
     #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances
     #   @return [Boolean]
     #
-    # @!attribute [rw] kms_key_id
-    #   Identifier (key ID, key alias, ID ARN, or alias ARN) for a customer
-    #   managed CMK under which the EBS volume is encrypted.
-    #
-    #   This parameter is only supported on `BlockDeviceMapping` objects
-    #   called by [RunInstances][1], [RequestSpotFleet][2], and
-    #   [RequestSpotInstances][3].
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html
-    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html
-    #   [3]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html
-    #   @return [String]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EbsBlockDevice AWS API Documentation
     #
     class EbsBlockDevice < Struct.new(
@@ -22117,8 +22151,8 @@ module Aws::EC2
       :snapshot_id,
       :volume_size,
       :volume_type,
-      :encrypted,
-      :kms_key_id)
+      :kms_key_id,
+      :encrypted)
       include Aws::Structure
     end
 
@@ -22183,7 +22217,7 @@ module Aws::EC2
     #
     #       {
     #         delete_on_termination: false,
-    #         volume_id: "String",
+    #         volume_id: "VolumeId",
     #       }
     #
     # @!attribute [rw] delete_on_termination
@@ -23167,6 +23201,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] tags
+    #   The tags for the export task.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ExportTask AWS API Documentation
@@ -26110,7 +26145,7 @@ module Aws::EC2
     #         dry_run: false,
     #         encrypted: false,
     #         hypervisor: "String",
-    #         kms_key_id: "String",
+    #         kms_key_id: "KmsKeyId",
     #         license_type: "String",
     #         platform: "String",
     #         role_name: "String",
@@ -26398,7 +26433,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] tags
-    #   Any tags applied to the import image task.
+    #   The tags for the import image task.
     #   @return [Array<Types::Tag>]
     #
     # @!attribute [rw] license_specifications
@@ -26895,7 +26930,7 @@ module Aws::EC2
     #   @return [Types::SnapshotTaskDetail]
     #
     # @!attribute [rw] tags
-    #   Any tags applied to the import snapshot task.
+    #   The tags for the import snapshot task.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportSnapshotTask AWS API Documentation
@@ -27434,7 +27469,7 @@ module Aws::EC2
     #         device_name: "String",
     #         ebs: {
     #           delete_on_termination: false,
-    #           volume_id: "String",
+    #           volume_id: "VolumeId",
     #         },
     #         no_device: "String",
     #         virtual_name: "String",
@@ -31468,7 +31503,7 @@ module Aws::EC2
     #       {
     #         attribute: "String",
     #         description: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
-    #         image_id: "String", # required
+    #         image_id: "ImageId", # required
     #         launch_permission: {
     #           add: [
     #             {
@@ -31570,7 +31605,7 @@ module Aws::EC2
     #             device_name: "String",
     #             ebs: {
     #               delete_on_termination: false,
-    #               volume_id: "String",
+    #               volume_id: "VolumeId",
     #             },
     #             no_device: "String",
     #             virtual_name: "String",
@@ -32401,7 +32436,7 @@ module Aws::EC2
     #         map_public_ip_on_launch: {
     #           value: false,
     #         },
-    #         subnet_id: "String", # required
+    #         subnet_id: "SubnetId", # required
     #       }
     #
     # @!attribute [rw] assign_ipv_6_address_on_creation
@@ -35966,8 +36001,8 @@ module Aws::EC2
     #               snapshot_id: "String",
     #               volume_size: 1,
     #               volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #               encrypted: false,
     #               kms_key_id: "String",
+    #               encrypted: false,
     #             },
     #             no_device: "String",
     #           },
@@ -35975,10 +36010,10 @@ module Aws::EC2
     #         description: "String",
     #         dry_run: false,
     #         ena_support: false,
-    #         kernel_id: "String",
+    #         kernel_id: "KernelId",
     #         name: "String", # required
     #         billing_products: ["String"],
-    #         ramdisk_id: "String",
+    #         ramdisk_id: "RamdiskId",
     #         root_device_name: "String",
     #         sriov_net_support: "String",
     #         virtualization_type: "String",
@@ -36369,7 +36404,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         allocation_id: "String",
+    #         allocation_id: "AllocationId",
     #         public_ip: "String",
     #         network_border_group: "String",
     #         dry_run: false,
@@ -37082,13 +37117,6 @@ module Aws::EC2
     #
     # @!attribute [rw] block_device_mappings
     #   The block device mapping.
-    #
-    #   Supplying both a snapshot ID and an encryption value as arguments
-    #   for block-device mapping results in an error. This is because only
-    #   blank volumes can be encrypted on start, and these are not created
-    #   from a snapshot. If a snapshot is the basis for the volume, it
-    #   contains data by definition and its encryption status cannot be
-    #   changed using this action.
     #   @return [Array<Types::LaunchTemplateBlockDeviceMappingRequest>]
     #
     # @!attribute [rw] network_interfaces
@@ -37332,8 +37360,8 @@ module Aws::EC2
     #                     snapshot_id: "String",
     #                     volume_size: 1,
     #                     volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #                     encrypted: false,
     #                     kms_key_id: "String",
+    #                     encrypted: false,
     #                   },
     #                   no_device: "String",
     #                 },
@@ -37507,8 +37535,8 @@ module Aws::EC2
     #                 snapshot_id: "String",
     #                 volume_size: 1,
     #                 volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #                 encrypted: false,
     #                 kms_key_id: "String",
+    #                 encrypted: false,
     #               },
     #               no_device: "String",
     #             },
@@ -37728,8 +37756,8 @@ module Aws::EC2
     #               snapshot_id: "String",
     #               volume_size: 1,
     #               volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #               encrypted: false,
     #               kms_key_id: "String",
+    #               encrypted: false,
     #             },
     #             no_device: "String",
     #           },
@@ -38481,7 +38509,7 @@ module Aws::EC2
     #
     #       {
     #         attribute: "launchPermission", # required, accepts launchPermission
-    #         image_id: "String", # required
+    #         image_id: "ImageId", # required
     #         dry_run: false,
     #       }
     #
@@ -39368,8 +39396,8 @@ module Aws::EC2
     #               snapshot_id: "String",
     #               volume_size: 1,
     #               volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #               encrypted: false,
     #               kms_key_id: "String",
+    #               encrypted: false,
     #             },
     #             no_device: "String",
     #           },
@@ -41822,8 +41850,8 @@ module Aws::EC2
     #               snapshot_id: "String",
     #               volume_size: 1,
     #               volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #               encrypted: false,
     #               kms_key_id: "String",
+    #               encrypted: false,
     #             },
     #             no_device: "String",
     #           },
@@ -42108,8 +42136,8 @@ module Aws::EC2
     #                   snapshot_id: "String",
     #                   volume_size: 1,
     #                   volume_type: "standard", # accepts standard, io1, gp2, sc1, st1
-    #                   encrypted: false,
     #                   kms_key_id: "String",
+    #                   encrypted: false,
     #                 },
     #                 no_device: "String",
     #               },

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

@@ -270,7 +270,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   vpc.associate_dhcp_options({
-    #     dhcp_options_id: "DhcpOptionsId", # required
+    #     dhcp_options_id: "DefaultingDhcpOptionsId", # required
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})

metadata

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