aws-sdk-ec2 1.9.0 → 1.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c4759ed4fe6aa4ba368cd65494c85a8552de1333
4
- data.tar.gz: a9557653d9d3176f14e1b946caaf804055931d07
3
+ metadata.gz: 28f065a9c2348491bf5d372a9050dbfdf34a3fc0
4
+ data.tar.gz: 0d05024577b75af9b7403d09eeee23e387af953d
5
5
  SHA512:
6
- metadata.gz: ca428e317d15a793d606377933d82efe67a90f0091713d40ad4de48e202a548efc8105ac93b7b0bbe69d3dbd8f7497b9de6d4877d0afb4d1ce0b60e07461cd64
7
- data.tar.gz: 1ac9bd6e96f3a85883ef6674c61100f1e777ecdf4838a66bd8ef4eeb38a7f90f07409a07b0fd8998948daa262e9e89db2aabba304ac395714ebac7d5ab2be98f
6
+ metadata.gz: 0652cf3daaec3536b641c2ce47318f6bca47baaf6b6347860355b537125601cbc81a267f0202f3508cb4791ff6dda47a44d2b0dfa2470ebfdbd96c5a5a1c1f93
7
+ data.tar.gz: db9c620bd8fbf8ad76a1eaf61e302a013e51c05d039df3873b009f0e6027ac4a723968ed82b6941f26645b0461052111c7efff69c7c8fe56ff60c58f0498903f
@@ -65,6 +65,6 @@ require_relative 'aws-sdk-ec2/customizations'
65
65
  # @service
66
66
  module Aws::EC2
67
67
 
68
- GEM_VERSION = '1.9.0'
68
+ GEM_VERSION = '1.10.0'
69
69
 
70
70
  end
@@ -2036,8 +2036,8 @@ module Aws::EC2
2036
2036
 
2037
2037
  # Determines whether a product code is associated with an instance. This
2038
2038
  # action can only be used by the owner of the product code. It is useful
2039
- # when a product code owner needs to verify whether another user's
2040
- # instance is eligible for support.
2039
+ # when a product code owner must verify whether another user's instance
2040
+ # is eligible for support.
2041
2041
  #
2042
2042
  # @option params [required, String] :instance_id
2043
2043
  # The ID of the instance.
@@ -3793,9 +3793,8 @@ module Aws::EC2
3793
3793
  req.send_request(options)
3794
3794
  end
3795
3795
 
3796
- # Creates a placement group that you launch cluster instances into. You
3797
- # must give the group a name that's unique within the scope of your
3798
- # account.
3796
+ # Creates a placement group that you launch cluster instances into. Give
3797
+ # the group a name that's unique within the scope of your account.
3799
3798
  #
3800
3799
  # For more information about placement groups and cluster instances, see
3801
3800
  # [Cluster Instances][1] in the *Amazon Elastic Compute Cloud User
@@ -5163,9 +5162,8 @@ module Aws::EC2
5163
5162
  # This is an idempotent operation. If you perform the operation more
5164
5163
  # than once, Amazon EC2 doesn't return an error.
5165
5164
  #
5166
- # For more information about VPN connections, see [Adding a Hardware
5167
- # Virtual Private Gateway to Your VPC][1] in the *Amazon Virtual Private
5168
- # Cloud User Guide*.
5165
+ # For more information, see [AWS Managed VPN Connections][1] in the
5166
+ # *Amazon Virtual Private Cloud User Guide*.
5169
5167
  #
5170
5168
  #
5171
5169
  #
@@ -5187,11 +5185,7 @@ module Aws::EC2
5187
5185
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
5188
5186
  #
5189
5187
  # @option params [Types::VpnConnectionOptionsSpecification] :options
5190
- # Indicates whether the VPN connection requires static routes. If you
5191
- # are creating a VPN connection for a device that does not support BGP,
5192
- # you must specify `true`.
5193
- #
5194
- # Default: `false`
5188
+ # The options for the VPN connection.
5195
5189
  #
5196
5190
  # @return [Types::CreateVpnConnectionResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
5197
5191
  #
@@ -5206,6 +5200,12 @@ module Aws::EC2
5206
5200
  # dry_run: false,
5207
5201
  # options: {
5208
5202
  # static_routes_only: false,
5203
+ # tunnel_options: [
5204
+ # {
5205
+ # tunnel_inside_cidr: "String",
5206
+ # pre_shared_key: "String",
5207
+ # },
5208
+ # ],
5209
5209
  # },
5210
5210
  # })
5211
5211
  #
@@ -5213,6 +5213,7 @@ module Aws::EC2
5213
5213
  #
5214
5214
  # resp.vpn_connection.customer_gateway_configuration #=> String
5215
5215
  # resp.vpn_connection.customer_gateway_id #=> String
5216
+ # resp.vpn_connection.category #=> String
5216
5217
  # resp.vpn_connection.state #=> String, one of "pending", "available", "deleting", "deleted"
5217
5218
  # resp.vpn_connection.type #=> String, one of "ipsec.1"
5218
5219
  # resp.vpn_connection.vpn_connection_id #=> String
@@ -9187,9 +9188,9 @@ module Aws::EC2
9187
9188
  #
9188
9189
  # * `network-interface.source-dest-check` - Whether the network
9189
9190
  # interface performs source/destination checking. A value of `true`
9190
- # means checking is enabled, and `false` means checking is disabled.
9191
- # The value must be `false` for the network interface to perform
9192
- # network address translation (NAT) in your VPC.
9191
+ # means that checking is enabled, and `false` means that checking is
9192
+ # disabled. The value must be `false` for the network interface to
9193
+ # perform network address translation (NAT) in your VPC.
9193
9194
  #
9194
9195
  # * `network-interface.subnet-id` - The ID of the subnet for the network
9195
9196
  # interface.
@@ -9230,9 +9231,9 @@ module Aws::EC2
9230
9231
  # reservation ID has a one-to-one relationship with an instance launch
9231
9232
  # request, but can be associated with more than one instance if you
9232
9233
  # launch multiple instances using the same launch request. For
9233
- # example, if you launch one instance, you'll get one reservation ID.
9234
- # If you launch ten instances using the same launch request, you'll
9235
- # also get one reservation ID.
9234
+ # example, if you launch one instance, you get one reservation ID. If
9235
+ # you launch ten instances using the same launch request, you also get
9236
+ # one reservation ID.
9236
9237
  #
9237
9238
  # * `root-device-name` - The name of the root device for the instance
9238
9239
  # (for example, `/dev/sda1` or `/dev/xvda`).
@@ -9242,11 +9243,11 @@ module Aws::EC2
9242
9243
  #
9243
9244
  # * `source-dest-check` - Indicates whether the instance performs
9244
9245
  # source/destination checking. A value of `true` means that checking
9245
- # is enabled, and `false` means checking is disabled. The value must
9246
- # be `false` for the instance to perform network address translation
9247
- # (NAT) in your VPC.
9246
+ # is enabled, and `false` means that checking is disabled. The value
9247
+ # must be `false` for the instance to perform network address
9248
+ # translation (NAT) in your VPC.
9248
9249
  #
9249
- # * `spot-instance-request-id` - The ID of the Spot instance request.
9250
+ # * `spot-instance-request-id` - The ID of the Spot Instance request.
9250
9251
  #
9251
9252
  # * `state-reason-code` - The reason code for the state change.
9252
9253
  #
@@ -9264,9 +9265,9 @@ module Aws::EC2
9264
9265
  # is independent of the `tag-value` filter. For example, if you use
9265
9266
  # both the filter "tag-key=Purpose" and the filter "tag-value=X",
9266
9267
  # you get any resources assigned both the tag key Purpose (regardless
9267
- # of what the tag's value is), and the tag value X (regardless of
9268
- # what the tag's key is). If you want to list only resources where
9269
- # Purpose is X, see the `tag`\:*key*=*value* filter.
9268
+ # of what the tag's value is), and the tag value X (regardless of the
9269
+ # tag's key). If you want to list only resources where Purpose is X,
9270
+ # see the `tag`\:*key*=*value* filter.
9270
9271
  #
9271
9272
  # * `tag-value` - The value of a tag assigned to the resource. This
9272
9273
  # filter is independent of the `tag-key` filter.
@@ -12826,37 +12827,37 @@ module Aws::EC2
12826
12827
  # * `launch.key-name` - The name of the key pair the instance launched
12827
12828
  # with.
12828
12829
  #
12829
- # * `launch.monitoring-enabled` - Whether monitoring is enabled for the
12830
- # Spot instance.
12830
+ # * `launch.monitoring-enabled` - Whether detailed monitoring is enabled
12831
+ # for the Spot instance.
12831
12832
  #
12832
12833
  # * `launch.ramdisk-id` - The RAM disk ID.
12833
12834
  #
12834
- # * `network-interface.network-interface-id` - The ID of the network
12835
- # interface.
12835
+ # * `launched-availability-zone` - The Availability Zone in which the
12836
+ # bid is launched.
12836
12837
  #
12837
- # * `network-interface.device-index` - The index of the device for the
12838
- # network interface attachment on the instance.
12838
+ # * `network-interface.addresses.primary` - Indicates whether the IP
12839
+ # address is the primary private IP address.
12839
12840
  #
12840
- # * `network-interface.subnet-id` - The ID of the subnet for the
12841
- # instance.
12841
+ # * `network-interface.delete-on-termination` - Indicates whether the
12842
+ # network interface is deleted when the instance is terminated.
12842
12843
  #
12843
12844
  # * `network-interface.description` - A description of the network
12844
12845
  # interface.
12845
12846
  #
12846
- # * `network-interface.private-ip-address` - The primary private IP
12847
- # address of the network interface.
12848
- #
12849
- # * `network-interface.delete-on-termination` - Indicates whether the
12850
- # network interface is deleted when the instance is terminated.
12847
+ # * `network-interface.device-index` - The index of the device for the
12848
+ # network interface attachment on the instance.
12851
12849
  #
12852
12850
  # * `network-interface.group-id` - The ID of the security group
12853
12851
  # associated with the network interface.
12854
12852
  #
12855
- # * `network-interface.group-name` - The name of the security group
12856
- # associated with the network interface.
12853
+ # * `network-interface.network-interface-id` - The ID of the network
12854
+ # interface.
12857
12855
  #
12858
- # * `network-interface.addresses.primary` - Indicates whether the IP
12859
- # address is the primary private IP address.
12856
+ # * `network-interface.private-ip-address` - The primary private IP
12857
+ # address of the network interface.
12858
+ #
12859
+ # * `network-interface.subnet-id` - The ID of the subnet for the
12860
+ # instance.
12860
12861
  #
12861
12862
  # * `product-description` - The product description associated with the
12862
12863
  # instance (`Linux/UNIX` \| `Windows`).
@@ -12898,9 +12899,6 @@ module Aws::EC2
12898
12899
  # * `type` - The type of Spot instance request (`one-time` \|
12899
12900
  # `persistent`).
12900
12901
  #
12901
- # * `launched-availability-zone` - The Availability Zone in which the
12902
- # bid is launched.
12903
- #
12904
12902
  # * `valid-from` - The start date of the request.
12905
12903
  #
12906
12904
  # * `valid-until` - The end date of the request.
@@ -14866,6 +14864,7 @@ module Aws::EC2
14866
14864
  # resp.vpn_connections #=> Array
14867
14865
  # resp.vpn_connections[0].customer_gateway_configuration #=> String
14868
14866
  # resp.vpn_connections[0].customer_gateway_id #=> String
14867
+ # resp.vpn_connections[0].category #=> String
14869
14868
  # resp.vpn_connections[0].state #=> String, one of "pending", "available", "deleting", "deleted"
14870
14869
  # resp.vpn_connections[0].type #=> String, one of "ipsec.1"
14871
14870
  # resp.vpn_connections[0].vpn_connection_id #=> String
@@ -15766,7 +15765,7 @@ module Aws::EC2
15766
15765
  #
15767
15766
  # Instance console output is buffered and posted shortly after instance
15768
15767
  # boot, reboot, and termination. Amazon EC2 preserves the most recent 64
15769
- # KB output which is available for at least one hour after the most
15768
+ # KB output, which is available for at least one hour after the most
15770
15769
  # recent post.
15771
15770
  #
15772
15771
  # For Linux instances, the instance console output displays the exact
@@ -16885,8 +16884,8 @@ module Aws::EC2
16885
16884
  #
16886
16885
  # @option params [Types::AttributeBooleanValue] :source_dest_check
16887
16886
  # Specifies whether source/destination checking is enabled. A value of
16888
- # `true` means that checking is enabled, and `false` means checking is
16889
- # disabled. This value must be `false` for a NAT instance to perform
16887
+ # `true` means that checking is enabled, and `false` means that checking
16888
+ # is disabled. This value must be `false` for a NAT instance to perform
16890
16889
  # NAT.
16891
16890
  #
16892
16891
  # @option params [String] :attribute
@@ -16919,7 +16918,7 @@ module Aws::EC2
16919
16918
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
16920
16919
  #
16921
16920
  # @option params [Types::AttributeBooleanValue] :ebs_optimized
16922
- # Specifies whether the instance is optimized for EBS I/O. This
16921
+ # Specifies whether the instance is optimized for Amazon EBS I/O. This
16923
16922
  # optimization provides dedicated throughput to Amazon EBS and an
16924
16923
  # optimized configuration stack to provide optimal EBS I/O performance.
16925
16924
  # This optimization isn't available with all instance types. Additional
@@ -16984,9 +16983,9 @@ module Aws::EC2
16984
16983
  #
16985
16984
  # @option params [Types::BlobAttributeValue] :user_data
16986
16985
  # Changes the instance's user data to the specified value. If you are
16987
- # using an AWS SDK or command line tool, Base64-encoding is performed
16986
+ # using an AWS SDK or command line tool, base64-encoding is performed
16988
16987
  # for you, and you can load the text from a file. Otherwise, you must
16989
- # provide Base64-encoded text.
16988
+ # provide base64-encoded text.
16990
16989
  #
16991
16990
  # @option params [String] :value
16992
16991
  # A new value for the attribute. Use only with the `kernel`, `ramdisk`,
@@ -19060,7 +19059,7 @@ module Aws::EC2
19060
19059
  # One or more instances.
19061
19060
  #
19062
19061
  # @option params [required, Array<String>] :reason_codes
19063
- # One or more reason codes that describes the health state of your
19062
+ # One or more reason codes that describe the health state of your
19064
19063
  # instance.
19065
19064
  #
19066
19065
  # * `instance-stuck-in-state`\: My instance is stuck in a state.
@@ -19074,14 +19073,14 @@ module Aws::EC2
19074
19073
  # instance.
19075
19074
  #
19076
19075
  # * `performance-network`\: My instance is experiencing performance
19077
- # problems which I believe are network related.
19076
+ # problems that I believe are network related.
19078
19077
  #
19079
19078
  # * `performance-instance-store`\: My instance is experiencing
19080
- # performance problems which I believe are related to the instance
19079
+ # performance problems that I believe are related to the instance
19081
19080
  # stores.
19082
19081
  #
19083
19082
  # * `performance-ebs-volume`\: My instance is experiencing performance
19084
- # problems which I believe are related to an EBS volume.
19083
+ # problems that I believe are related to an EBS volume.
19085
19084
  #
19086
19085
  # * `performance-other`\: My instance is experiencing performance
19087
19086
  # problems.
@@ -20306,8 +20305,8 @@ module Aws::EC2
20306
20305
  # has not subscribed, the request fails.
20307
20306
  #
20308
20307
  # To ensure faster instance launches, break up large requests into
20309
- # smaller batches. For example, create 5 separate launch requests for
20310
- # 100 instances each instead of 1 launch request for 500 instances.
20308
+ # smaller batches. For example, create five separate launch requests for
20309
+ # 100 instances each instead of one launch request for 500 instances.
20311
20310
  #
20312
20311
  # An instance is ready for you to use when it's in the `running` state.
20313
20312
  # You can check the state of your instance using DescribeInstances. You
@@ -20457,8 +20456,8 @@ module Aws::EC2
20457
20456
  # The user data to make available to the instance. For more information,
20458
20457
  # see [Running Commands on Your Linux Instance at Launch][1] (Linux) and
20459
20458
  # [Adding User Data][2] (Windows). If you are using an AWS SDK or
20460
- # command line tool, Base64-encoding is performed for you, and you can
20461
- # load the text from a file. Otherwise, you must provide Base64-encoded
20459
+ # command line tool, base64-encoding is performed for you, and you can
20460
+ # load the text from a file. Otherwise, you must provide base64-encoded
20462
20461
  # text.
20463
20462
  #
20464
20463
  #
@@ -20497,11 +20496,12 @@ module Aws::EC2
20497
20496
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
20498
20497
  #
20499
20498
  # @option params [Boolean] :ebs_optimized
20500
- # Indicates whether the instance is optimized for EBS I/O. This
20499
+ # Indicates whether the instance is optimized for Amazon EBS I/O. This
20501
20500
  # optimization provides dedicated throughput to Amazon EBS and an
20502
- # optimized configuration stack to provide optimal EBS I/O performance.
20503
- # This optimization isn't available with all instance types. Additional
20504
- # usage charges apply when using an EBS-optimized instance.
20501
+ # optimized configuration stack to provide optimal Amazon EBS I/O
20502
+ # performance. This optimization isn't available with all instance
20503
+ # types. Additional usage charges apply when using an EBS-optimized
20504
+ # instance.
20505
20505
  #
20506
20506
  # Default: `false`
20507
20507
  #
@@ -20955,17 +20955,21 @@ module Aws::EC2
20955
20955
  req.send_request(options)
20956
20956
  end
20957
20957
 
20958
- # Starts an Amazon EBS-backed AMI that you've previously stopped.
20958
+ # Starts an Amazon EBS-backed instance that you've previously stopped.
20959
20959
  #
20960
20960
  # Instances that use Amazon EBS volumes as their root devices can be
20961
20961
  # quickly stopped and started. When an instance is stopped, the compute
20962
- # resources are released and you are not billed for hourly instance
20963
- # usage. However, your root partition Amazon EBS volume remains,
20964
- # continues to persist your data, and you are charged for Amazon EBS
20965
- # volume usage. You can restart your instance at any time. Each time you
20966
- # transition an instance from stopped to started, Amazon EC2 charges a
20967
- # full instance hour, even if transitions happen multiple times within a
20968
- # single hour.
20962
+ # resources are released and you are not billed for instance usage.
20963
+ # However, your root partition Amazon EBS volume remains and continues
20964
+ # to persist your data, and you are charged for Amazon EBS volume usage.
20965
+ # You can restart your instance at any time. Every time you start your
20966
+ # Windows instance, Amazon EC2 charges you for a full instance hour. If
20967
+ # you stop and restart your Windows instance, a new instance hour begins
20968
+ # and Amazon EC2 charges you for another full instance hour even if you
20969
+ # are still within the same 60-minute period when it was stopped. Every
20970
+ # time you start your Linux instance, Amazon EC2 charges a one-minute
20971
+ # minimum for instance usage, and thereafter charges per second for
20972
+ # instance usage.
20969
20973
  #
20970
20974
  # Before stopping an instance, make sure it is in a state from which it
20971
20975
  # can be restarted. Stopping an instance does not preserve data stored
@@ -21025,14 +21029,18 @@ module Aws::EC2
21025
21029
 
21026
21030
  # Stops an Amazon EBS-backed instance.
21027
21031
  #
21028
- # We don't charge hourly usage for a stopped instance, or data transfer
21029
- # fees; however, your root partition Amazon EBS volume remains,
21030
- # continues to persist your data, and you are charged for Amazon EBS
21031
- # volume usage. Each time you transition an instance from stopped to
21032
- # started, Amazon EC2 charges a full instance hour, even if transitions
21033
- # happen multiple times within a single hour.
21034
- #
21035
- # You can't start or stop Spot instances, and you can't stop instance
21032
+ # We don't charge usage for a stopped instance, or data transfer fees;
21033
+ # however, your root partition Amazon EBS volume remains and continues
21034
+ # to persist your data, and you are charged for Amazon EBS volume usage.
21035
+ # Every time you start your Windows instance, Amazon EC2 charges you for
21036
+ # a full instance hour. If you stop and restart your Windows instance, a
21037
+ # new instance hour begins and Amazon EC2 charges you for another full
21038
+ # instance hour even if you are still within the same 60-minute period
21039
+ # when it was stopped. Every time you start your Linux instance, Amazon
21040
+ # EC2 charges a one-minute minimum for instance usage, and thereafter
21041
+ # charges per second for instance usage.
21042
+ #
21043
+ # You can't start or stop Spot Instances, and you can't stop instance
21036
21044
  # store-backed instances.
21037
21045
  #
21038
21046
  # When you stop an instance, we shut it down. You can restart your
@@ -21490,7 +21498,7 @@ module Aws::EC2
21490
21498
  params: params,
21491
21499
  config: config)
21492
21500
  context[:gem_name] = 'aws-sdk-ec2'
21493
- context[:gem_version] = '1.9.0'
21501
+ context[:gem_version] = '1.10.0'
21494
21502
  Seahorse::Client::Request.new(handlers, context)
21495
21503
  end
21496
21504
 
@@ -901,6 +901,7 @@ module Aws::EC2
901
901
  TerminateInstancesRequest = Shapes::StructureShape.new(name: 'TerminateInstancesRequest')
902
902
  TerminateInstancesResult = Shapes::StructureShape.new(name: 'TerminateInstancesResult')
903
903
  TrafficType = Shapes::StringShape.new(name: 'TrafficType')
904
+ TunnelOptionsList = Shapes::ListShape.new(name: 'TunnelOptionsList')
904
905
  UnassignIpv6AddressesRequest = Shapes::StructureShape.new(name: 'UnassignIpv6AddressesRequest')
905
906
  UnassignIpv6AddressesResult = Shapes::StructureShape.new(name: 'UnassignIpv6AddressesResult')
906
907
  UnassignPrivateIpAddressesRequest = Shapes::StructureShape.new(name: 'UnassignPrivateIpAddressesRequest')
@@ -986,6 +987,7 @@ module Aws::EC2
986
987
  VpnStaticRoute = Shapes::StructureShape.new(name: 'VpnStaticRoute')
987
988
  VpnStaticRouteList = Shapes::ListShape.new(name: 'VpnStaticRouteList')
988
989
  VpnStaticRouteSource = Shapes::StringShape.new(name: 'VpnStaticRouteSource')
990
+ VpnTunnelOptionsSpecification = Shapes::StructureShape.new(name: 'VpnTunnelOptionsSpecification')
989
991
  ZoneNameStringList = Shapes::ListShape.new(name: 'ZoneNameStringList')
990
992
  scope = Shapes::StringShape.new(name: 'scope')
991
993
 
@@ -3897,7 +3899,7 @@ module Aws::EC2
3897
3899
  PurchaseScheduledInstancesResult.add_member(:scheduled_instance_set, Shapes::ShapeRef.new(shape: PurchasedScheduledInstanceSet, location_name: "scheduledInstanceSet"))
3898
3900
  PurchaseScheduledInstancesResult.struct_class = Types::PurchaseScheduledInstancesResult
3899
3901
 
3900
- PurchaseSet.member = Shapes::ShapeRef.new(shape: Purchase)
3902
+ PurchaseSet.member = Shapes::ShapeRef.new(shape: Purchase, location_name: "item")
3901
3903
 
3902
3904
  PurchasedScheduledInstanceSet.member = Shapes::ShapeRef.new(shape: ScheduledInstance, location_name: "item")
3903
3905
 
@@ -4761,6 +4763,8 @@ module Aws::EC2
4761
4763
  TerminateInstancesResult.add_member(:terminating_instances, Shapes::ShapeRef.new(shape: InstanceStateChangeList, location_name: "instancesSet"))
4762
4764
  TerminateInstancesResult.struct_class = Types::TerminateInstancesResult
4763
4765
 
4766
+ TunnelOptionsList.member = Shapes::ShapeRef.new(shape: VpnTunnelOptionsSpecification, location_name: "item")
4767
+
4764
4768
  UnassignIpv6AddressesRequest.add_member(:ipv_6_addresses, Shapes::ShapeRef.new(shape: Ipv6AddressList, required: true, location_name: "ipv6Addresses"))
4765
4769
  UnassignIpv6AddressesRequest.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "networkInterfaceId"))
4766
4770
  UnassignIpv6AddressesRequest.struct_class = Types::UnassignIpv6AddressesRequest
@@ -5020,6 +5024,7 @@ module Aws::EC2
5020
5024
 
5021
5025
  VpnConnection.add_member(:customer_gateway_configuration, Shapes::ShapeRef.new(shape: String, location_name: "customerGatewayConfiguration"))
5022
5026
  VpnConnection.add_member(:customer_gateway_id, Shapes::ShapeRef.new(shape: String, location_name: "customerGatewayId"))
5027
+ VpnConnection.add_member(:category, Shapes::ShapeRef.new(shape: String, location_name: "category"))
5023
5028
  VpnConnection.add_member(:state, Shapes::ShapeRef.new(shape: VpnState, location_name: "state"))
5024
5029
  VpnConnection.add_member(:type, Shapes::ShapeRef.new(shape: GatewayType, location_name: "type"))
5025
5030
  VpnConnection.add_member(:vpn_connection_id, Shapes::ShapeRef.new(shape: String, location_name: "vpnConnectionId"))
@@ -5038,6 +5043,7 @@ module Aws::EC2
5038
5043
  VpnConnectionOptions.struct_class = Types::VpnConnectionOptions
5039
5044
 
5040
5045
  VpnConnectionOptionsSpecification.add_member(:static_routes_only, Shapes::ShapeRef.new(shape: Boolean, location_name: "staticRoutesOnly"))
5046
+ VpnConnectionOptionsSpecification.add_member(:tunnel_options, Shapes::ShapeRef.new(shape: TunnelOptionsList, location_name: "TunnelOptions"))
5041
5047
  VpnConnectionOptionsSpecification.struct_class = Types::VpnConnectionOptionsSpecification
5042
5048
 
5043
5049
  VpnGateway.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
@@ -5059,6 +5065,10 @@ module Aws::EC2
5059
5065
 
5060
5066
  VpnStaticRouteList.member = Shapes::ShapeRef.new(shape: VpnStaticRoute, location_name: "item")
5061
5067
 
5068
+ VpnTunnelOptionsSpecification.add_member(:tunnel_inside_cidr, Shapes::ShapeRef.new(shape: String, location_name: "TunnelInsideCidr"))
5069
+ VpnTunnelOptionsSpecification.add_member(:pre_shared_key, Shapes::ShapeRef.new(shape: String, location_name: "PreSharedKey"))
5070
+ VpnTunnelOptionsSpecification.struct_class = Types::VpnTunnelOptionsSpecification
5071
+
5062
5072
  ZoneNameStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "ZoneName")
5063
5073
 
5064
5074
 
@@ -91,11 +91,11 @@ module Aws::EC2
91
91
  # This DNS hostname can only be used inside the Amazon EC2 network. This
92
92
  # name is not available until the instance enters the `running` state.
93
93
  #
94
- # \[EC2-VPC\] The Amazon-provided DNS server will resolve
95
- # Amazon-provided private DNS hostnames if you've enabled DNS
96
- # resolution and DNS hostnames in your VPC. If you are not using the
97
- # Amazon-provided DNS server in your VPC, your custom domain name
98
- # servers must resolve the hostname as appropriate.
94
+ # \[EC2-VPC\] The Amazon-provided DNS server resolves Amazon-provided
95
+ # private DNS hostnames if you've enabled DNS resolution and DNS
96
+ # hostnames in your VPC. If you are not using the Amazon-provided DNS
97
+ # server in your VPC, your custom domain name servers must resolve the
98
+ # hostname as appropriate.
99
99
  # @return [String]
100
100
  def private_dns_name
101
101
  data[:private_dns_name]
@@ -178,7 +178,7 @@ module Aws::EC2
178
178
  data[:client_token]
179
179
  end
180
180
 
181
- # Indicates whether the instance is optimized for EBS I/O. This
181
+ # Indicates whether the instance is optimized for Amazon EBS I/O. This
182
182
  # optimization provides dedicated throughput to Amazon EBS and an
183
183
  # optimized configuration stack to provide optimal I/O performance. This
184
184
  # optimization isn't available with all instance types. Additional
@@ -206,7 +206,7 @@ module Aws::EC2
206
206
  data[:iam_instance_profile]
207
207
  end
208
208
 
209
- # Indicates whether this is a Spot instance or a Scheduled Instance.
209
+ # Indicates whether this is a Spot Instance or a Scheduled Instance.
210
210
  # @return [String]
211
211
  def instance_lifecycle
212
212
  data[:instance_lifecycle]
@@ -239,10 +239,10 @@ module Aws::EC2
239
239
 
240
240
  # Specifies whether to enable an instance launched in a VPC to perform
241
241
  # NAT. This controls whether source/destination checking is enabled on
242
- # the instance. A value of `true` means checking is enabled, and `false`
243
- # means checking is disabled. The value must be `false` for the instance
244
- # to perform NAT. For more information, see [NAT Instances][1] in the
245
- # *Amazon Virtual Private Cloud User Guide*.
242
+ # the instance. A value of `true` means that checking is enabled, and
243
+ # `false` means that checking is disabled. The value must be `false` for
244
+ # the instance to perform NAT. For more information, see [NAT
245
+ # Instances][1] in the *Amazon Virtual Private Cloud User Guide*.
246
246
  #
247
247
  #
248
248
  #
@@ -252,7 +252,7 @@ module Aws::EC2
252
252
  data[:source_dest_check]
253
253
  end
254
254
 
255
- # If the request is a Spot instance request, the ID of the request.
255
+ # If the request is a Spot Instance request, the ID of the request.
256
256
  # @return [String]
257
257
  def spot_instance_request_id
258
258
  data[:spot_instance_request_id]
@@ -782,8 +782,8 @@ module Aws::EC2
782
782
  # @param [Hash] options ({})
783
783
  # @option options [Types::AttributeBooleanValue] :source_dest_check
784
784
  # Specifies whether source/destination checking is enabled. A value of
785
- # `true` means that checking is enabled, and `false` means checking is
786
- # disabled. This value must be `false` for a NAT instance to perform
785
+ # `true` means that checking is enabled, and `false` means that checking
786
+ # is disabled. This value must be `false` for a NAT instance to perform
787
787
  # NAT.
788
788
  # @option options [String] :attribute
789
789
  # The name of the attribute.
@@ -811,7 +811,7 @@ module Aws::EC2
811
811
  # If you have the required permissions, the error response is
812
812
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
813
813
  # @option options [Types::AttributeBooleanValue] :ebs_optimized
814
- # Specifies whether the instance is optimized for EBS I/O. This
814
+ # Specifies whether the instance is optimized for Amazon EBS I/O. This
815
815
  # optimization provides dedicated throughput to Amazon EBS and an
816
816
  # optimized configuration stack to provide optimal EBS I/O performance.
817
817
  # This optimization isn't available with all instance types. Additional
@@ -865,9 +865,9 @@ module Aws::EC2
865
865
  # option with a PV instance can make it unreachable.
866
866
  # @option options [Types::BlobAttributeValue] :user_data
867
867
  # Changes the instance's user data to the specified value. If you are
868
- # using an AWS SDK or command line tool, Base64-encoding is performed
868
+ # using an AWS SDK or command line tool, base64-encoding is performed
869
869
  # for you, and you can load the text from a file. Otherwise, you must
870
- # provide Base64-encoded text.
870
+ # provide base64-encoded text.
871
871
  # @option options [String] :value
872
872
  # A new value for the attribute. Use only with the `kernel`, `ramdisk`,
873
873
  # `userData`, `disableApiTermination`, or
@@ -954,7 +954,7 @@ module Aws::EC2
954
954
  # @option options [Time,DateTime,Date,Integer,String] :end_time
955
955
  # The time at which the reported instance health state ended.
956
956
  # @option options [required, Array<String>] :reason_codes
957
- # One or more reason codes that describes the health state of your
957
+ # One or more reason codes that describe the health state of your
958
958
  # instance.
959
959
  #
960
960
  # * `instance-stuck-in-state`\: My instance is stuck in a state.
@@ -968,14 +968,14 @@ module Aws::EC2
968
968
  # instance.
969
969
  #
970
970
  # * `performance-network`\: My instance is experiencing performance
971
- # problems which I believe are network related.
971
+ # problems that I believe are network related.
972
972
  #
973
973
  # * `performance-instance-store`\: My instance is experiencing
974
- # performance problems which I believe are related to the instance
974
+ # performance problems that I believe are related to the instance
975
975
  # stores.
976
976
  #
977
977
  # * `performance-ebs-volume`\: My instance is experiencing performance
978
- # problems which I believe are related to an EBS volume.
978
+ # problems that I believe are related to an EBS volume.
979
979
  #
980
980
  # * `performance-other`\: My instance is experiencing performance
981
981
  # problems.