aws-sdk-ec2 1.491.0 → 1.493.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.
@@ -4066,6 +4066,18 @@ module Aws::EC2
4066
4066
  # capacity, and changes the Capacity Reservation's state to
4067
4067
  # `cancelled`.
4068
4068
  #
4069
+ # You can cancel a Capacity Reservation that is in the following states:
4070
+ #
4071
+ # * `assessing`
4072
+ #
4073
+ # * `active` and there is no commitment duration or the commitment
4074
+ # duration has elapsed. You can't cancel a future-dated Capacity
4075
+ # Reservation during the commitment duration.
4076
+ #
4077
+ # If a future-dated Capacity Reservation enters the `delayed` state, the
4078
+ # commitment duration is waived, and you can cancel it as soon as it
4079
+ # enters the `active` state.
4080
+ #
4069
4081
  # Instances running in the reserved capacity continue running until you
4070
4082
  # stop them. Stopped instances that target the Capacity Reservation can
4071
4083
  # no longer launch. Modify these instances to either target a different
@@ -5070,30 +5082,28 @@ module Aws::EC2
5070
5082
  end
5071
5083
 
5072
5084
  # Creates a new Capacity Reservation with the specified attributes.
5073
- #
5074
5085
  # Capacity Reservations enable you to reserve capacity for your Amazon
5075
- # EC2 instances in a specific Availability Zone for any duration. This
5076
- # gives you the flexibility to selectively add capacity reservations and
5077
- # still get the Regional RI discounts for that usage. By creating
5078
- # Capacity Reservations, you ensure that you always have access to
5079
- # Amazon EC2 capacity when you need it, for as long as you need it. For
5080
- # more information, see [Capacity Reservations][1] in the *Amazon EC2
5081
- # User Guide*.
5086
+ # EC2 instances in a specific Availability Zone for any duration.
5087
+ #
5088
+ # You can create a Capacity Reservation at any time, and you can choose
5089
+ # when it starts. You can create a Capacity Reservation for immediate
5090
+ # use or you can request a Capacity Reservation for a future date.
5082
5091
  #
5083
- # Your request to create a Capacity Reservation could fail if Amazon EC2
5084
- # does not have sufficient capacity to fulfill the request. If your
5085
- # request fails due to Amazon EC2 capacity constraints, either try again
5086
- # at a later time, try in a different Availability Zone, or request a
5087
- # smaller capacity reservation. If your application is flexible across
5088
- # instance types and sizes, try to create a Capacity Reservation with
5089
- # different instance attributes.
5092
+ # For more information, see [ Reserve compute capacity with On-Demand
5093
+ # Capacity Reservations][1] in the *Amazon EC2 User Guide*.
5090
5094
  #
5091
- # Your request could also fail if the requested quantity exceeds your
5092
- # On-Demand Instance limit for the selected instance type. If your
5093
- # request fails due to limit constraints, increase your On-Demand
5094
- # Instance limit for the required instance type and try again. For more
5095
- # information about increasing your instance limits, see [Amazon EC2
5096
- # Service Quotas][2] in the *Amazon EC2 User Guide*.
5095
+ # Your request to create a Capacity Reservation could fail if:
5096
+ #
5097
+ # * Amazon EC2 does not have sufficient capacity. In this case, try
5098
+ # again at a later time, try in a different Availability Zone, or
5099
+ # request a smaller Capacity Reservation. If your workload is flexible
5100
+ # across instance types and sizes, try with different instance
5101
+ # attributes.
5102
+ #
5103
+ # * The requested quantity exceeds your On-Demand Instance quota. In
5104
+ # this case, increase your On-Demand Instance quota for the requested
5105
+ # instance type and try again. For more information, see [ Amazon EC2
5106
+ # Service Quotas][2] in the *Amazon EC2 User Guide*.
5097
5107
  #
5098
5108
  #
5099
5109
  #
@@ -5110,8 +5120,15 @@ module Aws::EC2
5110
5120
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
5111
5121
  #
5112
5122
  # @option params [required, String] :instance_type
5113
- # The instance type for which to reserve capacity. For more information,
5114
- # see [Instance types][1] in the *Amazon EC2 User Guide*.
5123
+ # The instance type for which to reserve capacity.
5124
+ #
5125
+ # <note markdown="1"> You can request future-dated Capacity Reservations for instance types
5126
+ # in the C, M, R, I, and T instance families only.
5127
+ #
5128
+ # </note>
5129
+ #
5130
+ # For more information, see [Instance types][1] in the *Amazon EC2 User
5131
+ # Guide*.
5115
5132
  #
5116
5133
  #
5117
5134
  #
@@ -5140,6 +5157,13 @@ module Aws::EC2
5140
5157
  # @option params [required, Integer] :instance_count
5141
5158
  # The number of instances for which to reserve capacity.
5142
5159
  #
5160
+ # <note markdown="1"> You can request future-dated Capacity Reservations for an instance
5161
+ # count with a minimum of 100 VPUs. For example, if you request a
5162
+ # future-dated Capacity Reservation for `m5.xlarge` instances, you must
5163
+ # request at least 25 instances (*25 * m5.xlarge = 100 vCPUs*).
5164
+ #
5165
+ # </note>
5166
+ #
5143
5167
  # Valid range: 1 - 1000
5144
5168
  #
5145
5169
  # @option params [Boolean] :ebs_optimized
@@ -5168,6 +5192,9 @@ module Aws::EC2
5168
5192
  # specify 5/31/2019, 13:30:55, the Capacity Reservation is guaranteed to
5169
5193
  # end between 13:30:55 and 14:30:55 on 5/31/2019.
5170
5194
  #
5195
+ # If you are requesting a future-dated Capacity Reservation, you can't
5196
+ # specify an end date and time that is within the commitment duration.
5197
+ #
5171
5198
  # @option params [String] :end_date_type
5172
5199
  # Indicates the way in which the Capacity Reservation ends. A Capacity
5173
5200
  # Reservation can have one of the following end types:
@@ -5195,6 +5222,11 @@ module Aws::EC2
5195
5222
  # Zone), and explicitly target the Capacity Reservation. This ensures
5196
5223
  # that only permitted instances can use the reserved capacity.
5197
5224
  #
5225
+ # <note markdown="1"> If you are requesting a future-dated Capacity Reservation, you must
5226
+ # specify `targeted`.
5227
+ #
5228
+ # </note>
5229
+ #
5198
5230
  # Default: `open`
5199
5231
  #
5200
5232
  # @option params [Array<Types::TagSpecification>] :tag_specifications
@@ -5207,10 +5239,18 @@ module Aws::EC2
5207
5239
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
5208
5240
  #
5209
5241
  # @option params [String] :outpost_arn
5242
+ # <note markdown="1"> Not supported for future-dated Capacity Reservations.
5243
+ #
5244
+ # </note>
5245
+ #
5210
5246
  # The Amazon Resource Name (ARN) of the Outpost on which to create the
5211
5247
  # Capacity Reservation.
5212
5248
  #
5213
5249
  # @option params [String] :placement_group_arn
5250
+ # <note markdown="1"> Not supported for future-dated Capacity Reservations.
5251
+ #
5252
+ # </note>
5253
+ #
5214
5254
  # The Amazon Resource Name (ARN) of the cluster placement group in which
5215
5255
  # to create the Capacity Reservation. For more information, see [
5216
5256
  # Capacity Reservations for cluster placement groups][1] in the *Amazon
@@ -5220,6 +5260,50 @@ module Aws::EC2
5220
5260
  #
5221
5261
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/cr-cpg.html
5222
5262
  #
5263
+ # @option params [Time,DateTime,Date,Integer,String] :start_date
5264
+ # <note markdown="1"> Required for future-dated Capacity Reservations only. To create a
5265
+ # Capacity Reservation for immediate use, omit this parameter.
5266
+ #
5267
+ # </note>
5268
+ #
5269
+ # The date and time at which the future-dated Capacity Reservation
5270
+ # should become available for use, in the ISO8601 format in the UTC time
5271
+ # zone (`YYYY-MM-DDThh:mm:ss.sssZ`).
5272
+ #
5273
+ # You can request a future-dated Capacity Reservation between 5 and 120
5274
+ # days in advance.
5275
+ #
5276
+ # @option params [Integer] :commitment_duration
5277
+ # <note markdown="1"> Required for future-dated Capacity Reservations only. To create a
5278
+ # Capacity Reservation for immediate use, omit this parameter.
5279
+ #
5280
+ # </note>
5281
+ #
5282
+ # Specify a commitment duration, in seconds, for the future-dated
5283
+ # Capacity Reservation.
5284
+ #
5285
+ # The commitment duration is a minimum duration for which you commit to
5286
+ # having the future-dated Capacity Reservation in the `active` state in
5287
+ # your account after it has been delivered.
5288
+ #
5289
+ # For more information, see [ Commitment duration][1].
5290
+ #
5291
+ #
5292
+ #
5293
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/cr-concepts.html#cr-commitment-duration
5294
+ #
5295
+ # @option params [String] :delivery_preference
5296
+ # <note markdown="1"> Required for future-dated Capacity Reservations only. To create a
5297
+ # Capacity Reservation for immediate use, omit this parameter.
5298
+ #
5299
+ # </note>
5300
+ #
5301
+ # Indicates that the requested capacity will be delivered in addition to
5302
+ # any running instances or reserved capacity that you have in your
5303
+ # account at the requested date and time.
5304
+ #
5305
+ # The only supported value is `incremental`.
5306
+ #
5223
5307
  # @return [Types::CreateCapacityReservationResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
5224
5308
  #
5225
5309
  # * {Types::CreateCapacityReservationResult#capacity_reservation #capacity_reservation} => Types::CapacityReservation
@@ -5253,6 +5337,9 @@ module Aws::EC2
5253
5337
  # dry_run: false,
5254
5338
  # outpost_arn: "OutpostArn",
5255
5339
  # placement_group_arn: "PlacementGroupArn",
5340
+ # start_date: Time.now,
5341
+ # commitment_duration: 1,
5342
+ # delivery_preference: "fixed", # accepts fixed, incremental
5256
5343
  # })
5257
5344
  #
5258
5345
  # @example Response structure
@@ -5269,7 +5356,7 @@ module Aws::EC2
5269
5356
  # resp.capacity_reservation.available_instance_count #=> Integer
5270
5357
  # resp.capacity_reservation.ebs_optimized #=> Boolean
5271
5358
  # resp.capacity_reservation.ephemeral_storage #=> Boolean
5272
- # resp.capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed"
5359
+ # resp.capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed", "assessing", "delayed", "unsupported"
5273
5360
  # resp.capacity_reservation.start_date #=> Time
5274
5361
  # resp.capacity_reservation.end_date #=> Time
5275
5362
  # resp.capacity_reservation.end_date_type #=> String, one of "unlimited", "limited"
@@ -5286,6 +5373,9 @@ module Aws::EC2
5286
5373
  # resp.capacity_reservation.capacity_allocations[0].count #=> Integer
5287
5374
  # resp.capacity_reservation.reservation_type #=> String, one of "default", "capacity-block"
5288
5375
  # resp.capacity_reservation.unused_reservation_billing_owner_id #=> String
5376
+ # resp.capacity_reservation.commitment_info.committed_instance_count #=> Integer
5377
+ # resp.capacity_reservation.commitment_info.commitment_end_date #=> Time
5378
+ # resp.capacity_reservation.delivery_preference #=> String, one of "fixed", "incremental"
5289
5379
  #
5290
5380
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateCapacityReservation AWS API Documentation
5291
5381
  #
@@ -5370,7 +5460,7 @@ module Aws::EC2
5370
5460
  # resp.source_capacity_reservation.available_instance_count #=> Integer
5371
5461
  # resp.source_capacity_reservation.ebs_optimized #=> Boolean
5372
5462
  # resp.source_capacity_reservation.ephemeral_storage #=> Boolean
5373
- # resp.source_capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed"
5463
+ # resp.source_capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed", "assessing", "delayed", "unsupported"
5374
5464
  # resp.source_capacity_reservation.start_date #=> Time
5375
5465
  # resp.source_capacity_reservation.end_date #=> Time
5376
5466
  # resp.source_capacity_reservation.end_date_type #=> String, one of "unlimited", "limited"
@@ -5387,6 +5477,9 @@ module Aws::EC2
5387
5477
  # resp.source_capacity_reservation.capacity_allocations[0].count #=> Integer
5388
5478
  # resp.source_capacity_reservation.reservation_type #=> String, one of "default", "capacity-block"
5389
5479
  # resp.source_capacity_reservation.unused_reservation_billing_owner_id #=> String
5480
+ # resp.source_capacity_reservation.commitment_info.committed_instance_count #=> Integer
5481
+ # resp.source_capacity_reservation.commitment_info.commitment_end_date #=> Time
5482
+ # resp.source_capacity_reservation.delivery_preference #=> String, one of "fixed", "incremental"
5390
5483
  # resp.destination_capacity_reservation.capacity_reservation_id #=> String
5391
5484
  # resp.destination_capacity_reservation.owner_id #=> String
5392
5485
  # resp.destination_capacity_reservation.capacity_reservation_arn #=> String
@@ -5399,7 +5492,7 @@ module Aws::EC2
5399
5492
  # resp.destination_capacity_reservation.available_instance_count #=> Integer
5400
5493
  # resp.destination_capacity_reservation.ebs_optimized #=> Boolean
5401
5494
  # resp.destination_capacity_reservation.ephemeral_storage #=> Boolean
5402
- # resp.destination_capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed"
5495
+ # resp.destination_capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed", "assessing", "delayed", "unsupported"
5403
5496
  # resp.destination_capacity_reservation.start_date #=> Time
5404
5497
  # resp.destination_capacity_reservation.end_date #=> Time
5405
5498
  # resp.destination_capacity_reservation.end_date_type #=> String, one of "unlimited", "limited"
@@ -5416,6 +5509,9 @@ module Aws::EC2
5416
5509
  # resp.destination_capacity_reservation.capacity_allocations[0].count #=> Integer
5417
5510
  # resp.destination_capacity_reservation.reservation_type #=> String, one of "default", "capacity-block"
5418
5511
  # resp.destination_capacity_reservation.unused_reservation_billing_owner_id #=> String
5512
+ # resp.destination_capacity_reservation.commitment_info.committed_instance_count #=> Integer
5513
+ # resp.destination_capacity_reservation.commitment_info.commitment_end_date #=> Time
5514
+ # resp.destination_capacity_reservation.delivery_preference #=> String, one of "fixed", "incremental"
5419
5515
  # resp.instance_count #=> Integer
5420
5516
  #
5421
5517
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateCapacityReservationBySplitting AWS API Documentation
@@ -6762,7 +6858,7 @@ module Aws::EC2
6762
6858
  # min: 1, # required
6763
6859
  # max: 1,
6764
6860
  # },
6765
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
6861
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
6766
6862
  # memory_gi_b_per_v_cpu: {
6767
6863
  # min: 1.0,
6768
6864
  # max: 1.0,
@@ -6805,6 +6901,15 @@ module Aws::EC2
6805
6901
  # },
6806
6902
  # allowed_instance_types: ["AllowedInstanceType"],
6807
6903
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
6904
+ # baseline_performance_factors: {
6905
+ # cpu: {
6906
+ # references: [
6907
+ # {
6908
+ # instance_family: "String",
6909
+ # },
6910
+ # ],
6911
+ # },
6912
+ # },
6808
6913
  # },
6809
6914
  # image_id: "ImageId",
6810
6915
  # },
@@ -6856,7 +6961,7 @@ module Aws::EC2
6856
6961
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.memory_mi_b.min #=> Integer
6857
6962
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.memory_mi_b.max #=> Integer
6858
6963
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers #=> Array
6859
- # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
6964
+ # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
6860
6965
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
6861
6966
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
6862
6967
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.excluded_instance_types #=> Array
@@ -6892,6 +6997,8 @@ module Aws::EC2
6892
6997
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.allowed_instance_types #=> Array
6893
6998
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.allowed_instance_types[0] #=> String
6894
6999
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
7000
+ # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
7001
+ # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
6895
7002
  # resp.errors[0].launch_template_and_overrides.overrides.image_id #=> String
6896
7003
  # resp.errors[0].lifecycle #=> String, one of "spot", "on-demand"
6897
7004
  # resp.errors[0].error_code #=> String
@@ -6912,7 +7019,7 @@ module Aws::EC2
6912
7019
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.memory_mi_b.min #=> Integer
6913
7020
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.memory_mi_b.max #=> Integer
6914
7021
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers #=> Array
6915
- # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
7022
+ # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
6916
7023
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
6917
7024
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
6918
7025
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.excluded_instance_types #=> Array
@@ -6948,6 +7055,8 @@ module Aws::EC2
6948
7055
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.allowed_instance_types #=> Array
6949
7056
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.allowed_instance_types[0] #=> String
6950
7057
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
7058
+ # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
7059
+ # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
6951
7060
  # resp.instances[0].launch_template_and_overrides.overrides.image_id #=> String
6952
7061
  # resp.instances[0].lifecycle #=> String, one of "spot", "on-demand"
6953
7062
  # resp.instances[0].instance_ids #=> Array
@@ -8341,6 +8450,8 @@ module Aws::EC2
8341
8450
  # resp.ipam_resource_discovery.tags #=> Array
8342
8451
  # resp.ipam_resource_discovery.tags[0].key #=> String
8343
8452
  # resp.ipam_resource_discovery.tags[0].value #=> String
8453
+ # resp.ipam_resource_discovery.organizational_unit_exclusions #=> Array
8454
+ # resp.ipam_resource_discovery.organizational_unit_exclusions[0].organizations_entity_path #=> String
8344
8455
  #
8345
8456
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateIpamResourceDiscovery AWS API Documentation
8346
8457
  #
@@ -8806,7 +8917,7 @@ module Aws::EC2
8806
8917
  # amd_sev_snp: "enabled", # accepts enabled, disabled
8807
8918
  # },
8808
8919
  # capacity_reservation_specification: {
8809
- # capacity_reservation_preference: "open", # accepts open, none
8920
+ # capacity_reservation_preference: "capacity-reservations-only", # accepts capacity-reservations-only, open, none
8810
8921
  # capacity_reservation_target: {
8811
8922
  # capacity_reservation_id: "CapacityReservationId",
8812
8923
  # capacity_reservation_resource_group_arn: "String",
@@ -8839,7 +8950,7 @@ module Aws::EC2
8839
8950
  # min: 1, # required
8840
8951
  # max: 1,
8841
8952
  # },
8842
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
8953
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
8843
8954
  # memory_gi_b_per_v_cpu: {
8844
8955
  # min: 1.0,
8845
8956
  # max: 1.0,
@@ -8882,6 +8993,15 @@ module Aws::EC2
8882
8993
  # },
8883
8994
  # allowed_instance_types: ["AllowedInstanceType"],
8884
8995
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
8996
+ # baseline_performance_factors: {
8997
+ # cpu: {
8998
+ # references: [
8999
+ # {
9000
+ # instance_family: "String",
9001
+ # },
9002
+ # ],
9003
+ # },
9004
+ # },
8885
9005
  # },
8886
9006
  # private_dns_name_options: {
8887
9007
  # hostname_type: "ip-name", # accepts ip-name, resource-name
@@ -9216,7 +9336,7 @@ module Aws::EC2
9216
9336
  # amd_sev_snp: "enabled", # accepts enabled, disabled
9217
9337
  # },
9218
9338
  # capacity_reservation_specification: {
9219
- # capacity_reservation_preference: "open", # accepts open, none
9339
+ # capacity_reservation_preference: "capacity-reservations-only", # accepts capacity-reservations-only, open, none
9220
9340
  # capacity_reservation_target: {
9221
9341
  # capacity_reservation_id: "CapacityReservationId",
9222
9342
  # capacity_reservation_resource_group_arn: "String",
@@ -9249,7 +9369,7 @@ module Aws::EC2
9249
9369
  # min: 1, # required
9250
9370
  # max: 1,
9251
9371
  # },
9252
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
9372
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
9253
9373
  # memory_gi_b_per_v_cpu: {
9254
9374
  # min: 1.0,
9255
9375
  # max: 1.0,
@@ -9292,6 +9412,15 @@ module Aws::EC2
9292
9412
  # },
9293
9413
  # allowed_instance_types: ["AllowedInstanceType"],
9294
9414
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
9415
+ # baseline_performance_factors: {
9416
+ # cpu: {
9417
+ # references: [
9418
+ # {
9419
+ # instance_family: "String",
9420
+ # },
9421
+ # ],
9422
+ # },
9423
+ # },
9295
9424
  # },
9296
9425
  # private_dns_name_options: {
9297
9426
  # hostname_type: "ip-name", # accepts ip-name, resource-name
@@ -9408,7 +9537,7 @@ module Aws::EC2
9408
9537
  # resp.launch_template_version.launch_template_data.cpu_options.core_count #=> Integer
9409
9538
  # resp.launch_template_version.launch_template_data.cpu_options.threads_per_core #=> Integer
9410
9539
  # resp.launch_template_version.launch_template_data.cpu_options.amd_sev_snp #=> String, one of "enabled", "disabled"
9411
- # resp.launch_template_version.launch_template_data.capacity_reservation_specification.capacity_reservation_preference #=> String, one of "open", "none"
9540
+ # resp.launch_template_version.launch_template_data.capacity_reservation_specification.capacity_reservation_preference #=> String, one of "capacity-reservations-only", "open", "none"
9412
9541
  # resp.launch_template_version.launch_template_data.capacity_reservation_specification.capacity_reservation_target.capacity_reservation_id #=> String
9413
9542
  # resp.launch_template_version.launch_template_data.capacity_reservation_specification.capacity_reservation_target.capacity_reservation_resource_group_arn #=> String
9414
9543
  # resp.launch_template_version.launch_template_data.license_specifications #=> Array
@@ -9426,7 +9555,7 @@ module Aws::EC2
9426
9555
  # resp.launch_template_version.launch_template_data.instance_requirements.memory_mi_b.min #=> Integer
9427
9556
  # resp.launch_template_version.launch_template_data.instance_requirements.memory_mi_b.max #=> Integer
9428
9557
  # resp.launch_template_version.launch_template_data.instance_requirements.cpu_manufacturers #=> Array
9429
- # resp.launch_template_version.launch_template_data.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
9558
+ # resp.launch_template_version.launch_template_data.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
9430
9559
  # resp.launch_template_version.launch_template_data.instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
9431
9560
  # resp.launch_template_version.launch_template_data.instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
9432
9561
  # resp.launch_template_version.launch_template_data.instance_requirements.excluded_instance_types #=> Array
@@ -9462,6 +9591,8 @@ module Aws::EC2
9462
9591
  # resp.launch_template_version.launch_template_data.instance_requirements.allowed_instance_types #=> Array
9463
9592
  # resp.launch_template_version.launch_template_data.instance_requirements.allowed_instance_types[0] #=> String
9464
9593
  # resp.launch_template_version.launch_template_data.instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
9594
+ # resp.launch_template_version.launch_template_data.instance_requirements.baseline_performance_factors.cpu.references #=> Array
9595
+ # resp.launch_template_version.launch_template_data.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
9465
9596
  # resp.launch_template_version.launch_template_data.private_dns_name_options.hostname_type #=> String, one of "ip-name", "resource-name"
9466
9597
  # resp.launch_template_version.launch_template_data.private_dns_name_options.enable_resource_name_dns_a_record #=> Boolean
9467
9598
  # resp.launch_template_version.launch_template_data.private_dns_name_options.enable_resource_name_dns_aaaa_record #=> Boolean
@@ -15105,13 +15236,13 @@ module Aws::EC2
15105
15236
  # @option params [required, String] :internet_gateway_exclusion_mode
15106
15237
  # The exclusion mode for internet gateway traffic.
15107
15238
  #
15108
- # * `bidirectional-access-allowed`: Allow all internet traffic to and
15109
- # from the excluded VPCs and subnets.
15239
+ # * `allow-bidirectional`: Allow all internet traffic to and from the
15240
+ # excluded VPCs and subnets.
15110
15241
  #
15111
- # * `egress-access-allowed`: Allow outbound internet traffic from the
15112
- # excluded VPCs and subnets. Block inbound internet traffic to the
15113
- # excluded VPCs and subnets. Only applies when VPC Block Public Access
15114
- # is set to Bidirectional.
15242
+ # * `allow-egress`: Allow outbound internet traffic from the excluded
15243
+ # VPCs and subnets. Block inbound internet traffic to the excluded
15244
+ # VPCs and subnets. Only applies when VPC Block Public Access is set
15245
+ # to Bidirectional.
15115
15246
  #
15116
15247
  # @option params [Array<Types::TagSpecification>] :tag_specifications
15117
15248
  # `tag` - The key/value combination of a tag assigned to the resource.
@@ -16905,6 +17036,8 @@ module Aws::EC2
16905
17036
  # resp.ipam_resource_discovery.tags #=> Array
16906
17037
  # resp.ipam_resource_discovery.tags[0].key #=> String
16907
17038
  # resp.ipam_resource_discovery.tags[0].value #=> String
17039
+ # resp.ipam_resource_discovery.organizational_unit_exclusions #=> Array
17040
+ # resp.ipam_resource_discovery.organizational_unit_exclusions[0].organizations_entity_path #=> String
16908
17041
  #
16909
17042
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteIpamResourceDiscovery AWS API Documentation
16910
17043
  #
@@ -20959,6 +21092,167 @@ module Aws::EC2
20959
21092
  req.send_request(options)
20960
21093
  end
20961
21094
 
21095
+ # Describes the events for the specified Capacity Block extension during
21096
+ # the specified time.
21097
+ #
21098
+ # @option params [Array<String>] :capacity_reservation_ids
21099
+ # The IDs of Capacity Block reservations that you want to display the
21100
+ # history for.
21101
+ #
21102
+ # @option params [String] :next_token
21103
+ # The token to use to retrieve the next page of results.
21104
+ #
21105
+ # @option params [Integer] :max_results
21106
+ # The maximum number of items to return for this request. To get the
21107
+ # next page of items, make another request with the token returned in
21108
+ # the output. For more information, see [Pagination][1].
21109
+ #
21110
+ #
21111
+ #
21112
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
21113
+ #
21114
+ # @option params [Array<Types::Filter>] :filters
21115
+ # One or more filters
21116
+ #
21117
+ # * `availability-zone` - The Availability Zone of the extension.
21118
+ #
21119
+ # * `availability-zone-id` - The Availability Zone ID of the extension.
21120
+ #
21121
+ # * `capacity-block-extension-offering-id` - The ID of the extension
21122
+ # offering.
21123
+ #
21124
+ # * `capacity-block-extension-status` - The status of the extension
21125
+ # (`payment-pending` \| `payment-failed` \| `payment-succeeded`).
21126
+ #
21127
+ # * `capacity-reservation-id` - The reservation ID of the extension.
21128
+ #
21129
+ # * `instance-type` - The instance type of the extension.
21130
+ #
21131
+ # @option params [Boolean] :dry_run
21132
+ # Checks whether you have the required permissions for the action,
21133
+ # without actually making the request, and provides an error response.
21134
+ # If you have the required permissions, the error response is
21135
+ # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
21136
+ #
21137
+ # @return [Types::DescribeCapacityBlockExtensionHistoryResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
21138
+ #
21139
+ # * {Types::DescribeCapacityBlockExtensionHistoryResult#capacity_block_extensions #capacity_block_extensions} => Array&lt;Types::CapacityBlockExtension&gt;
21140
+ # * {Types::DescribeCapacityBlockExtensionHistoryResult#next_token #next_token} => String
21141
+ #
21142
+ # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
21143
+ #
21144
+ # @example Request syntax with placeholder values
21145
+ #
21146
+ # resp = client.describe_capacity_block_extension_history({
21147
+ # capacity_reservation_ids: ["CapacityReservationId"],
21148
+ # next_token: "String",
21149
+ # max_results: 1,
21150
+ # filters: [
21151
+ # {
21152
+ # name: "String",
21153
+ # values: ["String"],
21154
+ # },
21155
+ # ],
21156
+ # dry_run: false,
21157
+ # })
21158
+ #
21159
+ # @example Response structure
21160
+ #
21161
+ # resp.capacity_block_extensions #=> Array
21162
+ # resp.capacity_block_extensions[0].capacity_reservation_id #=> String
21163
+ # resp.capacity_block_extensions[0].instance_type #=> String
21164
+ # resp.capacity_block_extensions[0].instance_count #=> Integer
21165
+ # resp.capacity_block_extensions[0].availability_zone #=> String
21166
+ # resp.capacity_block_extensions[0].availability_zone_id #=> String
21167
+ # resp.capacity_block_extensions[0].capacity_block_extension_offering_id #=> String
21168
+ # resp.capacity_block_extensions[0].capacity_block_extension_duration_hours #=> Integer
21169
+ # resp.capacity_block_extensions[0].capacity_block_extension_status #=> String, one of "payment-pending", "payment-failed", "payment-succeeded"
21170
+ # resp.capacity_block_extensions[0].capacity_block_extension_purchase_date #=> Time
21171
+ # resp.capacity_block_extensions[0].capacity_block_extension_start_date #=> Time
21172
+ # resp.capacity_block_extensions[0].capacity_block_extension_end_date #=> Time
21173
+ # resp.capacity_block_extensions[0].upfront_fee #=> String
21174
+ # resp.capacity_block_extensions[0].currency_code #=> String
21175
+ # resp.next_token #=> String
21176
+ #
21177
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockExtensionHistory AWS API Documentation
21178
+ #
21179
+ # @overload describe_capacity_block_extension_history(params = {})
21180
+ # @param [Hash] params ({})
21181
+ def describe_capacity_block_extension_history(params = {}, options = {})
21182
+ req = build_request(:describe_capacity_block_extension_history, params)
21183
+ req.send_request(options)
21184
+ end
21185
+
21186
+ # Describes Capacity Block extension offerings available for purchase in
21187
+ # the Amazon Web Services Region that you're currently using.
21188
+ #
21189
+ # @option params [Boolean] :dry_run
21190
+ # Checks whether you have the required permissions for the action,
21191
+ # without actually making the request, and provides an error response.
21192
+ # If you have the required permissions, the error response is
21193
+ # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
21194
+ #
21195
+ # @option params [required, Integer] :capacity_block_extension_duration_hours
21196
+ # The duration of the Capacity Block extension offering in hours.
21197
+ #
21198
+ # @option params [required, String] :capacity_reservation_id
21199
+ # The ID of the Capacity reservation to be extended.
21200
+ #
21201
+ # @option params [String] :next_token
21202
+ # The token to use to retrieve the next page of results.
21203
+ #
21204
+ # @option params [Integer] :max_results
21205
+ # The maximum number of items to return for this request. To get the
21206
+ # next page of items, make another request with the token returned in
21207
+ # the output. For more information, see [Pagination][1].
21208
+ #
21209
+ #
21210
+ #
21211
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
21212
+ #
21213
+ # @return [Types::DescribeCapacityBlockExtensionOfferingsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
21214
+ #
21215
+ # * {Types::DescribeCapacityBlockExtensionOfferingsResult#capacity_block_extension_offerings #capacity_block_extension_offerings} => Array&lt;Types::CapacityBlockExtensionOffering&gt;
21216
+ # * {Types::DescribeCapacityBlockExtensionOfferingsResult#next_token #next_token} => String
21217
+ #
21218
+ # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
21219
+ #
21220
+ # @example Request syntax with placeholder values
21221
+ #
21222
+ # resp = client.describe_capacity_block_extension_offerings({
21223
+ # dry_run: false,
21224
+ # capacity_block_extension_duration_hours: 1, # required
21225
+ # capacity_reservation_id: "CapacityReservationId", # required
21226
+ # next_token: "String",
21227
+ # max_results: 1,
21228
+ # })
21229
+ #
21230
+ # @example Response structure
21231
+ #
21232
+ # resp.capacity_block_extension_offerings #=> Array
21233
+ # resp.capacity_block_extension_offerings[0].capacity_block_extension_offering_id #=> String
21234
+ # resp.capacity_block_extension_offerings[0].instance_type #=> String
21235
+ # resp.capacity_block_extension_offerings[0].instance_count #=> Integer
21236
+ # resp.capacity_block_extension_offerings[0].availability_zone #=> String
21237
+ # resp.capacity_block_extension_offerings[0].availability_zone_id #=> String
21238
+ # resp.capacity_block_extension_offerings[0].start_date #=> Time
21239
+ # resp.capacity_block_extension_offerings[0].capacity_block_extension_start_date #=> Time
21240
+ # resp.capacity_block_extension_offerings[0].capacity_block_extension_end_date #=> Time
21241
+ # resp.capacity_block_extension_offerings[0].capacity_block_extension_duration_hours #=> Integer
21242
+ # resp.capacity_block_extension_offerings[0].upfront_fee #=> String
21243
+ # resp.capacity_block_extension_offerings[0].currency_code #=> String
21244
+ # resp.capacity_block_extension_offerings[0].tenancy #=> String, one of "default", "dedicated"
21245
+ # resp.next_token #=> String
21246
+ #
21247
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockExtensionOfferings AWS API Documentation
21248
+ #
21249
+ # @overload describe_capacity_block_extension_offerings(params = {})
21250
+ # @param [Hash] params ({})
21251
+ def describe_capacity_block_extension_offerings(params = {}, options = {})
21252
+ req = build_request(:describe_capacity_block_extension_offerings, params)
21253
+ req.send_request(options)
21254
+ end
21255
+
20962
21256
  # Describes Capacity Block offerings available for purchase in the
20963
21257
  # Amazon Web Services Region that you're currently using. With Capacity
20964
21258
  # Blocks, you purchase a specific instance type for a period of time.
@@ -21030,6 +21324,7 @@ module Aws::EC2
21030
21324
  # resp.capacity_block_offerings[0].upfront_fee #=> String
21031
21325
  # resp.capacity_block_offerings[0].currency_code #=> String
21032
21326
  # resp.capacity_block_offerings[0].tenancy #=> String, one of "default", "dedicated"
21327
+ # resp.capacity_block_offerings[0].capacity_block_duration_minutes #=> Integer
21033
21328
  # resp.next_token #=> String
21034
21329
  #
21035
21330
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockOfferings AWS API Documentation
@@ -21386,7 +21681,7 @@ module Aws::EC2
21386
21681
  # resp.capacity_reservations[0].available_instance_count #=> Integer
21387
21682
  # resp.capacity_reservations[0].ebs_optimized #=> Boolean
21388
21683
  # resp.capacity_reservations[0].ephemeral_storage #=> Boolean
21389
- # resp.capacity_reservations[0].state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed"
21684
+ # resp.capacity_reservations[0].state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed", "assessing", "delayed", "unsupported"
21390
21685
  # resp.capacity_reservations[0].start_date #=> Time
21391
21686
  # resp.capacity_reservations[0].end_date #=> Time
21392
21687
  # resp.capacity_reservations[0].end_date_type #=> String, one of "unlimited", "limited"
@@ -21403,6 +21698,9 @@ module Aws::EC2
21403
21698
  # resp.capacity_reservations[0].capacity_allocations[0].count #=> Integer
21404
21699
  # resp.capacity_reservations[0].reservation_type #=> String, one of "default", "capacity-block"
21405
21700
  # resp.capacity_reservations[0].unused_reservation_billing_owner_id #=> String
21701
+ # resp.capacity_reservations[0].commitment_info.committed_instance_count #=> Integer
21702
+ # resp.capacity_reservations[0].commitment_info.commitment_end_date #=> Time
21703
+ # resp.capacity_reservations[0].delivery_preference #=> String, one of "fixed", "incremental"
21406
21704
  #
21407
21705
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityReservations AWS API Documentation
21408
21706
  #
@@ -23148,7 +23446,7 @@ module Aws::EC2
23148
23446
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.memory_mi_b.min #=> Integer
23149
23447
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.memory_mi_b.max #=> Integer
23150
23448
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.cpu_manufacturers #=> Array
23151
- # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
23449
+ # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
23152
23450
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
23153
23451
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
23154
23452
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.excluded_instance_types #=> Array
@@ -23184,6 +23482,8 @@ module Aws::EC2
23184
23482
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.allowed_instance_types #=> Array
23185
23483
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.allowed_instance_types[0] #=> String
23186
23484
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
23485
+ # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.baseline_performance_factors.cpu.references #=> Array
23486
+ # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
23187
23487
  # resp.fleets[0].launch_template_configs[0].overrides[0].image_id #=> String
23188
23488
  # resp.fleets[0].target_capacity_specification.total_target_capacity #=> Integer
23189
23489
  # resp.fleets[0].target_capacity_specification.on_demand_target_capacity #=> Integer
@@ -23229,7 +23529,7 @@ module Aws::EC2
23229
23529
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.memory_mi_b.min #=> Integer
23230
23530
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.memory_mi_b.max #=> Integer
23231
23531
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers #=> Array
23232
- # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
23532
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
23233
23533
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
23234
23534
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
23235
23535
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.excluded_instance_types #=> Array
@@ -23265,6 +23565,8 @@ module Aws::EC2
23265
23565
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.allowed_instance_types #=> Array
23266
23566
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.allowed_instance_types[0] #=> String
23267
23567
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
23568
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
23569
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
23268
23570
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.image_id #=> String
23269
23571
  # resp.fleets[0].errors[0].lifecycle #=> String, one of "spot", "on-demand"
23270
23572
  # resp.fleets[0].errors[0].error_code #=> String
@@ -23285,7 +23587,7 @@ module Aws::EC2
23285
23587
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.memory_mi_b.min #=> Integer
23286
23588
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.memory_mi_b.max #=> Integer
23287
23589
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers #=> Array
23288
- # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
23590
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
23289
23591
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
23290
23592
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
23291
23593
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.excluded_instance_types #=> Array
@@ -23321,6 +23623,8 @@ module Aws::EC2
23321
23623
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.allowed_instance_types #=> Array
23322
23624
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.allowed_instance_types[0] #=> String
23323
23625
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
23626
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
23627
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
23324
23628
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.image_id #=> String
23325
23629
  # resp.fleets[0].instances[0].lifecycle #=> String, one of "spot", "on-demand"
23326
23630
  # resp.fleets[0].instances[0].instance_ids #=> Array
@@ -26909,7 +27213,7 @@ module Aws::EC2
26909
27213
  # resp.reservations[0].instances[0].cpu_options.threads_per_core #=> Integer
26910
27214
  # resp.reservations[0].instances[0].cpu_options.amd_sev_snp #=> String, one of "enabled", "disabled"
26911
27215
  # resp.reservations[0].instances[0].capacity_reservation_id #=> String
26912
- # resp.reservations[0].instances[0].capacity_reservation_specification.capacity_reservation_preference #=> String, one of "open", "none"
27216
+ # resp.reservations[0].instances[0].capacity_reservation_specification.capacity_reservation_preference #=> String, one of "capacity-reservations-only", "open", "none"
26913
27217
  # resp.reservations[0].instances[0].capacity_reservation_specification.capacity_reservation_target.capacity_reservation_id #=> String
26914
27218
  # resp.reservations[0].instances[0].capacity_reservation_specification.capacity_reservation_target.capacity_reservation_resource_group_arn #=> String
26915
27219
  # resp.reservations[0].instances[0].hibernation_options.configured #=> Boolean
@@ -27422,6 +27726,8 @@ module Aws::EC2
27422
27726
  # resp.ipam_resource_discoveries[0].tags #=> Array
27423
27727
  # resp.ipam_resource_discoveries[0].tags[0].key #=> String
27424
27728
  # resp.ipam_resource_discoveries[0].tags[0].value #=> String
27729
+ # resp.ipam_resource_discoveries[0].organizational_unit_exclusions #=> Array
27730
+ # resp.ipam_resource_discoveries[0].organizational_unit_exclusions[0].organizations_entity_path #=> String
27425
27731
  # resp.next_token #=> String
27426
27732
  #
27427
27733
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeIpamResourceDiscoveries AWS API Documentation
@@ -28158,7 +28464,7 @@ module Aws::EC2
28158
28464
  # resp.launch_template_versions[0].launch_template_data.cpu_options.core_count #=> Integer
28159
28465
  # resp.launch_template_versions[0].launch_template_data.cpu_options.threads_per_core #=> Integer
28160
28466
  # resp.launch_template_versions[0].launch_template_data.cpu_options.amd_sev_snp #=> String, one of "enabled", "disabled"
28161
- # resp.launch_template_versions[0].launch_template_data.capacity_reservation_specification.capacity_reservation_preference #=> String, one of "open", "none"
28467
+ # resp.launch_template_versions[0].launch_template_data.capacity_reservation_specification.capacity_reservation_preference #=> String, one of "capacity-reservations-only", "open", "none"
28162
28468
  # resp.launch_template_versions[0].launch_template_data.capacity_reservation_specification.capacity_reservation_target.capacity_reservation_id #=> String
28163
28469
  # resp.launch_template_versions[0].launch_template_data.capacity_reservation_specification.capacity_reservation_target.capacity_reservation_resource_group_arn #=> String
28164
28470
  # resp.launch_template_versions[0].launch_template_data.license_specifications #=> Array
@@ -28176,7 +28482,7 @@ module Aws::EC2
28176
28482
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.memory_mi_b.min #=> Integer
28177
28483
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.memory_mi_b.max #=> Integer
28178
28484
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.cpu_manufacturers #=> Array
28179
- # resp.launch_template_versions[0].launch_template_data.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
28485
+ # resp.launch_template_versions[0].launch_template_data.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
28180
28486
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
28181
28487
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
28182
28488
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.excluded_instance_types #=> Array
@@ -28212,6 +28518,8 @@ module Aws::EC2
28212
28518
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.allowed_instance_types #=> Array
28213
28519
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.allowed_instance_types[0] #=> String
28214
28520
  # resp.launch_template_versions[0].launch_template_data.instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
28521
+ # resp.launch_template_versions[0].launch_template_data.instance_requirements.baseline_performance_factors.cpu.references #=> Array
28522
+ # resp.launch_template_versions[0].launch_template_data.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
28215
28523
  # resp.launch_template_versions[0].launch_template_data.private_dns_name_options.hostname_type #=> String, one of "ip-name", "resource-name"
28216
28524
  # resp.launch_template_versions[0].launch_template_data.private_dns_name_options.enable_resource_name_dns_a_record #=> Boolean
28217
28525
  # resp.launch_template_versions[0].launch_template_data.private_dns_name_options.enable_resource_name_dns_aaaa_record #=> Boolean
@@ -34145,7 +34453,7 @@ module Aws::EC2
34145
34453
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.memory_mi_b.min #=> Integer
34146
34454
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.memory_mi_b.max #=> Integer
34147
34455
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.cpu_manufacturers #=> Array
34148
- # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
34456
+ # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
34149
34457
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
34150
34458
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
34151
34459
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.excluded_instance_types #=> Array
@@ -34181,6 +34489,8 @@ module Aws::EC2
34181
34489
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.allowed_instance_types #=> Array
34182
34490
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.allowed_instance_types[0] #=> String
34183
34491
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
34492
+ # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.baseline_performance_factors.cpu.references #=> Array
34493
+ # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
34184
34494
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].security_groups #=> Array
34185
34495
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].security_groups[0].group_id #=> String
34186
34496
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].security_groups[0].group_name #=> String
@@ -34200,7 +34510,7 @@ module Aws::EC2
34200
34510
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.memory_mi_b.min #=> Integer
34201
34511
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.memory_mi_b.max #=> Integer
34202
34512
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.cpu_manufacturers #=> Array
34203
- # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
34513
+ # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
34204
34514
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
34205
34515
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
34206
34516
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.excluded_instance_types #=> Array
@@ -34236,6 +34546,8 @@ module Aws::EC2
34236
34546
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.allowed_instance_types #=> Array
34237
34547
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.allowed_instance_types[0] #=> String
34238
34548
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
34549
+ # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.baseline_performance_factors.cpu.references #=> Array
34550
+ # resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
34239
34551
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.spot_price #=> String
34240
34552
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.target_capacity #=> Integer
34241
34553
  # resp.spot_fleet_request_configs[0].spot_fleet_request_config.on_demand_target_capacity #=> Integer
@@ -37846,8 +38158,7 @@ module Aws::EC2
37846
38158
  # * `resource-arn` - The Amazon Resource Name (ARN) of a exclusion.
37847
38159
  #
37848
38160
  # * `internet-gateway-exclusion-mode` - The mode of a VPC BPA exclusion.
37849
- # Possible values: `bidirectional-access-allowed |
37850
- # egress-access-allowed`.
38161
+ # Possible values: `allow-bidirectional | allow-egress`.
37851
38162
  #
37852
38163
  # * `state` - The state of VPC BPA. Possible values: `create-in-progress
37853
38164
  # | create-complete | update-in-progress | update-complete |
@@ -37929,7 +38240,7 @@ module Aws::EC2
37929
38240
  req.send_request(options)
37930
38241
  end
37931
38242
 
37932
- # Describe VPC Block Public Access (BPA) options. VPC Block public
38243
+ # Describe VPC Block Public Access (BPA) options. VPC Block Public
37933
38244
  # Access (BPA) enables you to block resources in VPCs and subnets that
37934
38245
  # you own in a Region from reaching or being reached from the internet
37935
38246
  # through internet gateways and egress-only internet gateways. To learn
@@ -42711,7 +43022,7 @@ module Aws::EC2
42711
43022
  # resp.instance_type #=> String
42712
43023
  # resp.total_instance_count #=> Integer
42713
43024
  # resp.available_instance_count #=> Integer
42714
- # resp.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed"
43025
+ # resp.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed", "assessing", "delayed", "unsupported"
42715
43026
  # resp.instance_usages #=> Array
42716
43027
  # resp.instance_usages[0].account_id #=> String
42717
43028
  # resp.instance_usages[0].used_instance_count #=> Integer
@@ -43442,7 +43753,7 @@ module Aws::EC2
43442
43753
  # min: 1, # required
43443
43754
  # max: 1,
43444
43755
  # },
43445
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
43756
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
43446
43757
  # memory_gi_b_per_v_cpu: {
43447
43758
  # min: 1.0,
43448
43759
  # max: 1.0,
@@ -43485,6 +43796,15 @@ module Aws::EC2
43485
43796
  # },
43486
43797
  # allowed_instance_types: ["AllowedInstanceType"],
43487
43798
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
43799
+ # baseline_performance_factors: {
43800
+ # cpu: {
43801
+ # references: [
43802
+ # {
43803
+ # instance_family: "String",
43804
+ # },
43805
+ # ],
43806
+ # },
43807
+ # },
43488
43808
  # },
43489
43809
  # max_results: 1,
43490
43810
  # next_token: "String",
@@ -43709,6 +44029,7 @@ module Aws::EC2
43709
44029
  # resp.ipam_discovered_accounts[0].failure_reason.message #=> String
43710
44030
  # resp.ipam_discovered_accounts[0].last_attempted_discovery_time #=> Time
43711
44031
  # resp.ipam_discovered_accounts[0].last_successful_discovery_time #=> Time
44032
+ # resp.ipam_discovered_accounts[0].organizational_unit_id #=> String
43712
44033
  # resp.next_token #=> String
43713
44034
  #
43714
44035
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetIpamDiscoveredAccounts AWS API Documentation
@@ -44329,7 +44650,7 @@ module Aws::EC2
44329
44650
  # resp.launch_template_data.cpu_options.core_count #=> Integer
44330
44651
  # resp.launch_template_data.cpu_options.threads_per_core #=> Integer
44331
44652
  # resp.launch_template_data.cpu_options.amd_sev_snp #=> String, one of "enabled", "disabled"
44332
- # resp.launch_template_data.capacity_reservation_specification.capacity_reservation_preference #=> String, one of "open", "none"
44653
+ # resp.launch_template_data.capacity_reservation_specification.capacity_reservation_preference #=> String, one of "capacity-reservations-only", "open", "none"
44333
44654
  # resp.launch_template_data.capacity_reservation_specification.capacity_reservation_target.capacity_reservation_id #=> String
44334
44655
  # resp.launch_template_data.capacity_reservation_specification.capacity_reservation_target.capacity_reservation_resource_group_arn #=> String
44335
44656
  # resp.launch_template_data.license_specifications #=> Array
@@ -44347,7 +44668,7 @@ module Aws::EC2
44347
44668
  # resp.launch_template_data.instance_requirements.memory_mi_b.min #=> Integer
44348
44669
  # resp.launch_template_data.instance_requirements.memory_mi_b.max #=> Integer
44349
44670
  # resp.launch_template_data.instance_requirements.cpu_manufacturers #=> Array
44350
- # resp.launch_template_data.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services"
44671
+ # resp.launch_template_data.instance_requirements.cpu_manufacturers[0] #=> String, one of "intel", "amd", "amazon-web-services", "apple"
44351
44672
  # resp.launch_template_data.instance_requirements.memory_gi_b_per_v_cpu.min #=> Float
44352
44673
  # resp.launch_template_data.instance_requirements.memory_gi_b_per_v_cpu.max #=> Float
44353
44674
  # resp.launch_template_data.instance_requirements.excluded_instance_types #=> Array
@@ -44383,6 +44704,8 @@ module Aws::EC2
44383
44704
  # resp.launch_template_data.instance_requirements.allowed_instance_types #=> Array
44384
44705
  # resp.launch_template_data.instance_requirements.allowed_instance_types[0] #=> String
44385
44706
  # resp.launch_template_data.instance_requirements.max_spot_price_as_percentage_of_optimal_on_demand_price #=> Integer
44707
+ # resp.launch_template_data.instance_requirements.baseline_performance_factors.cpu.references #=> Array
44708
+ # resp.launch_template_data.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
44386
44709
  # resp.launch_template_data.private_dns_name_options.hostname_type #=> String, one of "ip-name", "resource-name"
44387
44710
  # resp.launch_template_data.private_dns_name_options.enable_resource_name_dns_a_record #=> Boolean
44388
44711
  # resp.launch_template_data.private_dns_name_options.enable_resource_name_dns_aaaa_record #=> Boolean
@@ -45411,7 +45734,7 @@ module Aws::EC2
45411
45734
  # min: 1, # required
45412
45735
  # max: 1,
45413
45736
  # },
45414
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
45737
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
45415
45738
  # memory_gi_b_per_v_cpu: {
45416
45739
  # min: 1.0,
45417
45740
  # max: 1.0,
@@ -45454,6 +45777,15 @@ module Aws::EC2
45454
45777
  # },
45455
45778
  # allowed_instance_types: ["AllowedInstanceType"],
45456
45779
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
45780
+ # baseline_performance_factors: {
45781
+ # cpu: {
45782
+ # references: [
45783
+ # {
45784
+ # instance_family: "String",
45785
+ # },
45786
+ # ],
45787
+ # },
45788
+ # },
45457
45789
  # },
45458
45790
  # },
45459
45791
  # dry_run: false,
@@ -47446,9 +47778,27 @@ module Aws::EC2
47446
47778
  # instance store settings, Availability Zone, or tenancy. If you need to
47447
47779
  # modify any of these attributes, we recommend that you cancel the
47448
47780
  # Capacity Reservation, and then create a new one with the required
47449
- # attributes. For more information, see [Modify an active Capacity
47781
+ # attributes. For more information, see [ Modify an active Capacity
47450
47782
  # Reservation][1].
47451
47783
  #
47784
+ # The allowed modifications depend on the state of the Capacity
47785
+ # Reservation:
47786
+ #
47787
+ # * `assessing` or `scheduled` state - You can modify the tags only.
47788
+ #
47789
+ # * `pending` state - You can't modify the Capacity Reservation in any
47790
+ # way.
47791
+ #
47792
+ # * `active` state but still within the commitment duration - You can't
47793
+ # decrease the instance count or set an end date that is within the
47794
+ # commitment duration. All other modifications are allowed.
47795
+ #
47796
+ # * `active` state with no commitment duration or elapsed commitment
47797
+ # duration - All modifications are allowed.
47798
+ #
47799
+ # * `expired`, `cancelled`, `unsupported`, or `failed` state - You
47800
+ # can't modify the Capacity Reservation in any way.
47801
+ #
47452
47802
  #
47453
47803
  #
47454
47804
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/capacity-reservations-modify.html
@@ -47994,7 +48344,7 @@ module Aws::EC2
47994
48344
  # min: 1, # required
47995
48345
  # max: 1,
47996
48346
  # },
47997
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
48347
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
47998
48348
  # memory_gi_b_per_v_cpu: {
47999
48349
  # min: 1.0,
48000
48350
  # max: 1.0,
@@ -48037,6 +48387,15 @@ module Aws::EC2
48037
48387
  # },
48038
48388
  # allowed_instance_types: ["AllowedInstanceType"],
48039
48389
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
48390
+ # baseline_performance_factors: {
48391
+ # cpu: {
48392
+ # references: [
48393
+ # {
48394
+ # instance_family: "String",
48395
+ # },
48396
+ # ],
48397
+ # },
48398
+ # },
48040
48399
  # },
48041
48400
  # image_id: "ImageId",
48042
48401
  # },
@@ -48803,7 +49162,8 @@ module Aws::EC2
48803
49162
  # Modifies the Capacity Reservation settings for a stopped instance. Use
48804
49163
  # this action to configure an instance to target a specific Capacity
48805
49164
  # Reservation, run in any `open` Capacity Reservation with matching
48806
- # attributes, or run On-Demand Instance capacity.
49165
+ # attributes, run in On-Demand Instance capacity, or only run in a
49166
+ # Capacity Reservation.
48807
49167
  #
48808
49168
  # @option params [required, String] :instance_id
48809
49169
  # The ID of the instance to be modified.
@@ -48826,7 +49186,7 @@ module Aws::EC2
48826
49186
  # resp = client.modify_instance_capacity_reservation_attributes({
48827
49187
  # instance_id: "InstanceId", # required
48828
49188
  # capacity_reservation_specification: { # required
48829
- # capacity_reservation_preference: "open", # accepts open, none
49189
+ # capacity_reservation_preference: "capacity-reservations-only", # accepts capacity-reservations-only, open, none
48830
49190
  # capacity_reservation_target: {
48831
49191
  # capacity_reservation_id: "CapacityReservationId",
48832
49192
  # capacity_reservation_resource_group_arn: "String",
@@ -49841,6 +50201,30 @@ module Aws::EC2
49841
50201
  # @option params [Array<Types::RemoveIpamOperatingRegion>] :remove_operating_regions
49842
50202
  # Remove operating Regions.
49843
50203
  #
50204
+ # @option params [Array<Types::AddIpamOrganizationalUnitExclusion>] :add_organizational_unit_exclusions
50205
+ # Add an Organizational Unit (OU) exclusion to your IPAM. If your IPAM
50206
+ # is integrated with Amazon Web Services Organizations and you add an
50207
+ # organizational unit (OU) exclusion, IPAM will not manage the IP
50208
+ # addresses in accounts in that OU exclusion. There is a limit on the
50209
+ # number of exclusions you can create. For more information, see [Quotas
50210
+ # for your IPAM][1] in the *Amazon VPC IPAM User Guide*.
50211
+ #
50212
+ #
50213
+ #
50214
+ # [1]: https://docs.aws.amazon.com/vpc/latest/ipam/quotas-ipam.html
50215
+ #
50216
+ # @option params [Array<Types::RemoveIpamOrganizationalUnitExclusion>] :remove_organizational_unit_exclusions
50217
+ # Remove an Organizational Unit (OU) exclusion to your IPAM. If your
50218
+ # IPAM is integrated with Amazon Web Services Organizations and you add
50219
+ # an organizational unit (OU) exclusion, IPAM will not manage the IP
50220
+ # addresses in accounts in that OU exclusion. There is a limit on the
50221
+ # number of exclusions you can create. For more information, see [Quotas
50222
+ # for your IPAM][1] in the *Amazon VPC IPAM User Guide*.
50223
+ #
50224
+ #
50225
+ #
50226
+ # [1]: https://docs.aws.amazon.com/vpc/latest/ipam/quotas-ipam.html
50227
+ #
49844
50228
  # @return [Types::ModifyIpamResourceDiscoveryResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
49845
50229
  #
49846
50230
  # * {Types::ModifyIpamResourceDiscoveryResult#ipam_resource_discovery #ipam_resource_discovery} => Types::IpamResourceDiscovery
@@ -49861,6 +50245,16 @@ module Aws::EC2
49861
50245
  # region_name: "String",
49862
50246
  # },
49863
50247
  # ],
50248
+ # add_organizational_unit_exclusions: [
50249
+ # {
50250
+ # organizations_entity_path: "String",
50251
+ # },
50252
+ # ],
50253
+ # remove_organizational_unit_exclusions: [
50254
+ # {
50255
+ # organizations_entity_path: "String",
50256
+ # },
50257
+ # ],
49864
50258
  # })
49865
50259
  #
49866
50260
  # @example Response structure
@@ -49877,6 +50271,8 @@ module Aws::EC2
49877
50271
  # resp.ipam_resource_discovery.tags #=> Array
49878
50272
  # resp.ipam_resource_discovery.tags[0].key #=> String
49879
50273
  # resp.ipam_resource_discovery.tags[0].value #=> String
50274
+ # resp.ipam_resource_discovery.organizational_unit_exclusions #=> Array
50275
+ # resp.ipam_resource_discovery.organizational_unit_exclusions[0].organizations_entity_path #=> String
49880
50276
  #
49881
50277
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyIpamResourceDiscovery AWS API Documentation
49882
50278
  #
@@ -50793,7 +51189,7 @@ module Aws::EC2
50793
51189
  # min: 1,
50794
51190
  # max: 1,
50795
51191
  # },
50796
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
51192
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
50797
51193
  # memory_gi_b_per_v_cpu: {
50798
51194
  # min: 1.0,
50799
51195
  # max: 1.0,
@@ -50836,6 +51232,15 @@ module Aws::EC2
50836
51232
  # },
50837
51233
  # allowed_instance_types: ["AllowedInstanceType"],
50838
51234
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
51235
+ # baseline_performance_factors: {
51236
+ # cpu: {
51237
+ # references: [
51238
+ # {
51239
+ # instance_family: "String",
51240
+ # },
51241
+ # ],
51242
+ # },
51243
+ # },
50839
51244
  # },
50840
51245
  # },
50841
51246
  # ],
@@ -52393,13 +52798,13 @@ module Aws::EC2
52393
52798
  # @option params [required, String] :internet_gateway_exclusion_mode
52394
52799
  # The exclusion mode for internet gateway traffic.
52395
52800
  #
52396
- # * `bidirectional-access-allowed`: Allow all internet traffic to and
52397
- # from the excluded VPCs and subnets.
52801
+ # * `allow-bidirectional`: Allow all internet traffic to and from the
52802
+ # excluded VPCs and subnets.
52398
52803
  #
52399
- # * `egress-access-allowed`: Allow outbound internet traffic from the
52400
- # excluded VPCs and subnets. Block inbound internet traffic to the
52401
- # excluded VPCs and subnets. Only applies when VPC Block Public Access
52402
- # is set to Bidirectional.
52804
+ # * `allow-egress`: Allow outbound internet traffic from the excluded
52805
+ # VPCs and subnets. Block inbound internet traffic to the excluded
52806
+ # VPCs and subnets. Only applies when VPC Block Public Access is set
52807
+ # to Bidirectional.
52403
52808
  #
52404
52809
  # @return [Types::ModifyVpcBlockPublicAccessExclusionResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
52405
52810
  #
@@ -52436,7 +52841,7 @@ module Aws::EC2
52436
52841
  req.send_request(options)
52437
52842
  end
52438
52843
 
52439
- # Modify VPC Block Public Access (BPA) options. VPC Block public Access
52844
+ # Modify VPC Block Public Access (BPA) options. VPC Block Public Access
52440
52845
  # (BPA) enables you to block resources in VPCs and subnets that you own
52441
52846
  # in a Region from reaching or being reached from the internet through
52442
52847
  # internet gateways and egress-only internet gateways. To learn more
@@ -52456,19 +52861,18 @@ module Aws::EC2
52456
52861
  # @option params [required, String] :internet_gateway_block_mode
52457
52862
  # The mode of VPC BPA.
52458
52863
  #
52459
- # * `bidirectional-access-allowed`: VPC BPA is not enabled and traffic
52460
- # is allowed to and from internet gateways and egress-only internet
52461
- # gateways in this Region.
52864
+ # * `off`: VPC BPA is not enabled and traffic is allowed to and from
52865
+ # internet gateways and egress-only internet gateways in this Region.
52462
52866
  #
52463
- # * `bidirectional-access-blocked`: Block all traffic to and from
52464
- # internet gateways and egress-only internet gateways in this Region
52465
- # (except for excluded VPCs and subnets).
52867
+ # * `block-bidirectional`: Block all traffic to and from internet
52868
+ # gateways and egress-only internet gateways in this Region (except
52869
+ # for excluded VPCs and subnets).
52466
52870
  #
52467
- # * `ingress-access-blocked`: Block all internet traffic to the VPCs in
52468
- # this Region (except for VPCs or subnets which are excluded). Only
52469
- # traffic to and from NAT gateways and egress-only internet gateways
52470
- # is allowed because these gateways only allow outbound connections to
52471
- # be established.
52871
+ # * `block-ingress`: Block all internet traffic to the VPCs in this
52872
+ # Region (except for VPCs or subnets which are excluded). Only traffic
52873
+ # to and from NAT gateways and egress-only internet gateways is
52874
+ # allowed because these gateways only allow outbound connections to be
52875
+ # established.
52472
52876
  #
52473
52877
  # @return [Types::ModifyVpcBlockPublicAccessOptionsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
52474
52878
  #
@@ -53782,7 +54186,7 @@ module Aws::EC2
53782
54186
  # resp.source_capacity_reservation.available_instance_count #=> Integer
53783
54187
  # resp.source_capacity_reservation.ebs_optimized #=> Boolean
53784
54188
  # resp.source_capacity_reservation.ephemeral_storage #=> Boolean
53785
- # resp.source_capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed"
54189
+ # resp.source_capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed", "assessing", "delayed", "unsupported"
53786
54190
  # resp.source_capacity_reservation.start_date #=> Time
53787
54191
  # resp.source_capacity_reservation.end_date #=> Time
53788
54192
  # resp.source_capacity_reservation.end_date_type #=> String, one of "unlimited", "limited"
@@ -53799,6 +54203,9 @@ module Aws::EC2
53799
54203
  # resp.source_capacity_reservation.capacity_allocations[0].count #=> Integer
53800
54204
  # resp.source_capacity_reservation.reservation_type #=> String, one of "default", "capacity-block"
53801
54205
  # resp.source_capacity_reservation.unused_reservation_billing_owner_id #=> String
54206
+ # resp.source_capacity_reservation.commitment_info.committed_instance_count #=> Integer
54207
+ # resp.source_capacity_reservation.commitment_info.commitment_end_date #=> Time
54208
+ # resp.source_capacity_reservation.delivery_preference #=> String, one of "fixed", "incremental"
53802
54209
  # resp.destination_capacity_reservation.capacity_reservation_id #=> String
53803
54210
  # resp.destination_capacity_reservation.owner_id #=> String
53804
54211
  # resp.destination_capacity_reservation.capacity_reservation_arn #=> String
@@ -53811,7 +54218,7 @@ module Aws::EC2
53811
54218
  # resp.destination_capacity_reservation.available_instance_count #=> Integer
53812
54219
  # resp.destination_capacity_reservation.ebs_optimized #=> Boolean
53813
54220
  # resp.destination_capacity_reservation.ephemeral_storage #=> Boolean
53814
- # resp.destination_capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed"
54221
+ # resp.destination_capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed", "assessing", "delayed", "unsupported"
53815
54222
  # resp.destination_capacity_reservation.start_date #=> Time
53816
54223
  # resp.destination_capacity_reservation.end_date #=> Time
53817
54224
  # resp.destination_capacity_reservation.end_date_type #=> String, one of "unlimited", "limited"
@@ -53828,6 +54235,9 @@ module Aws::EC2
53828
54235
  # resp.destination_capacity_reservation.capacity_allocations[0].count #=> Integer
53829
54236
  # resp.destination_capacity_reservation.reservation_type #=> String, one of "default", "capacity-block"
53830
54237
  # resp.destination_capacity_reservation.unused_reservation_billing_owner_id #=> String
54238
+ # resp.destination_capacity_reservation.commitment_info.committed_instance_count #=> Integer
54239
+ # resp.destination_capacity_reservation.commitment_info.commitment_end_date #=> Time
54240
+ # resp.destination_capacity_reservation.delivery_preference #=> String, one of "fixed", "incremental"
53831
54241
  # resp.instance_count #=> Integer
53832
54242
  #
53833
54243
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/MoveCapacityReservationInstances AWS API Documentation
@@ -54253,7 +54663,7 @@ module Aws::EC2
54253
54663
  # resp.capacity_reservation.available_instance_count #=> Integer
54254
54664
  # resp.capacity_reservation.ebs_optimized #=> Boolean
54255
54665
  # resp.capacity_reservation.ephemeral_storage #=> Boolean
54256
- # resp.capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed"
54666
+ # resp.capacity_reservation.state #=> String, one of "active", "expired", "cancelled", "pending", "failed", "scheduled", "payment-pending", "payment-failed", "assessing", "delayed", "unsupported"
54257
54667
  # resp.capacity_reservation.start_date #=> Time
54258
54668
  # resp.capacity_reservation.end_date #=> Time
54259
54669
  # resp.capacity_reservation.end_date_type #=> String, one of "unlimited", "limited"
@@ -54270,6 +54680,9 @@ module Aws::EC2
54270
54680
  # resp.capacity_reservation.capacity_allocations[0].count #=> Integer
54271
54681
  # resp.capacity_reservation.reservation_type #=> String, one of "default", "capacity-block"
54272
54682
  # resp.capacity_reservation.unused_reservation_billing_owner_id #=> String
54683
+ # resp.capacity_reservation.commitment_info.committed_instance_count #=> Integer
54684
+ # resp.capacity_reservation.commitment_info.commitment_end_date #=> Time
54685
+ # resp.capacity_reservation.delivery_preference #=> String, one of "fixed", "incremental"
54273
54686
  #
54274
54687
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PurchaseCapacityBlock AWS API Documentation
54275
54688
  #
@@ -54280,6 +54693,60 @@ module Aws::EC2
54280
54693
  req.send_request(options)
54281
54694
  end
54282
54695
 
54696
+ # Purchase the Capacity Block extension for use with your account. You
54697
+ # must specify the ID of the Capacity Block extension offering you are
54698
+ # purchasing.
54699
+ #
54700
+ # @option params [required, String] :capacity_block_extension_offering_id
54701
+ # The ID of the Capacity Block extension offering to purchase.
54702
+ #
54703
+ # @option params [required, String] :capacity_reservation_id
54704
+ # The ID of the Capacity reservation to be extended.
54705
+ #
54706
+ # @option params [Boolean] :dry_run
54707
+ # Checks whether you have the required permissions for the action,
54708
+ # without actually making the request, and provides an error response.
54709
+ # If you have the required permissions, the error response is
54710
+ # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
54711
+ #
54712
+ # @return [Types::PurchaseCapacityBlockExtensionResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
54713
+ #
54714
+ # * {Types::PurchaseCapacityBlockExtensionResult#capacity_block_extensions #capacity_block_extensions} => Array&lt;Types::CapacityBlockExtension&gt;
54715
+ #
54716
+ # @example Request syntax with placeholder values
54717
+ #
54718
+ # resp = client.purchase_capacity_block_extension({
54719
+ # capacity_block_extension_offering_id: "OfferingId", # required
54720
+ # capacity_reservation_id: "CapacityReservationId", # required
54721
+ # dry_run: false,
54722
+ # })
54723
+ #
54724
+ # @example Response structure
54725
+ #
54726
+ # resp.capacity_block_extensions #=> Array
54727
+ # resp.capacity_block_extensions[0].capacity_reservation_id #=> String
54728
+ # resp.capacity_block_extensions[0].instance_type #=> String
54729
+ # resp.capacity_block_extensions[0].instance_count #=> Integer
54730
+ # resp.capacity_block_extensions[0].availability_zone #=> String
54731
+ # resp.capacity_block_extensions[0].availability_zone_id #=> String
54732
+ # resp.capacity_block_extensions[0].capacity_block_extension_offering_id #=> String
54733
+ # resp.capacity_block_extensions[0].capacity_block_extension_duration_hours #=> Integer
54734
+ # resp.capacity_block_extensions[0].capacity_block_extension_status #=> String, one of "payment-pending", "payment-failed", "payment-succeeded"
54735
+ # resp.capacity_block_extensions[0].capacity_block_extension_purchase_date #=> Time
54736
+ # resp.capacity_block_extensions[0].capacity_block_extension_start_date #=> Time
54737
+ # resp.capacity_block_extensions[0].capacity_block_extension_end_date #=> Time
54738
+ # resp.capacity_block_extensions[0].upfront_fee #=> String
54739
+ # resp.capacity_block_extensions[0].currency_code #=> String
54740
+ #
54741
+ # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PurchaseCapacityBlockExtension AWS API Documentation
54742
+ #
54743
+ # @overload purchase_capacity_block_extension(params = {})
54744
+ # @param [Hash] params ({})
54745
+ def purchase_capacity_block_extension(params = {}, options = {})
54746
+ req = build_request(:purchase_capacity_block_extension, params)
54747
+ req.send_request(options)
54748
+ end
54749
+
54283
54750
  # Purchase a reservation with configurations that match those of your
54284
54751
  # Dedicated Host. You must have active Dedicated Hosts in your account
54285
54752
  # before you purchase a reservation. This action results in the
@@ -56428,7 +56895,7 @@ module Aws::EC2
56428
56895
  # min: 1,
56429
56896
  # max: 1,
56430
56897
  # },
56431
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
56898
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
56432
56899
  # memory_gi_b_per_v_cpu: {
56433
56900
  # min: 1.0,
56434
56901
  # max: 1.0,
@@ -56471,6 +56938,15 @@ module Aws::EC2
56471
56938
  # },
56472
56939
  # allowed_instance_types: ["AllowedInstanceType"],
56473
56940
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
56941
+ # baseline_performance_factors: {
56942
+ # cpu: {
56943
+ # references: [
56944
+ # {
56945
+ # instance_family: "String",
56946
+ # },
56947
+ # ],
56948
+ # },
56949
+ # },
56474
56950
  # },
56475
56951
  # security_groups: [
56476
56952
  # {
@@ -56504,7 +56980,7 @@ module Aws::EC2
56504
56980
  # min: 1,
56505
56981
  # max: 1,
56506
56982
  # },
56507
- # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services
56983
+ # cpu_manufacturers: ["intel"], # accepts intel, amd, amazon-web-services, apple
56508
56984
  # memory_gi_b_per_v_cpu: {
56509
56985
  # min: 1.0,
56510
56986
  # max: 1.0,
@@ -56547,6 +57023,15 @@ module Aws::EC2
56547
57023
  # },
56548
57024
  # allowed_instance_types: ["AllowedInstanceType"],
56549
57025
  # max_spot_price_as_percentage_of_optimal_on_demand_price: 1,
57026
+ # baseline_performance_factors: {
57027
+ # cpu: {
57028
+ # references: [
57029
+ # {
57030
+ # instance_family: "String",
57031
+ # },
57032
+ # ],
57033
+ # },
57034
+ # },
56550
57035
  # },
56551
57036
  # },
56552
57037
  # ],
@@ -58293,7 +58778,7 @@ module Aws::EC2
58293
58778
  # not specify this parameter, the instance's Capacity Reservation
58294
58779
  # preference defaults to `open`, which enables it to run in any open
58295
58780
  # Capacity Reservation that has matching attributes (instance type,
58296
- # platform, Availability Zone).
58781
+ # platform, Availability Zone, and tenancy).
58297
58782
  #
58298
58783
  # @option params [Types::HibernationOptionsRequest] :hibernation_options
58299
58784
  # Indicates whether an instance is enabled for hibernation. This
@@ -58593,7 +59078,7 @@ module Aws::EC2
58593
59078
  # amd_sev_snp: "enabled", # accepts enabled, disabled
58594
59079
  # },
58595
59080
  # capacity_reservation_specification: {
58596
- # capacity_reservation_preference: "open", # accepts open, none
59081
+ # capacity_reservation_preference: "capacity-reservations-only", # accepts capacity-reservations-only, open, none
58597
59082
  # capacity_reservation_target: {
58598
59083
  # capacity_reservation_id: "CapacityReservationId",
58599
59084
  # capacity_reservation_resource_group_arn: "String",
@@ -58801,7 +59286,7 @@ module Aws::EC2
58801
59286
  # resp.instances[0].cpu_options.threads_per_core #=> Integer
58802
59287
  # resp.instances[0].cpu_options.amd_sev_snp #=> String, one of "enabled", "disabled"
58803
59288
  # resp.instances[0].capacity_reservation_id #=> String
58804
- # resp.instances[0].capacity_reservation_specification.capacity_reservation_preference #=> String, one of "open", "none"
59289
+ # resp.instances[0].capacity_reservation_specification.capacity_reservation_preference #=> String, one of "capacity-reservations-only", "open", "none"
58805
59290
  # resp.instances[0].capacity_reservation_specification.capacity_reservation_target.capacity_reservation_id #=> String
58806
59291
  # resp.instances[0].capacity_reservation_specification.capacity_reservation_target.capacity_reservation_resource_group_arn #=> String
58807
59292
  # resp.instances[0].hibernation_options.configured #=> Boolean
@@ -61348,7 +61833,7 @@ module Aws::EC2
61348
61833
  tracer: tracer
61349
61834
  )
61350
61835
  context[:gem_name] = 'aws-sdk-ec2'
61351
- context[:gem_version] = '1.491.0'
61836
+ context[:gem_version] = '1.493.0'
61352
61837
  Seahorse::Client::Request.new(handlers, context)
61353
61838
  end
61354
61839