aws-sdk-ec2 1.39.0 → 1.40.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.
@@ -1403,7 +1403,7 @@ module Aws::EC2
1403
1403
  # Host.
1404
1404
  #
1405
1405
  # @!attribute [rw] available_instance_capacity
1406
- # The total number of instances that the Dedicated Host supports.
1406
+ # The total number of instances supported by the Dedicated Host.
1407
1407
  # @return [Array<Types::InstanceCapacity>]
1408
1408
  #
1409
1409
  # @!attribute [rw] available_v_cpus
@@ -1463,10 +1463,14 @@ module Aws::EC2
1463
1463
  # The virtual device name (`ephemeral`N). Instance store volumes are
1464
1464
  # numbered starting from 0. An instance type with 2 available instance
1465
1465
  # store volumes can specify mappings for `ephemeral0` and
1466
- # `ephemeral1`.The number of available instance store volumes depends
1466
+ # `ephemeral1`. The number of available instance store volumes depends
1467
1467
  # on the instance type. After you connect to the instance, you must
1468
1468
  # mount the volume.
1469
1469
  #
1470
+ # NVMe instance store volumes are automatically enumerated and
1471
+ # assigned a device name. Including them in your block device mapping
1472
+ # has no effect.
1473
+ #
1470
1474
  # Constraints: For M3 instances, you must specify instance store
1471
1475
  # volumes in the block device mapping for the instance. When you
1472
1476
  # launch an M3 instance, we ignore any instance store volumes
@@ -2899,6 +2903,10 @@ module Aws::EC2
2899
2903
  # spot_options: {
2900
2904
  # allocation_strategy: "lowest-price", # accepts lowest-price, diversified
2901
2905
  # instance_interruption_behavior: "hibernate", # accepts hibernate, stop, terminate
2906
+ # instance_pools_to_use_count: 1,
2907
+ # },
2908
+ # on_demand_options: {
2909
+ # allocation_strategy: "lowest-price", # accepts lowest-price, prioritized
2902
2910
  # },
2903
2911
  # excess_capacity_termination_policy: "no-termination", # accepts no-termination, termination
2904
2912
  # launch_template_configs: [ # required
@@ -2915,6 +2923,7 @@ module Aws::EC2
2915
2923
  # subnet_id: "String",
2916
2924
  # availability_zone: "String",
2917
2925
  # weighted_capacity: 1.0,
2926
+ # priority: 1.0,
2918
2927
  # },
2919
2928
  # ],
2920
2929
  # },
@@ -2961,10 +2970,13 @@ module Aws::EC2
2961
2970
  # @return [String]
2962
2971
  #
2963
2972
  # @!attribute [rw] spot_options
2964
- # Includes `SpotAllocationStrategy` and
2965
- # `SpotInstanceInterruptionBehavior` inside this structure.
2973
+ # Describes the configuration of Spot Instances in an EC2 Fleet.
2966
2974
  # @return [Types::SpotOptionsRequest]
2967
2975
  #
2976
+ # @!attribute [rw] on_demand_options
2977
+ # The allocation strategy of On-Demand Instances in an EC2 Fleet.
2978
+ # @return [Types::OnDemandOptionsRequest]
2979
+ #
2968
2980
  # @!attribute [rw] excess_capacity_termination_policy
2969
2981
  # Indicates whether running instances should be terminated if the
2970
2982
  # total target capacity of the EC2 Fleet is decreased below the
@@ -3033,6 +3045,7 @@ module Aws::EC2
3033
3045
  :dry_run,
3034
3046
  :client_token,
3035
3047
  :spot_options,
3048
+ :on_demand_options,
3036
3049
  :excess_capacity_termination_policy,
3037
3050
  :launch_template_configs,
3038
3051
  :target_capacity_specification,
@@ -5442,7 +5455,8 @@ module Aws::EC2
5442
5455
  # Describes the credit option for CPU usage of a T2 instance.
5443
5456
  #
5444
5457
  # @!attribute [rw] cpu_credits
5445
- # The credit option for CPU usage of a T2 instance.
5458
+ # The credit option for CPU usage of a T2 instance. Valid values are
5459
+ # `standard` and `unlimited`.
5446
5460
  # @return [String]
5447
5461
  #
5448
5462
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreditSpecification AWS API Documentation
@@ -6873,11 +6887,11 @@ module Aws::EC2
6873
6887
  #
6874
6888
  # * `public-ip` - The Elastic IP address.
6875
6889
  #
6876
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
6877
- # to the resource. Specify the key of the tag in the filter name and
6878
- # the value of the tag in the filter value. For example, for the tag
6879
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
6880
- # the filter value.
6890
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
6891
+ # to the resource. Use the tag key in the filter name and the tag
6892
+ # value as the filter value. For example, to find all resources that
6893
+ # have a tag with the key `Owner` and the value `TeamA`, specify
6894
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
6881
6895
  #
6882
6896
  # * `tag-key` - The key of a tag assigned to the resource. Use this
6883
6897
  # filter to find all resources assigned a tag with a specific key,
@@ -7134,8 +7148,11 @@ module Aws::EC2
7134
7148
  #
7135
7149
  # * `instance-id` - The ID of the instance.
7136
7150
  #
7137
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
7138
- # to the resource.
7151
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
7152
+ # to the resource. Use the tag key in the filter name and the tag
7153
+ # value as the filter value. For example, to find all resources that
7154
+ # have a tag with the key `Owner` and the value `TeamA`, specify
7155
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
7139
7156
  #
7140
7157
  # * `tag-key` - The key of a tag assigned to the resource. Use this
7141
7158
  # filter to find all resources assigned a tag with a specific key,
@@ -7283,11 +7300,11 @@ module Aws::EC2
7283
7300
  # * `type` - The type of customer gateway. Currently, the only
7284
7301
  # supported type is `ipsec.1`.
7285
7302
  #
7286
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
7287
- # to the resource. Specify the key of the tag in the filter name and
7288
- # the value of the tag in the filter value. For example, for the tag
7289
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
7290
- # the filter value.
7303
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
7304
+ # to the resource. Use the tag key in the filter name and the tag
7305
+ # value as the filter value. For example, to find all resources that
7306
+ # have a tag with the key `Owner` and the value `TeamA`, specify
7307
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
7291
7308
  #
7292
7309
  # * `tag-key` - The key of a tag assigned to the resource. Use this
7293
7310
  # filter to find all resources assigned a tag with a specific key,
@@ -7355,11 +7372,11 @@ module Aws::EC2
7355
7372
  #
7356
7373
  # * `value` - The value for one of the options.
7357
7374
  #
7358
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
7359
- # to the resource. Specify the key of the tag in the filter name and
7360
- # the value of the tag in the filter value. For example, for the tag
7361
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
7362
- # the filter value.
7375
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
7376
+ # to the resource. Use the tag key in the filter name and the tag
7377
+ # value as the filter value. For example, to find all resources that
7378
+ # have a tag with the key `Owner` and the value `TeamA`, specify
7379
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
7363
7380
  #
7364
7381
  # * `tag-key` - The key of a tag assigned to the resource. Use this
7365
7382
  # filter to find all resources assigned a tag with a specific key,
@@ -8014,11 +8031,11 @@ module Aws::EC2
8014
8031
  # * `state` - The state of the AFI (`pending` \| `failed` \|
8015
8032
  # `available` \| `unavailable`).
8016
8033
  #
8017
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
8018
- # to the resource. Specify the key of the tag in the filter name and
8019
- # the value of the tag in the filter value. For example, for the tag
8020
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
8021
- # the filter value.
8034
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
8035
+ # to the resource. Use the tag key in the filter name and the tag
8036
+ # value as the filter value. For example, to find all resources that
8037
+ # have a tag with the key `Owner` and the value `TeamA`, specify
8038
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
8022
8039
  #
8023
8040
  # * `tag-key` - The key of a tag assigned to the resource. Use this
8024
8041
  # filter to find all resources assigned a tag with a specific key,
@@ -8084,28 +8101,27 @@ module Aws::EC2
8084
8101
  # @!attribute [rw] filter
8085
8102
  # One or more filters.
8086
8103
  #
8087
- # * `instance-family` - The instance family of the offering (e.g.,
8088
- # `m4`).
8104
+ # * `instance-family` - The instance family of the offering (for
8105
+ # example, `m4`).
8089
8106
  #
8090
8107
  # * `payment-option` - The payment option (`NoUpfront` \|
8091
8108
  # `PartialUpfront` \| `AllUpfront`).
8092
8109
  # @return [Array<Types::Filter>]
8093
8110
  #
8094
8111
  # @!attribute [rw] max_duration
8095
- # This is the maximum duration of the reservation you'd like to
8096
- # purchase, specified in seconds. Reservations are available in
8097
- # one-year and three-year terms. The number of seconds specified must
8098
- # be the number of seconds in a year (365x24x60x60) times one of the
8099
- # supported durations (1 or 3). For example, specify 94608000 for
8100
- # three years.
8112
+ # This is the maximum duration of the reservation to purchase,
8113
+ # specified in seconds. Reservations are available in one-year and
8114
+ # three-year terms. The number of seconds specified must be the number
8115
+ # of seconds in a year (365x24x60x60) times one of the supported
8116
+ # durations (1 or 3). For example, specify 94608000 for three years.
8101
8117
  # @return [Integer]
8102
8118
  #
8103
8119
  # @!attribute [rw] max_results
8104
8120
  # The maximum number of results to return for the request in a single
8105
8121
  # page. The remaining results can be seen by sending another request
8106
8122
  # with the returned `nextToken` value. This value can be between 5 and
8107
- # 500; if `maxResults` is given a larger value than 500, you will
8108
- # receive an error.
8123
+ # 500. If `maxResults` is given a larger value than 500, you receive
8124
+ # an error.
8109
8125
  # @return [Integer]
8110
8126
  #
8111
8127
  # @!attribute [rw] min_duration
@@ -8172,7 +8188,7 @@ module Aws::EC2
8172
8188
  # @!attribute [rw] filter
8173
8189
  # One or more filters.
8174
8190
  #
8175
- # * `instance-family` - The instance family (e.g., `m4`).
8191
+ # * `instance-family` - The instance family (for example, `m4`).
8176
8192
  #
8177
8193
  # * `payment-option` - The payment option (`NoUpfront` \|
8178
8194
  # `PartialUpfront` \| `AllUpfront`).
@@ -8189,8 +8205,8 @@ module Aws::EC2
8189
8205
  # The maximum number of results to return for the request in a single
8190
8206
  # page. The remaining results can be seen by sending another request
8191
8207
  # with the returned `nextToken` value. This value can be between 5 and
8192
- # 500; if `maxResults` is given a larger value than 500, you will
8193
- # receive an error.
8208
+ # 500.If `maxResults` is given a larger value than 500, you receive an
8209
+ # error.
8194
8210
  # @return [Integer]
8195
8211
  #
8196
8212
  # @!attribute [rw] next_token
@@ -8249,7 +8265,7 @@ module Aws::EC2
8249
8265
  #
8250
8266
  # * `availability-zone` - The Availability Zone of the host.
8251
8267
  #
8252
- # * `client-token` - The idempotency token you provided when you
8268
+ # * `client-token` - The idempotency token that you provided when you
8253
8269
  # allocated the host.
8254
8270
  #
8255
8271
  # * `host-reservation-id` - The ID of the reservation assigned to this
@@ -8276,8 +8292,8 @@ module Aws::EC2
8276
8292
  # The maximum number of results to return for the request in a single
8277
8293
  # page. The remaining results can be seen by sending another request
8278
8294
  # with the returned `nextToken` value. This value can be between 5 and
8279
- # 500; if `maxResults` is given a larger value than 500, you will
8280
- # receive an error. You cannot specify this parameter and the host IDs
8295
+ # 500. If `maxResults` is given a larger value than 500, you receive
8296
+ # an error. You cannot specify this parameter and the host IDs
8281
8297
  # parameter in the same request.
8282
8298
  # @return [Integer]
8283
8299
  #
@@ -8610,11 +8626,11 @@ module Aws::EC2
8610
8626
  # * `sriov-net-support` - A value of `simple` indicates that enhanced
8611
8627
  # networking with the Intel 82599 VF interface is enabled.
8612
8628
  #
8613
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
8614
- # to the resource. Specify the key of the tag in the filter name and
8615
- # the value of the tag in the filter value. For example, for the tag
8616
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
8617
- # the filter value.
8629
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
8630
+ # to the resource. Use the tag key in the filter name and the tag
8631
+ # value as the filter value. For example, to find all resources that
8632
+ # have a tag with the key `Owner` and the value `TeamA`, specify
8633
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
8618
8634
  #
8619
8635
  # * `tag-key` - The key of a tag assigned to the resource. Use this
8620
8636
  # filter to find all resources assigned a tag with a specific key,
@@ -8971,10 +8987,11 @@ module Aws::EC2
8971
8987
  # event (for example, `2014-09-15T17:15:20.000Z`).
8972
8988
  #
8973
8989
  # * `instance-state-code` - The code for the instance state, as a
8974
- # 16-bit unsigned integer. The high byte is an opaque internal value
8975
- # and should be ignored. The low byte is set based on the state
8976
- # represented. The valid values are 0 (pending), 16 (running), 32
8977
- # (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).
8990
+ # 16-bit unsigned integer. The high byte is used for internal
8991
+ # purposes and should be ignored. The low byte is set based on the
8992
+ # state represented. The valid values are 0 (pending), 16 (running),
8993
+ # 32 (shutting-down), 48 (terminated), 64 (stopping), and 80
8994
+ # (stopped).
8978
8995
  #
8979
8996
  # * `instance-state-name` - The state of the instance (`pending` \|
8980
8997
  # `running` \| `shutting-down` \| `terminated` \| `stopping` \|
@@ -9135,7 +9152,7 @@ module Aws::EC2
9135
9152
  # or a Scheduled Instance (`spot` \| `scheduled`).
9136
9153
  #
9137
9154
  # * `instance-state-code` - The state of the instance, as a 16-bit
9138
- # unsigned integer. The high byte is an opaque internal value and
9155
+ # unsigned integer. The high byte is used for internal purposes and
9139
9156
  # should be ignored. The low byte is set based on the state
9140
9157
  # represented. The valid values are: 0 (pending), 16 (running), 32
9141
9158
  # (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).
@@ -9325,14 +9342,14 @@ module Aws::EC2
9325
9342
  #
9326
9343
  # * `subnet-id` - The ID of the subnet for the instance.
9327
9344
  #
9328
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
9329
- # to the resource. Specify the key of the tag in the filter name and
9330
- # the value of the tag in the filter value. For example, for the tag
9331
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
9332
- # the filter value.
9345
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
9346
+ # to the resource. Use the tag key in the filter name and the tag
9347
+ # value as the filter value. For example, to find all resources that
9348
+ # have a tag with the key `Owner` and the value `TeamA`, specify
9349
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
9333
9350
  #
9334
9351
  # * `tag-key` - The key of a tag assigned to the resource. Use this
9335
- # filter to find all resources assigned a tag with a specific key,
9352
+ # filter to find all resources that have a tag with a specific key,
9336
9353
  # regardless of the tag value.
9337
9354
  #
9338
9355
  # * `tenancy` - The tenancy of an instance (`dedicated` \| `default`
@@ -9426,11 +9443,11 @@ module Aws::EC2
9426
9443
  #
9427
9444
  # * `internet-gateway-id` - The ID of the Internet gateway.
9428
9445
  #
9429
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
9430
- # to the resource. Specify the key of the tag in the filter name and
9431
- # the value of the tag in the filter value. For example, for the tag
9432
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
9433
- # the filter value.
9446
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
9447
+ # to the resource. Use the tag key in the filter name and the tag
9448
+ # value as the filter value. For example, to find all resources that
9449
+ # have a tag with the key `Owner` and the value `TeamA`, specify
9450
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
9434
9451
  #
9435
9452
  # * `tag-key` - The key of a tag assigned to the resource. Use this
9436
9453
  # filter to find all resources assigned a tag with a specific key,
@@ -9683,11 +9700,11 @@ module Aws::EC2
9683
9700
  #
9684
9701
  # * `launch-template-name` - The name of the launch template.
9685
9702
  #
9686
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
9687
- # to the resource. Specify the key of the tag in the filter name and
9688
- # the value of the tag in the filter value. For example, for the tag
9689
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
9690
- # the filter value.
9703
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
9704
+ # to the resource. Use the tag key in the filter name and the tag
9705
+ # value as the filter value. For example, to find all resources that
9706
+ # have a tag with the key `Owner` and the value `TeamA`, specify
9707
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
9691
9708
  #
9692
9709
  # * `tag-key` - The key of a tag assigned to the resource. Use this
9693
9710
  # filter to find all resources assigned a tag with a specific key,
@@ -9843,11 +9860,11 @@ module Aws::EC2
9843
9860
  # * `subnet-id` - The ID of the subnet in which the NAT gateway
9844
9861
  # resides.
9845
9862
  #
9846
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
9847
- # to the resource. Specify the key of the tag in the filter name and
9848
- # the value of the tag in the filter value. For example, for the tag
9849
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
9850
- # the filter value.
9863
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
9864
+ # to the resource. Use the tag key in the filter name and the tag
9865
+ # value as the filter value. For example, to find all resources that
9866
+ # have a tag with the key `Owner` and the value `TeamA`, specify
9867
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
9851
9868
  #
9852
9869
  # * `tag-key` - The key of a tag assigned to the resource. Use this
9853
9870
  # filter to find all resources assigned a tag with a specific key,
@@ -9961,11 +9978,11 @@ module Aws::EC2
9961
9978
  #
9962
9979
  # * `network-acl-id` - The ID of the network ACL.
9963
9980
  #
9964
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
9965
- # to the resource. Specify the key of the tag in the filter name and
9966
- # the value of the tag in the filter value. For example, for the tag
9967
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
9968
- # the filter value.
9981
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
9982
+ # to the resource. Use the tag key in the filter name and the tag
9983
+ # value as the filter value. For example, to find all resources that
9984
+ # have a tag with the key `Owner` and the value `TeamA`, specify
9985
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
9969
9986
  #
9970
9987
  # * `tag-key` - The key of a tag assigned to the resource. Use this
9971
9988
  # filter to find all resources assigned a tag with a specific key,
@@ -10273,11 +10290,11 @@ module Aws::EC2
10273
10290
  #
10274
10291
  # * `subnet-id` - The ID of the subnet for the network interface.
10275
10292
  #
10276
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
10277
- # to the resource. Specify the key of the tag in the filter name and
10278
- # the value of the tag in the filter value. For example, for the tag
10279
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
10280
- # the filter value.
10293
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
10294
+ # to the resource. Use the tag key in the filter name and the tag
10295
+ # value as the filter value. For example, to find all resources that
10296
+ # have a tag with the key `Owner` and the value `TeamA`, specify
10297
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
10281
10298
  #
10282
10299
  # * `tag-key` - The key of a tag assigned to the resource. Use this
10283
10300
  # filter to find all resources assigned a tag with a specific key,
@@ -11008,11 +11025,11 @@ module Aws::EC2
11008
11025
  # * `state` - The state of the Reserved Instance (`payment-pending` \|
11009
11026
  # `active` \| `payment-failed` \| `retired`).
11010
11027
  #
11011
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
11012
- # to the resource. Specify the key of the tag in the filter name and
11013
- # the value of the tag in the filter value. For example, for the tag
11014
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
11015
- # the filter value.
11028
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
11029
+ # to the resource. Use the tag key in the filter name and the tag
11030
+ # value as the filter value. For example, to find all resources that
11031
+ # have a tag with the key `Owner` and the value `TeamA`, specify
11032
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
11016
11033
  #
11017
11034
  # * `tag-key` - The key of a tag assigned to the resource. Use this
11018
11035
  # filter to find all resources assigned a tag with a specific key,
@@ -11140,11 +11157,11 @@ module Aws::EC2
11140
11157
  # * `route.vpc-peering-connection-id` - The ID of a VPC peering
11141
11158
  # connection specified in a route in the table.
11142
11159
  #
11143
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
11144
- # to the resource. Specify the key of the tag in the filter name and
11145
- # the value of the tag in the filter value. For example, for the tag
11146
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
11147
- # the filter value.
11160
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
11161
+ # to the resource. Use the tag key in the filter name and the tag
11162
+ # value as the filter value. For example, to find all resources that
11163
+ # have a tag with the key `Owner` and the value `TeamA`, specify
11164
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
11148
11165
  #
11149
11166
  # * `tag-key` - The key of a tag assigned to the resource. Use this
11150
11167
  # filter to find all resources assigned a tag with a specific key,
@@ -11523,6 +11540,12 @@ module Aws::EC2
11523
11540
  # * `owner-id` - The AWS account ID of the owner of the security
11524
11541
  # group.
11525
11542
  #
11543
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
11544
+ # to the resource. Use the tag key in the filter name and the tag
11545
+ # value as the filter value. For example, to find all resources that
11546
+ # have a tag with the key `Owner` and the value `TeamA`, specify
11547
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
11548
+ #
11526
11549
  # * `tag-key` - The key of a tag assigned to the resource. Use this
11527
11550
  # filter to find all resources assigned a tag with a specific key,
11528
11551
  # regardless of the tag value.
@@ -11696,11 +11719,11 @@ module Aws::EC2
11696
11719
  # * `status` - The status of the snapshot (`pending` \| `completed` \|
11697
11720
  # `error`).
11698
11721
  #
11699
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
11700
- # to the resource. Specify the key of the tag in the filter name and
11701
- # the value of the tag in the filter value. For example, for the tag
11702
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
11703
- # the filter value.
11722
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
11723
+ # to the resource. Use the tag key in the filter name and the tag
11724
+ # value as the filter value. For example, to find all resources that
11725
+ # have a tag with the key `Owner` and the value `TeamA`, specify
11726
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
11704
11727
  #
11705
11728
  # * `tag-key` - The key of a tag assigned to the resource. Use this
11706
11729
  # filter to find all resources assigned a tag with a specific key,
@@ -12176,11 +12199,11 @@ module Aws::EC2
12176
12199
  # * `status-message` - The message explaining the status of the Spot
12177
12200
  # Instance request.
12178
12201
  #
12179
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
12180
- # to the resource. Specify the key of the tag in the filter name and
12181
- # the value of the tag in the filter value. For example, for the tag
12182
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
12183
- # the filter value.
12202
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
12203
+ # to the resource. Use the tag key in the filter name and the tag
12204
+ # value as the filter value. For example, to find all resources that
12205
+ # have a tag with the key `Owner` and the value `TeamA`, specify
12206
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
12184
12207
  #
12185
12208
  # * `tag-key` - The key of a tag assigned to the resource. Use this
12186
12209
  # filter to find all resources assigned a tag with a specific key,
@@ -12457,11 +12480,11 @@ module Aws::EC2
12457
12480
  #
12458
12481
  # * `subnet-id` - The ID of the subnet.
12459
12482
  #
12460
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
12461
- # to the resource. Specify the key of the tag in the filter name and
12462
- # the value of the tag in the filter value. For example, for the tag
12463
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
12464
- # the filter value.
12483
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
12484
+ # to the resource. Use the tag key in the filter name and the tag
12485
+ # value as the filter value. For example, to find all resources that
12486
+ # have a tag with the key `Owner` and the value `TeamA`, specify
12487
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
12465
12488
  #
12466
12489
  # * `tag-key` - The key of a tag assigned to the resource. Use this
12467
12490
  # filter to find all resources assigned a tag with a specific key,
@@ -12572,7 +12595,7 @@ module Aws::EC2
12572
12595
  #
12573
12596
  # @!attribute [rw] next_token
12574
12597
  # The token to use to retrieve the next page of results. This value is
12575
- # `null` when there are no more results to return..
12598
+ # `null` when there are no more results to return.
12576
12599
  # @return [String]
12577
12600
  #
12578
12601
  # @!attribute [rw] tags
@@ -12883,11 +12906,11 @@ module Aws::EC2
12883
12906
  # * `status` - The status of the volume (`creating` \| `available` \|
12884
12907
  # `in-use` \| `deleting` \| `deleted` \| `error`).
12885
12908
  #
12886
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
12887
- # to the resource. Specify the key of the tag in the filter name and
12888
- # the value of the tag in the filter value. For example, for the tag
12889
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
12890
- # the filter value.
12909
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
12910
+ # to the resource. Use the tag key in the filter name and the tag
12911
+ # value as the filter value. For example, to find all resources that
12912
+ # have a tag with the key `Owner` and the value `TeamA`, specify
12913
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
12891
12914
  #
12892
12915
  # * `tag-key` - The key of a tag assigned to the resource. Use this
12893
12916
  # filter to find all resources assigned a tag with a specific key,
@@ -13105,11 +13128,11 @@ module Aws::EC2
13105
13128
  # * `is-classic-link-enabled` - Whether the VPC is enabled for
13106
13129
  # ClassicLink (`true` \| `false`).
13107
13130
  #
13108
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
13109
- # to the resource. Specify the key of the tag in the filter name and
13110
- # the value of the tag in the filter value. For example, for the tag
13111
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
13112
- # the filter value.
13131
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
13132
+ # to the resource. Use the tag key in the filter name and the tag
13133
+ # value as the filter value. For example, to find all resources that
13134
+ # have a tag with the key `Owner` and the value `TeamA`, specify
13135
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
13113
13136
  #
13114
13137
  # * `tag-key` - The key of a tag assigned to the resource. Use this
13115
13138
  # filter to find all resources assigned a tag with a specific key,
@@ -13681,11 +13704,11 @@ module Aws::EC2
13681
13704
  # * `status-message` - A message that provides more information about
13682
13705
  # the status of the VPC peering connection, if applicable.
13683
13706
  #
13684
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
13685
- # to the resource. Specify the key of the tag in the filter name and
13686
- # the value of the tag in the filter value. For example, for the tag
13687
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
13688
- # the filter value.
13707
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
13708
+ # to the resource. Use the tag key in the filter name and the tag
13709
+ # value as the filter value. For example, to find all resources that
13710
+ # have a tag with the key `Owner` and the value `TeamA`, specify
13711
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
13689
13712
  #
13690
13713
  # * `tag-key` - The key of a tag assigned to the resource. Use this
13691
13714
  # filter to find all resources assigned a tag with a specific key,
@@ -13778,11 +13801,11 @@ module Aws::EC2
13778
13801
  #
13779
13802
  # * `state` - The state of the VPC (`pending` \| `available`).
13780
13803
  #
13781
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
13782
- # to the resource. Specify the key of the tag in the filter name and
13783
- # the value of the tag in the filter value. For example, for the tag
13784
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
13785
- # the filter value.
13804
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
13805
+ # to the resource. Use the tag key in the filter name and the tag
13806
+ # value as the filter value. For example, to find all resources that
13807
+ # have a tag with the key `Owner` and the value `TeamA`, specify
13808
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
13786
13809
  #
13787
13810
  # * `tag-key` - The key of a tag assigned to the resource. Use this
13788
13811
  # filter to find all resources assigned a tag with a specific key,
@@ -13864,11 +13887,11 @@ module Aws::EC2
13864
13887
  # * `bgp-asn` - The BGP Autonomous System Number (ASN) associated with
13865
13888
  # a BGP device.
13866
13889
  #
13867
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
13868
- # to the resource. Specify the key of the tag in the filter name and
13869
- # the value of the tag in the filter value. For example, for the tag
13870
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
13871
- # the filter value.
13890
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
13891
+ # to the resource. Use the tag key in the filter name and the tag
13892
+ # value as the filter value. For example, to find all resources that
13893
+ # have a tag with the key `Owner` and the value `TeamA`, specify
13894
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
13872
13895
  #
13873
13896
  # * `tag-key` - The key of a tag assigned to the resource. Use this
13874
13897
  # filter to find all resources assigned a tag with a specific key,
@@ -13952,11 +13975,11 @@ module Aws::EC2
13952
13975
  # * `state` - The state of the virtual private gateway (`pending` \|
13953
13976
  # `available` \| `deleting` \| `deleted`).
13954
13977
  #
13955
- # * `tag`\:*key*=*value* - The key/value combination of a tag assigned
13956
- # to the resource. Specify the key of the tag in the filter name and
13957
- # the value of the tag in the filter value. For example, for the tag
13958
- # Purpose=X, specify `tag:Purpose` for the filter name and `X` for
13959
- # the filter value.
13978
+ # * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
13979
+ # to the resource. Use the tag key in the filter name and the tag
13980
+ # value as the filter value. For example, to find all resources that
13981
+ # have a tag with the key `Owner` and the value `TeamA`, specify
13982
+ # `tag:Owner` for the filter name and `TeamA` for the filter value.
13960
13983
  #
13961
13984
  # * `tag-key` - The key of a tag assigned to the resource. Use this
13962
13985
  # filter to find all resources assigned a tag with a specific key,
@@ -15451,6 +15474,10 @@ module Aws::EC2
15451
15474
  # The configuration of Spot Instances in an EC2 Fleet.
15452
15475
  # @return [Types::SpotOptions]
15453
15476
  #
15477
+ # @!attribute [rw] on_demand_options
15478
+ # The allocation strategy of On-Demand Instances in an EC2 Fleet.
15479
+ # @return [Types::OnDemandOptions]
15480
+ #
15454
15481
  # @!attribute [rw] tags
15455
15482
  # The tags for an EC2 Fleet resource.
15456
15483
  # @return [Array<Types::Tag>]
@@ -15474,6 +15501,7 @@ module Aws::EC2
15474
15501
  :valid_until,
15475
15502
  :replace_unhealthy_instances,
15476
15503
  :spot_options,
15504
+ :on_demand_options,
15477
15505
  :tags)
15478
15506
  include Aws::Structure
15479
15507
  end
@@ -15515,6 +15543,7 @@ module Aws::EC2
15515
15543
  # subnet_id: "String",
15516
15544
  # availability_zone: "String",
15517
15545
  # weighted_capacity: 1.0,
15546
+ # priority: 1.0,
15518
15547
  # },
15519
15548
  # ],
15520
15549
  # }
@@ -15560,6 +15589,16 @@ module Aws::EC2
15560
15589
  # The number of units provided by the specified instance type.
15561
15590
  # @return [Float]
15562
15591
  #
15592
+ # @!attribute [rw] priority
15593
+ # The priority for the launch template override. If
15594
+ # **AllocationStrategy** is set to `prioritized`, EC2 Fleet uses
15595
+ # priority to determine which launch template override to use first in
15596
+ # fulfilling On-Demand capacity. The highest priority is launched
15597
+ # first. Valid values are whole numbers starting at `0`. The lower the
15598
+ # number, the higher the priority. If no number is set, the override
15599
+ # has the lowest priority.
15600
+ # @return [Float]
15601
+ #
15563
15602
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FleetLaunchTemplateOverrides AWS API Documentation
15564
15603
  #
15565
15604
  class FleetLaunchTemplateOverrides < Struct.new(
@@ -15567,7 +15606,8 @@ module Aws::EC2
15567
15606
  :max_price,
15568
15607
  :subnet_id,
15569
15608
  :availability_zone,
15570
- :weighted_capacity)
15609
+ :weighted_capacity,
15610
+ :priority)
15571
15611
  include Aws::Structure
15572
15612
  end
15573
15613
 
@@ -15582,6 +15622,7 @@ module Aws::EC2
15582
15622
  # subnet_id: "String",
15583
15623
  # availability_zone: "String",
15584
15624
  # weighted_capacity: 1.0,
15625
+ # priority: 1.0,
15585
15626
  # }
15586
15627
  #
15587
15628
  # @!attribute [rw] instance_type
@@ -15605,6 +15646,16 @@ module Aws::EC2
15605
15646
  # The number of units provided by the specified instance type.
15606
15647
  # @return [Float]
15607
15648
  #
15649
+ # @!attribute [rw] priority
15650
+ # The priority for the launch template override. If
15651
+ # **AllocationStrategy** is set to `prioritized`, EC2 Fleet uses
15652
+ # priority to determine which launch template override to use first in
15653
+ # fulfilling On-Demand capacity. The highest priority is launched
15654
+ # first. Valid values are whole numbers starting at `0`. The lower the
15655
+ # number, the higher the priority. If no number is set, the launch
15656
+ # template override has the lowest priority.
15657
+ # @return [Float]
15658
+ #
15608
15659
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FleetLaunchTemplateOverridesRequest AWS API Documentation
15609
15660
  #
15610
15661
  class FleetLaunchTemplateOverridesRequest < Struct.new(
@@ -15612,7 +15663,8 @@ module Aws::EC2
15612
15663
  :max_price,
15613
15664
  :subnet_id,
15614
15665
  :availability_zone,
15615
- :weighted_capacity)
15666
+ :weighted_capacity,
15667
+ :priority)
15616
15668
  include Aws::Structure
15617
15669
  end
15618
15670
 
@@ -16006,8 +16058,8 @@ module Aws::EC2
16006
16058
  # }
16007
16059
  #
16008
16060
  # @!attribute [rw] host_id_set
16009
- # The ID/s of the Dedicated Host/s that the reservation will be
16010
- # associated with.
16061
+ # The IDs of the Dedicated Hosts with which the reservation is
16062
+ # associated.
16011
16063
  # @return [Array<String>]
16012
16064
  #
16013
16065
  # @!attribute [rw] offering_id
@@ -16029,7 +16081,7 @@ module Aws::EC2
16029
16081
  # @return [String]
16030
16082
  #
16031
16083
  # @!attribute [rw] purchase
16032
- # The purchase information of the Dedicated Host Reservation and the
16084
+ # The purchase information of the Dedicated Host reservation and the
16033
16085
  # Dedicated Hosts associated with it.
16034
16086
  # @return [Array<Types::Purchase>]
16035
16087
  #
@@ -16336,8 +16388,8 @@ module Aws::EC2
16336
16388
  # @return [Types::AvailableCapacity]
16337
16389
  #
16338
16390
  # @!attribute [rw] client_token
16339
- # Unique, case-sensitive identifier you provide to ensure idempotency
16340
- # of the request. For more information, see [How to Ensure
16391
+ # Unique, case-sensitive identifier that you provide to ensure
16392
+ # idempotency of the request. For more information, see [How to Ensure
16341
16393
  # Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
16342
16394
  #
16343
16395
  #
@@ -18608,8 +18660,8 @@ module Aws::EC2
18608
18660
  # Describes the current state of an instance.
18609
18661
  #
18610
18662
  # @!attribute [rw] code
18611
- # The low byte represents the state. The high byte is an opaque
18612
- # internal value and should be ignored.
18663
+ # The low byte represents the state. The high byte is used for
18664
+ # internal purposes and should be ignored.
18613
18665
  #
18614
18666
  # * `0`\: `pending`
18615
18667
  #
@@ -19348,6 +19400,7 @@ module Aws::EC2
19348
19400
  # subnet_id: "String",
19349
19401
  # availability_zone: "String",
19350
19402
  # weighted_capacity: 1.0,
19403
+ # priority: 1.0,
19351
19404
  # },
19352
19405
  # ],
19353
19406
  # }
@@ -19814,6 +19867,7 @@ module Aws::EC2
19814
19867
  # subnet_id: "String",
19815
19868
  # availability_zone: "String",
19816
19869
  # weighted_capacity: 1.0,
19870
+ # priority: 1.0,
19817
19871
  # }
19818
19872
  #
19819
19873
  # @!attribute [rw] instance_type
@@ -19837,6 +19891,16 @@ module Aws::EC2
19837
19891
  # The number of units provided by the specified instance type.
19838
19892
  # @return [Float]
19839
19893
  #
19894
+ # @!attribute [rw] priority
19895
+ # The priority for the launch template override. If
19896
+ # **OnDemandAllocationStrategy** is set to `prioritized`, Spot Fleet
19897
+ # uses priority to determine which launch template override to use
19898
+ # first in fulfilling On-Demand capacity. The highest priority is
19899
+ # launched first. Valid values are whole numbers starting at `0`. The
19900
+ # lower the number, the higher the priority. If no number is set, the
19901
+ # launch template override has the lowest priority.
19902
+ # @return [Float]
19903
+ #
19840
19904
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateOverrides AWS API Documentation
19841
19905
  #
19842
19906
  class LaunchTemplateOverrides < Struct.new(
@@ -19844,7 +19908,8 @@ module Aws::EC2
19844
19908
  :spot_price,
19845
19909
  :subnet_id,
19846
19910
  :availability_zone,
19847
- :weighted_capacity)
19911
+ :weighted_capacity,
19912
+ :priority)
19848
19913
  include Aws::Structure
19849
19914
  end
19850
19915
 
@@ -20495,7 +20560,7 @@ module Aws::EC2
20495
20560
  # @return [String]
20496
20561
  #
20497
20562
  # @!attribute [rw] host_ids
20498
- # The host IDs of the Dedicated Hosts you want to modify.
20563
+ # The IDs of the Dedicated Hosts to modify.
20499
20564
  # @return [Array<String>]
20500
20565
  #
20501
20566
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyHostsRequest AWS API Documentation
@@ -22650,6 +22715,51 @@ module Aws::EC2
22650
22715
  include Aws::Structure
22651
22716
  end
22652
22717
 
22718
+ # The allocation strategy of On-Demand Instances in an EC2 Fleet.
22719
+ #
22720
+ # @!attribute [rw] allocation_strategy
22721
+ # The order of the launch template overrides to use in fulfilling
22722
+ # On-Demand capacity. If you specify `lowest-price`, EC2 Fleet uses
22723
+ # price to determine the order, launching the lowest price first. If
22724
+ # you specify `prioritized`, EC2 Fleet uses the priority that you
22725
+ # assigned to each launch template override, launching the highest
22726
+ # priority first. If you do not specify a value, EC2 Fleet defaults to
22727
+ # `lowest-price`.
22728
+ # @return [String]
22729
+ #
22730
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/OnDemandOptions AWS API Documentation
22731
+ #
22732
+ class OnDemandOptions < Struct.new(
22733
+ :allocation_strategy)
22734
+ include Aws::Structure
22735
+ end
22736
+
22737
+ # The allocation strategy of On-Demand Instances in an EC2 Fleet.
22738
+ #
22739
+ # @note When making an API call, you may pass OnDemandOptionsRequest
22740
+ # data as a hash:
22741
+ #
22742
+ # {
22743
+ # allocation_strategy: "lowest-price", # accepts lowest-price, prioritized
22744
+ # }
22745
+ #
22746
+ # @!attribute [rw] allocation_strategy
22747
+ # The order of the launch template overrides to use in fulfilling
22748
+ # On-Demand capacity. If you specify `lowest-price`, EC2 Fleet uses
22749
+ # price to determine the order, launching the lowest price first. If
22750
+ # you specify `prioritized`, EC2 Fleet uses the priority that you
22751
+ # assigned to each launch template override, launching the highest
22752
+ # priority first. If you do not specify a value, EC2 Fleet defaults to
22753
+ # `lowest-price`.
22754
+ # @return [String]
22755
+ #
22756
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/OnDemandOptionsRequest AWS API Documentation
22757
+ #
22758
+ class OnDemandOptionsRequest < Struct.new(
22759
+ :allocation_strategy)
22760
+ include Aws::Structure
22761
+ end
22762
+
22653
22763
  # Describes the data that identifies an Amazon FPGA image (AFI) on the
22654
22764
  # PCI bus.
22655
22765
  #
@@ -23220,15 +23330,15 @@ module Aws::EC2
23220
23330
  # @return [String]
23221
23331
  #
23222
23332
  # @!attribute [rw] host_id_set
23223
- # The ID/s of the Dedicated Host/s that the reservation will be
23224
- # associated with.
23333
+ # The IDs of the Dedicated Hosts with which the reservation will be
23334
+ # associated.
23225
23335
  # @return [Array<String>]
23226
23336
  #
23227
23337
  # @!attribute [rw] limit_price
23228
23338
  # The specified limit is checked against the total upfront cost of the
23229
23339
  # reservation (calculated as the offering's upfront cost multiplied
23230
23340
  # by the host count). If the total upfront cost is greater than the
23231
- # specified price limit, the request will fail. This is used to ensure
23341
+ # specified price limit, the request fails. This is used to ensure
23232
23342
  # that the purchase does not exceed the expected upfront cost of the
23233
23343
  # purchase. At this time, the only supported currency is `USD`. For
23234
23344
  # example, to indicate a limit price of USD 100, specify 100.00.
@@ -23252,7 +23362,7 @@ module Aws::EC2
23252
23362
  # @!attribute [rw] client_token
23253
23363
  # Unique, case-sensitive identifier you provide to ensure idempotency
23254
23364
  # of the request. For more information, see [How to Ensure
23255
- # Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*
23365
+ # Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
23256
23366
  #
23257
23367
  #
23258
23368
  #
@@ -23274,8 +23384,8 @@ module Aws::EC2
23274
23384
  # @return [String]
23275
23385
  #
23276
23386
  # @!attribute [rw] total_upfront_price
23277
- # The total amount that will be charged to your account when you
23278
- # purchase the reservation.
23387
+ # The total amount charged to your account when you purchase the
23388
+ # reservation.
23279
23389
  # @return [String]
23280
23390
  #
23281
23391
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PurchaseHostReservationResult AWS API Documentation
@@ -23779,7 +23889,7 @@ module Aws::EC2
23779
23889
  # }
23780
23890
  #
23781
23891
  # @!attribute [rw] host_ids
23782
- # The IDs of the Dedicated Hosts you want to release.
23892
+ # The IDs of the Dedicated Hosts to release.
23783
23893
  # @return [Array<String>]
23784
23894
  #
23785
23895
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ReleaseHostsRequest AWS API Documentation
@@ -24501,6 +24611,7 @@ module Aws::EC2
24501
24611
  # dry_run: false,
24502
24612
  # spot_fleet_request_config: { # required
24503
24613
  # allocation_strategy: "lowestPrice", # accepts lowestPrice, diversified
24614
+ # on_demand_allocation_strategy: "lowestPrice", # accepts lowestPrice, prioritized
24504
24615
  # client_token: "String",
24505
24616
  # excess_capacity_termination_policy: "noTermination", # accepts noTermination, default
24506
24617
  # fulfilled_capacity: 1.0,
@@ -24605,6 +24716,7 @@ module Aws::EC2
24605
24716
  # subnet_id: "String",
24606
24717
  # availability_zone: "String",
24607
24718
  # weighted_capacity: 1.0,
24719
+ # priority: 1.0,
24608
24720
  # },
24609
24721
  # ],
24610
24722
  # },
@@ -24634,6 +24746,7 @@ module Aws::EC2
24634
24746
  # ],
24635
24747
  # },
24636
24748
  # },
24749
+ # instance_pools_to_use_count: 1,
24637
24750
  # },
24638
24751
  # }
24639
24752
  #
@@ -26733,6 +26846,10 @@ module Aws::EC2
26733
26846
  #
26734
26847
  # @!attribute [rw] instance_market_options
26735
26848
  # The market (purchasing) option for the instances.
26849
+ #
26850
+ # For RunInstances, persistent Spot Instance requests are only
26851
+ # supported when **InstanceInterruptionBehavior** is set to either
26852
+ # `hibernate` or `stop`.
26736
26853
  # @return [Types::InstanceMarketOptionsRequest]
26737
26854
  #
26738
26855
  # @!attribute [rw] credit_specification
@@ -28573,6 +28690,7 @@ module Aws::EC2
28573
28690
  #
28574
28691
  # {
28575
28692
  # allocation_strategy: "lowestPrice", # accepts lowestPrice, diversified
28693
+ # on_demand_allocation_strategy: "lowestPrice", # accepts lowestPrice, prioritized
28576
28694
  # client_token: "String",
28577
28695
  # excess_capacity_termination_policy: "noTermination", # accepts noTermination, default
28578
28696
  # fulfilled_capacity: 1.0,
@@ -28677,6 +28795,7 @@ module Aws::EC2
28677
28795
  # subnet_id: "String",
28678
28796
  # availability_zone: "String",
28679
28797
  # weighted_capacity: 1.0,
28798
+ # priority: 1.0,
28680
28799
  # },
28681
28800
  # ],
28682
28801
  # },
@@ -28706,6 +28825,7 @@ module Aws::EC2
28706
28825
  # ],
28707
28826
  # },
28708
28827
  # },
28828
+ # instance_pools_to_use_count: 1,
28709
28829
  # }
28710
28830
  #
28711
28831
  # @!attribute [rw] allocation_strategy
@@ -28713,6 +28833,16 @@ module Aws::EC2
28713
28833
  # specified by the Spot Fleet request. The default is `lowestPrice`.
28714
28834
  # @return [String]
28715
28835
  #
28836
+ # @!attribute [rw] on_demand_allocation_strategy
28837
+ # The order of the launch template overrides to use in fulfilling
28838
+ # On-Demand capacity. If you specify `lowestPrice`, Spot Fleet uses
28839
+ # price to determine the order, launching the lowest price first. If
28840
+ # you specify `prioritized`, Spot Fleet uses the priority that you
28841
+ # assign to each Spot Fleet launch template override, launching the
28842
+ # highest priority first. If you do not specify a value, Spot Fleet
28843
+ # defaults to `lowestPrice`.
28844
+ # @return [String]
28845
+ #
28716
28846
  # @!attribute [rw] client_token
28717
28847
  # A unique, case-sensitive identifier that you provide to ensure the
28718
28848
  # idempotency of your listings. This helps to avoid duplicate
@@ -28825,10 +28955,19 @@ module Aws::EC2
28825
28955
  # CS1, G1, G2, HI1, HS1, M1, M2, M3, and T1.
28826
28956
  # @return [Types::LoadBalancersConfig]
28827
28957
  #
28958
+ # @!attribute [rw] instance_pools_to_use_count
28959
+ # The number of Spot pools across which to allocate your target Spot
28960
+ # capacity. Valid only when Spot **AllocationStrategy** is set to
28961
+ # `lowest-price`. Spot Fleet selects the cheapest Spot pools and
28962
+ # evenly allocates your target Spot capacity across the number of Spot
28963
+ # pools that you specify.
28964
+ # @return [Integer]
28965
+ #
28828
28966
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SpotFleetRequestConfigData AWS API Documentation
28829
28967
  #
28830
28968
  class SpotFleetRequestConfigData < Struct.new(
28831
28969
  :allocation_strategy,
28970
+ :on_demand_allocation_strategy,
28832
28971
  :client_token,
28833
28972
  :excess_capacity_termination_policy,
28834
28973
  :fulfilled_capacity,
@@ -28845,7 +28984,8 @@ module Aws::EC2
28845
28984
  :valid_until,
28846
28985
  :replace_unhealthy_instances,
28847
28986
  :instance_interruption_behavior,
28848
- :load_balancers_config)
28987
+ :load_balancers_config,
28988
+ :instance_pools_to_use_count)
28849
28989
  include Aws::Structure
28850
28990
  end
28851
28991
 
@@ -29072,7 +29212,10 @@ module Aws::EC2
29072
29212
  # @return [String]
29073
29213
  #
29074
29214
  # @!attribute [rw] spot_instance_type
29075
- # The Spot Instance request type.
29215
+ # The Spot Instance request type. For RunInstances, persistent Spot
29216
+ # Instance requests are only supported when
29217
+ # **InstanceInterruptionBehavior** is set to either `hibernate` or
29218
+ # `stop`.
29076
29219
  # @return [String]
29077
29220
  #
29078
29221
  # @!attribute [rw] block_duration_minutes
@@ -29109,7 +29252,7 @@ module Aws::EC2
29109
29252
  #
29110
29253
  # @!attribute [rw] allocation_strategy
29111
29254
  # Indicates how to allocate the target capacity across the Spot pools
29112
- # specified by the Spot Fleet request. The default is `lowestPrice`.
29255
+ # specified by the Spot Fleet request. The default is `lowest-price`.
29113
29256
  # @return [String]
29114
29257
  #
29115
29258
  # @!attribute [rw] instance_interruption_behavior
@@ -29117,11 +29260,20 @@ module Aws::EC2
29117
29260
  # `terminate`.
29118
29261
  # @return [String]
29119
29262
  #
29263
+ # @!attribute [rw] instance_pools_to_use_count
29264
+ # The number of Spot pools across which to allocate your target Spot
29265
+ # capacity. Valid only when **AllocationStrategy** is set to
29266
+ # `lowestPrice`. EC2 Fleet selects the cheapest Spot pools and evenly
29267
+ # allocates your target Spot capacity across the number of Spot pools
29268
+ # that you specify.
29269
+ # @return [Integer]
29270
+ #
29120
29271
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SpotOptions AWS API Documentation
29121
29272
  #
29122
29273
  class SpotOptions < Struct.new(
29123
29274
  :allocation_strategy,
29124
- :instance_interruption_behavior)
29275
+ :instance_interruption_behavior,
29276
+ :instance_pools_to_use_count)
29125
29277
  include Aws::Structure
29126
29278
  end
29127
29279
 
@@ -29133,6 +29285,7 @@ module Aws::EC2
29133
29285
  # {
29134
29286
  # allocation_strategy: "lowest-price", # accepts lowest-price, diversified
29135
29287
  # instance_interruption_behavior: "hibernate", # accepts hibernate, stop, terminate
29288
+ # instance_pools_to_use_count: 1,
29136
29289
  # }
29137
29290
  #
29138
29291
  # @!attribute [rw] allocation_strategy
@@ -29145,11 +29298,20 @@ module Aws::EC2
29145
29298
  # `terminate`.
29146
29299
  # @return [String]
29147
29300
  #
29301
+ # @!attribute [rw] instance_pools_to_use_count
29302
+ # The number of Spot pools across which to allocate your target Spot
29303
+ # capacity. Valid only when Spot **AllocationStrategy** is set to
29304
+ # `lowest-price`. EC2 Fleet selects the cheapest Spot pools and evenly
29305
+ # allocates your target Spot capacity across the number of Spot pools
29306
+ # that you specify.
29307
+ # @return [Integer]
29308
+ #
29148
29309
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SpotOptionsRequest AWS API Documentation
29149
29310
  #
29150
29311
  class SpotOptionsRequest < Struct.new(
29151
29312
  :allocation_strategy,
29152
- :instance_interruption_behavior)
29313
+ :instance_interruption_behavior,
29314
+ :instance_pools_to_use_count)
29153
29315
  include Aws::Structure
29154
29316
  end
29155
29317