aws-sdk-ec2 1.89.0 → 1.90.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0ce0c353572f389ceafc301f28d262a6f4cc9e68
4
- data.tar.gz: fb0439c4fc8539332f90e09190417d7d03955084
3
+ metadata.gz: 96e7d054bd65722fcb9118bd156d719e5233926d
4
+ data.tar.gz: ad51ff1006c44c11b8d8660835935bcc79326b4d
5
5
  SHA512:
6
- metadata.gz: f0d613d5df487719d949e7eb1ec6e280c1d93270256c05583ab5b917fb7827518389a7f8986ad5944fd248f5c6bc1077bf3c5a73c6e9ae03fd9178da84060ad0
7
- data.tar.gz: a190c0043c3b5ba21d98812565d0b09f3603986577b63c0cd2cdcdcc283b5491af0868b376f485f458b933f4fea008cb62c51f5ffa6805c24eeec2e9f03d89e2
6
+ metadata.gz: 856bb69c739beb0faad3cca25b8cc5f298571b1dd09f05e54dd18f65159c8931b53077220cf6481ce1d83f17c68f737d0b2f896761c130461871e19ab62c743b
7
+ data.tar.gz: 9c0f55945ff836d366ff9d3f5c5d88db99f140696e8544650228bc0feb05c9f9474a844d1a965b73c8336c6f9808c0ce4b10347aee40443c07f8c0c30304e578
@@ -65,6 +65,6 @@ require_relative 'aws-sdk-ec2/customizations'
65
65
  # @service
66
66
  module Aws::EC2
67
67
 
68
- GEM_VERSION = '1.89.0'
68
+ GEM_VERSION = '1.90.0'
69
69
 
70
70
  end
@@ -658,11 +658,11 @@ module Aws::EC2
658
658
  # @option params [String] :client_token
659
659
  # Unique, case-sensitive identifier that you provide to ensure the
660
660
  # idempotency of the request. For more information, see [How to Ensure
661
- # Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
661
+ # Idempotency][1].
662
662
  #
663
663
  #
664
664
  #
665
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
665
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
666
666
  #
667
667
  # @option params [required, String] :instance_type
668
668
  # Specifies the instance type for which to configure your Dedicated
@@ -676,6 +676,17 @@ module Aws::EC2
676
676
  # @option params [Array<Types::TagSpecification>] :tag_specifications
677
677
  # The tags to apply to the Dedicated Host during creation.
678
678
  #
679
+ # @option params [String] :host_recovery
680
+ # Indicates whether to enable or disable host recovery for the Dedicated
681
+ # Host. Host recovery is disabled by default. For more information, see
682
+ # [ Host Recovery][1] in the *Amazon Elastic Compute Cloud User Guide*.
683
+ #
684
+ # Default: `off`
685
+ #
686
+ #
687
+ #
688
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-recovery.html
689
+ #
679
690
  # @return [Types::AllocateHostsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
680
691
  #
681
692
  # * {Types::AllocateHostsResult#host_ids #host_ids} => Array&lt;String&gt;
@@ -699,6 +710,7 @@ module Aws::EC2
699
710
  # ],
700
711
  # },
701
712
  # ],
713
+ # host_recovery: "on", # accepts on, off
702
714
  # })
703
715
  #
704
716
  # @example Response structure
@@ -3050,34 +3062,30 @@ module Aws::EC2
3050
3062
  #
3051
3063
  # @option params [String] :kms_key_id
3052
3064
  # An identifier for the AWS Key Management Service (AWS KMS) customer
3053
- # master key (CMK) to use when creating the encrypted volume. This
3054
- # parameter is only required if you want to use a non-default CMK; if
3055
- # this parameter is not specified, the default CMK for EBS is used. If a
3065
+ # master key (CMK) to use to encrypt the volume. This parameter is only
3066
+ # required if you want to use a customer-managed CMK; if this parameter
3067
+ # is not specified, your AWS-managed CMK for the account is used. If a
3056
3068
  # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
3057
3069
  #
3058
3070
  # The CMK identifier may be provided in any of the following formats:
3059
3071
  #
3060
- # * Key ID
3072
+ # * Key ID: For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
3061
3073
  #
3062
- # * Key alias. The alias ARN contains the `arn:aws:kms` namespace,
3063
- # followed by the Region of the CMK, the AWS account ID of the CMK
3064
- # owner, the `alias` namespace, and then the CMK alias. For example,
3065
- # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
3074
+ # * Key alias: For example, alias/ExampleAlias.
3066
3075
  #
3067
- # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
3068
- # followed by the Region of the CMK, the AWS account ID of the CMK
3069
- # owner, the `key` namespace, and then the CMK ID. For example,
3076
+ # * Key ARN: The key ARN contains the `arn:aws:kms` namespace, followed
3077
+ # by the Region of the CMK, the AWS account ID of the CMK owner, the
3078
+ # `key` namespace, and then the CMK ID. For example,
3070
3079
  # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
3071
3080
  #
3072
- # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
3073
- # namespace, followed by the Region of the CMK, the AWS account ID of
3074
- # the CMK owner, the `alias` namespace, and then the CMK alias. For
3075
- # example,
3081
+ # * Alias ARN: The alias ARN contains the `arn:aws:kms` namespace,
3082
+ # followed by the Region of the CMK, the AWS account ID of the CMK
3083
+ # owner, the `alias` namespace, and then the CMK alias. For example,
3076
3084
  # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
3077
3085
  #
3078
- # AWS parses `KmsKeyId` asynchronously, meaning that the action you call
3079
- # may appear to complete even though you provided an invalid identifier.
3080
- # The action will eventually fail.
3086
+ # AWS authenticates `KmsKeyId` asynchronously, meaning that the action
3087
+ # you call may appear to complete even though you provided an invalid
3088
+ # identifier. The action will eventually fail.
3081
3089
  #
3082
3090
  # @option params [String] :presigned_url
3083
3091
  # When you copy an encrypted source snapshot using the Amazon EC2 Query
@@ -4462,9 +4470,9 @@ module Aws::EC2
4462
4470
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami-ebs.html
4463
4471
  #
4464
4472
  # @option params [Array<Types::BlockDeviceMapping>] :block_device_mappings
4465
- # Tthe block device mappings. This parameter cannot be used to modify
4466
- # the encryption status of existing volumes or snapshots. To create an
4467
- # AMI with encrypted snapshots, use the CopyImage action.
4473
+ # The block device mappings. This parameter cannot be used to modify the
4474
+ # encryption status of existing volumes or snapshots. To create an AMI
4475
+ # with encrypted snapshots, use the CopyImage action.
4468
4476
  #
4469
4477
  # @option params [String] :description
4470
4478
  # A description for the new image.
@@ -7238,7 +7246,7 @@ module Aws::EC2
7238
7246
  #
7239
7247
  #
7240
7248
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/account-level-encryption.html
7241
- # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
7249
+ # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-by-default
7242
7250
  # [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances
7243
7251
  #
7244
7252
  # @option params [Integer] :iops
@@ -7259,33 +7267,29 @@ module Aws::EC2
7259
7267
  # @option params [String] :kms_key_id
7260
7268
  # An identifier for the AWS Key Management Service (AWS KMS) customer
7261
7269
  # master key (CMK) to use to encrypt the volume. This parameter is only
7262
- # required if you want to use a non-default CMK; if this parameter is
7263
- # not specified, the default CMK for EBS is used. If a `KmsKeyId` is
7264
- # specified, the `Encrypted` flag must also be set.
7270
+ # required if you want to use a customer-managed CMK; if this parameter
7271
+ # is not specified, your AWS-managed CMK for the account is used. If a
7272
+ # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
7265
7273
  #
7266
7274
  # The CMK identifier may be provided in any of the following formats:
7267
7275
  #
7268
- # * Key ID
7276
+ # * Key ID: For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
7269
7277
  #
7270
- # * Key alias. The alias ARN contains the `arn:aws:kms` namespace,
7271
- # followed by the Region of the CMK, the AWS account ID of the CMK
7272
- # owner, the `alias` namespace, and then the CMK alias. For example,
7273
- # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
7278
+ # * Key alias: For example, alias/ExampleAlias.
7274
7279
  #
7275
- # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
7276
- # followed by the Region of the CMK, the AWS account ID of the CMK
7277
- # owner, the `key` namespace, and then the CMK ID. For example,
7280
+ # * Key ARN: The key ARN contains the `arn:aws:kms` namespace, followed
7281
+ # by the Region of the CMK, the AWS account ID of the CMK owner, the
7282
+ # `key` namespace, and then the CMK ID. For example,
7278
7283
  # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
7279
7284
  #
7280
- # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
7281
- # namespace, followed by the Region of the CMK, the AWS account ID of
7282
- # the CMK owner, the `alias` namespace, and then the CMK alias. For
7283
- # example,
7285
+ # * Alias ARN: The alias ARN contains the `arn:aws:kms` namespace,
7286
+ # followed by the Region of the CMK, the AWS account ID of the CMK
7287
+ # owner, the `alias` namespace, and then the CMK alias. For example,
7284
7288
  # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
7285
7289
  #
7286
- # AWS parses `KmsKeyId` asynchronously, meaning that the action you call
7287
- # may appear to complete even though you provided an invalid identifier.
7288
- # The action will eventually fail.
7290
+ # AWS authenticates `KmsKeyId` asynchronously, meaning that the action
7291
+ # you call may appear to complete even though you provided an invalid
7292
+ # identifier. The action will eventually fail.
7289
7293
  #
7290
7294
  # @option params [Integer] :size
7291
7295
  # The size of the volume, in GiBs.
@@ -12400,11 +12404,13 @@ module Aws::EC2
12400
12404
  # page. The remaining results can be seen by sending another request
12401
12405
  # with the returned `nextToken` value. This value can be between 5 and
12402
12406
  # 500. If `maxResults` is given a larger value than 500, you receive an
12403
- # error. You cannot specify this parameter and the host IDs parameter in
12404
- # the same request.
12407
+ # error.
12408
+ #
12409
+ # You cannot specify this parameter and the host IDs parameter in the
12410
+ # same request.
12405
12411
  #
12406
12412
  # @option params [String] :next_token
12407
- # The token to retrieve the next page of results.
12413
+ # The token to use to retrieve the next page of results.
12408
12414
  #
12409
12415
  # @return [Types::DescribeHostsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
12410
12416
  #
@@ -12445,12 +12451,13 @@ module Aws::EC2
12445
12451
  # resp.hosts[0].instances #=> Array
12446
12452
  # resp.hosts[0].instances[0].instance_id #=> String
12447
12453
  # resp.hosts[0].instances[0].instance_type #=> String
12448
- # resp.hosts[0].state #=> String, one of "available", "under-assessment", "permanent-failure", "released", "released-permanent-failure"
12454
+ # resp.hosts[0].state #=> String, one of "available", "under-assessment", "permanent-failure", "released", "released-permanent-failure", "pending"
12449
12455
  # resp.hosts[0].allocation_time #=> Time
12450
12456
  # resp.hosts[0].release_time #=> Time
12451
12457
  # resp.hosts[0].tags #=> Array
12452
12458
  # resp.hosts[0].tags[0].key #=> String
12453
12459
  # resp.hosts[0].tags[0].value #=> String
12460
+ # resp.hosts[0].host_recovery #=> String, one of "on", "off"
12454
12461
  # resp.next_token #=> String
12455
12462
  #
12456
12463
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeHosts AWS API Documentation
@@ -21880,19 +21887,18 @@ module Aws::EC2
21880
21887
  #
21881
21888
  # If you do not specify a customer master key (CMK) in the API call that
21882
21889
  # creates the EBS volume, then the volume is encrypted to your AWS
21883
- # account's default CMK.
21890
+ # account's managed CMK.
21884
21891
  #
21885
- # You can specify a default CMK of your choice using
21886
- # ModifyEbsDefaultKmsKeyId.
21892
+ # You can specify a CMK of your choice using ModifyEbsDefaultKmsKeyId.
21887
21893
  #
21888
- # Enabling default encryption for EBS volumes has no effect on existing
21889
- # unencrypted volumes in your account. Encrypting the data in these
21890
- # requires manual action. You can either create an encrypted snapshot of
21891
- # an unencrypted volume, or encrypt a copy of an unencrypted snapshot.
21892
- # Any volume restored from an encrypted snapshot is also encrypted. For
21893
- # more information, see [Amazon EBS Snapshots][1].
21894
+ # Enabling encryption-by-default for EBS volumes has no effect on
21895
+ # existing unencrypted volumes in your account. Encrypting the data in
21896
+ # these requires manual action. You can either create an encrypted
21897
+ # snapshot of an unencrypted volume, or encrypt a copy of an unencrypted
21898
+ # snapshot. Any volume restored from an encrypted snapshot is also
21899
+ # encrypted. For more information, see [Amazon EBS Snapshots][1].
21894
21900
  #
21895
- # After EBS encryption by default is enabled, you can no longer launch
21901
+ # After EBS encryption-by-default is enabled, you can no longer launch
21896
21902
  # older-generation instance types that do not support encryption. For
21897
21903
  # more information, see [Supported Instance Types][2].
21898
21904
  #
@@ -23847,41 +23853,44 @@ module Aws::EC2
23847
23853
  req.send_request(options)
23848
23854
  end
23849
23855
 
23850
- # Changes the default customer master key (CMK) that your account uses
23851
- # to encrypt EBS volumes if you don't specify a CMK in the API call.
23856
+ # Changes the customer master key (CMK) that your account uses to
23857
+ # encrypt EBS volumes if you don't specify a CMK in the API call.
23852
23858
  #
23853
- # Your account has an AWS-managed default CMK that is used for
23859
+ # By default, your account has an AWS-managed CMK that is used for
23854
23860
  # encrypting an EBS volume when no CMK is specified in the API call that
23855
23861
  # creates the volume. By calling this API, you can specify a
23856
- # customer-managed CMK to use in place of the AWS-managed default CMK.
23862
+ # customer-managed CMK to use in place of the AWS-managed CMK.
23857
23863
  #
23858
- # Note: Deleting or disabling the custom CMK that you have specified to
23859
- # act as your default CMK will result in instance-launch failures.
23864
+ # Note: Deleting or disabling the CMK that you have specified to act as
23865
+ # your default CMK will result in instance-launch failures.
23860
23866
  #
23861
23867
  # @option params [required, String] :kms_key_id
23862
23868
  # An identifier for the AWS Key Management Service (AWS KMS) customer
23863
23869
  # master key (CMK) to use to encrypt the volume. This parameter is only
23864
- # required if you want to use a non-default CMK; if this parameter is
23865
- # not specified, the default CMK for EBS is used. If a `KmsKeyId` is
23866
- # specified, the `Encrypted` flag must also be set.
23870
+ # required if you want to use a customer-managed CMK; if this parameter
23871
+ # is not specified, your AWS-managed CMK for the account is used. If a
23872
+ # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
23867
23873
  #
23868
23874
  # The CMK identifier may be provided in any of the following formats:
23869
23875
  #
23870
- # * Key ID
23876
+ # * Key ID: For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
23871
23877
  #
23872
- # * Key alias
23878
+ # * Key alias: For example, alias/ExampleAlias.
23873
23879
  #
23874
- # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
23875
- # followed by the Region of the CMK, the AWS account ID of the CMK
23876
- # owner, the `key` namespace, and then the CMK ID. For example,
23880
+ # * Key ARN: The key ARN contains the `arn:aws:kms` namespace, followed
23881
+ # by the Region of the CMK, the AWS account ID of the CMK owner, the
23882
+ # `key` namespace, and then the CMK ID. For example,
23877
23883
  # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
23878
23884
  #
23879
- # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
23880
- # namespace, followed by the Region of the CMK, the AWS account ID of
23881
- # the CMK owner, the `alias` namespace, and then the CMK alias. For
23882
- # example,
23885
+ # * Alias ARN: The alias ARN contains the `arn:aws:kms` namespace,
23886
+ # followed by the Region of the CMK, the AWS account ID of the CMK
23887
+ # owner, the `alias` namespace, and then the CMK alias. For example,
23883
23888
  # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
23884
23889
  #
23890
+ # AWS authenticates `KmsKeyId` asynchronously, meaning that the action
23891
+ # you call may appear to complete even though you provided an invalid
23892
+ # identifier. The action will eventually fail.
23893
+ #
23885
23894
  # @option params [Boolean] :dry_run
23886
23895
  # Checks whether you have the required permissions for the action,
23887
23896
  # without actually making the request, and provides an error response.
@@ -24066,12 +24075,21 @@ module Aws::EC2
24066
24075
  # provided, the instance is launched onto a suitable host with
24067
24076
  # auto-placement enabled.
24068
24077
  #
24069
- # @option params [required, String] :auto_placement
24078
+ # @option params [String] :auto_placement
24070
24079
  # Specify whether to enable or disable auto-placement.
24071
24080
  #
24072
24081
  # @option params [required, Array<String>] :host_ids
24073
24082
  # The IDs of the Dedicated Hosts to modify.
24074
24083
  #
24084
+ # @option params [String] :host_recovery
24085
+ # Indicates whether to enable or disable host recovery for the Dedicated
24086
+ # Host. For more information, see [ Host Recovery][1] in the *Amazon
24087
+ # Elastic Compute Cloud User Guide*.
24088
+ #
24089
+ #
24090
+ #
24091
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-recovery.html
24092
+ #
24075
24093
  # @return [Types::ModifyHostsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
24076
24094
  #
24077
24095
  # * {Types::ModifyHostsResult#successful #successful} => Array&lt;String&gt;
@@ -24080,8 +24098,9 @@ module Aws::EC2
24080
24098
  # @example Request syntax with placeholder values
24081
24099
  #
24082
24100
  # resp = client.modify_hosts({
24083
- # auto_placement: "on", # required, accepts on, off
24101
+ # auto_placement: "on", # accepts on, off
24084
24102
  # host_ids: ["String"], # required
24103
+ # host_recovery: "on", # accepts on, off
24085
24104
  # })
24086
24105
  #
24087
24106
  # @example Response structure
@@ -26355,13 +26374,13 @@ module Aws::EC2
26355
26374
  # specified reservation being purchased and charged to your account.
26356
26375
  #
26357
26376
  # @option params [String] :client_token
26358
- # Unique, case-sensitive identifier you provide to ensure idempotency of
26359
- # the request. For more information, see [How to Ensure Idempotency][1]
26360
- # in the *Amazon Elastic Compute Cloud User Guide*.
26377
+ # Unique, case-sensitive identifier that you provide to ensure the
26378
+ # idempotency of the request. For more information, see [How to Ensure
26379
+ # Idempotency][1].
26361
26380
  #
26362
26381
  #
26363
26382
  #
26364
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
26383
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
26365
26384
  #
26366
26385
  # @option params [String] :currency_code
26367
26386
  # The currency in which the `totalUpfrontPrice`, `LimitPrice`, and
@@ -28993,11 +29012,7 @@ module Aws::EC2
28993
29012
  # [8]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesConnecting.html
28994
29013
  #
28995
29014
  # @option params [Array<Types::BlockDeviceMapping>] :block_device_mappings
28996
- # The block device mapping entries. You can't specify both a snapshot
28997
- # ID and an encryption value. This is because only blank volumes can be
28998
- # encrypted on creation. If a snapshot is the basis for a volume, it is
28999
- # not blank and its encryption status is used for the volume encryption
29000
- # status.
29015
+ # The block device mapping entries.
29001
29016
  #
29002
29017
  # @option params [String] :image_id
29003
29018
  # The ID of the AMI. An AMI ID is required to launch an instance and
@@ -30713,7 +30728,7 @@ module Aws::EC2
30713
30728
  params: params,
30714
30729
  config: config)
30715
30730
  context[:gem_name] = 'aws-sdk-ec2'
30716
- context[:gem_version] = '1.89.0'
30731
+ context[:gem_version] = '1.90.0'
30717
30732
  Seahorse::Client::Request.new(handlers, context)
30718
30733
  end
30719
30734
 
@@ -760,6 +760,7 @@ module Aws::EC2
760
760
  HostOffering = Shapes::StructureShape.new(name: 'HostOffering')
761
761
  HostOfferingSet = Shapes::ListShape.new(name: 'HostOfferingSet')
762
762
  HostProperties = Shapes::StructureShape.new(name: 'HostProperties')
763
+ HostRecovery = Shapes::StringShape.new(name: 'HostRecovery')
763
764
  HostReservation = Shapes::StructureShape.new(name: 'HostReservation')
764
765
  HostReservationIdSet = Shapes::ListShape.new(name: 'HostReservationIdSet')
765
766
  HostReservationSet = Shapes::ListShape.new(name: 'HostReservationSet')
@@ -1583,6 +1584,7 @@ module Aws::EC2
1583
1584
  AllocateHostsRequest.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, required: true, location_name: "instanceType"))
1584
1585
  AllocateHostsRequest.add_member(:quantity, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "quantity"))
1585
1586
  AllocateHostsRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
1587
+ AllocateHostsRequest.add_member(:host_recovery, Shapes::ShapeRef.new(shape: HostRecovery, location_name: "HostRecovery"))
1586
1588
  AllocateHostsRequest.struct_class = Types::AllocateHostsRequest
1587
1589
 
1588
1590
  AllocateHostsResult.add_member(:host_ids, Shapes::ShapeRef.new(shape: ResponseHostIdList, location_name: "hostIdSet"))
@@ -4553,6 +4555,7 @@ module Aws::EC2
4553
4555
  Host.add_member(:allocation_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "allocationTime"))
4554
4556
  Host.add_member(:release_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "releaseTime"))
4555
4557
  Host.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
4558
+ Host.add_member(:host_recovery, Shapes::ShapeRef.new(shape: HostRecovery, location_name: "hostRecovery"))
4556
4559
  Host.struct_class = Types::Host
4557
4560
 
4558
4561
  HostInstance.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
@@ -5454,8 +5457,9 @@ module Aws::EC2
5454
5457
  ModifyFpgaImageAttributeResult.add_member(:fpga_image_attribute, Shapes::ShapeRef.new(shape: FpgaImageAttribute, location_name: "fpgaImageAttribute"))
5455
5458
  ModifyFpgaImageAttributeResult.struct_class = Types::ModifyFpgaImageAttributeResult
5456
5459
 
5457
- ModifyHostsRequest.add_member(:auto_placement, Shapes::ShapeRef.new(shape: AutoPlacement, required: true, location_name: "autoPlacement"))
5460
+ ModifyHostsRequest.add_member(:auto_placement, Shapes::ShapeRef.new(shape: AutoPlacement, location_name: "autoPlacement"))
5458
5461
  ModifyHostsRequest.add_member(:host_ids, Shapes::ShapeRef.new(shape: RequestHostIdList, required: true, location_name: "hostId"))
5462
+ ModifyHostsRequest.add_member(:host_recovery, Shapes::ShapeRef.new(shape: HostRecovery, location_name: "HostRecovery"))
5459
5463
  ModifyHostsRequest.struct_class = Types::ModifyHostsRequest
5460
5464
 
5461
5465
  ModifyHostsResult.add_member(:successful, Shapes::ShapeRef.new(shape: ResponseHostIdList, location_name: "successful"))
@@ -636,9 +636,9 @@ module Aws::EC2
636
636
  # })
637
637
  # @param [Hash] options ({})
638
638
  # @option options [Array<Types::BlockDeviceMapping>] :block_device_mappings
639
- # Tthe block device mappings. This parameter cannot be used to modify
640
- # the encryption status of existing volumes or snapshots. To create an
641
- # AMI with encrypted snapshots, use the CopyImage action.
639
+ # The block device mappings. This parameter cannot be used to modify the
640
+ # encryption status of existing volumes or snapshots. To create an AMI
641
+ # with encrypted snapshots, use the CopyImage action.
642
642
  # @option options [String] :description
643
643
  # A description for the new image.
644
644
  # @option options [Boolean] :dry_run
@@ -195,11 +195,7 @@ module Aws::EC2
195
195
  # })
196
196
  # @param [Hash] options ({})
197
197
  # @option options [Array<Types::BlockDeviceMapping>] :block_device_mappings
198
- # The block device mapping entries. You can't specify both a snapshot
199
- # ID and an encryption value. This is because only blank volumes can be
200
- # encrypted on creation. If a snapshot is the basis for a volume, it is
201
- # not blank and its encryption status is used for the volume encryption
202
- # status.
198
+ # The block device mapping entries.
203
199
  # @option options [String] :image_id
204
200
  # The ID of the AMI. An AMI ID is required to launch an instance and
205
201
  # must be specified here or in a launch template.
@@ -899,7 +895,7 @@ module Aws::EC2
899
895
  #
900
896
  #
901
897
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/account-level-encryption.html
902
- # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
898
+ # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-by-default
903
899
  # [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances
904
900
  # @option options [Integer] :iops
905
901
  # The number of I/O operations per second (IOPS) to provision for the
@@ -918,33 +914,29 @@ module Aws::EC2
918
914
  # @option options [String] :kms_key_id
919
915
  # An identifier for the AWS Key Management Service (AWS KMS) customer
920
916
  # master key (CMK) to use to encrypt the volume. This parameter is only
921
- # required if you want to use a non-default CMK; if this parameter is
922
- # not specified, the default CMK for EBS is used. If a `KmsKeyId` is
923
- # specified, the `Encrypted` flag must also be set.
917
+ # required if you want to use a customer-managed CMK; if this parameter
918
+ # is not specified, your AWS-managed CMK for the account is used. If a
919
+ # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
924
920
  #
925
921
  # The CMK identifier may be provided in any of the following formats:
926
922
  #
927
- # * Key ID
923
+ # * Key ID: For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
928
924
  #
929
- # * Key alias. The alias ARN contains the `arn:aws:kms` namespace,
930
- # followed by the Region of the CMK, the AWS account ID of the CMK
931
- # owner, the `alias` namespace, and then the CMK alias. For example,
932
- # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
925
+ # * Key alias: For example, alias/ExampleAlias.
933
926
  #
934
- # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
935
- # followed by the Region of the CMK, the AWS account ID of the CMK
936
- # owner, the `key` namespace, and then the CMK ID. For example,
927
+ # * Key ARN: The key ARN contains the `arn:aws:kms` namespace, followed
928
+ # by the Region of the CMK, the AWS account ID of the CMK owner, the
929
+ # `key` namespace, and then the CMK ID. For example,
937
930
  # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
938
931
  #
939
- # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
940
- # namespace, followed by the Region of the CMK, the AWS account ID of
941
- # the CMK owner, the `alias` namespace, and then the CMK alias. For
942
- # example,
932
+ # * Alias ARN: The alias ARN contains the `arn:aws:kms` namespace,
933
+ # followed by the Region of the CMK, the AWS account ID of the CMK
934
+ # owner, the `alias` namespace, and then the CMK alias. For example,
943
935
  # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
944
936
  #
945
- # AWS parses `KmsKeyId` asynchronously, meaning that the action you call
946
- # may appear to complete even though you provided an invalid identifier.
947
- # The action will eventually fail.
937
+ # AWS authenticates `KmsKeyId` asynchronously, meaning that the action
938
+ # you call may appear to complete even though you provided an invalid
939
+ # identifier. The action will eventually fail.
948
940
  # @option options [Integer] :size
949
941
  # The size of the volume, in GiBs.
950
942
  #
@@ -315,34 +315,30 @@ module Aws::EC2
315
315
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
316
316
  # @option options [String] :kms_key_id
317
317
  # An identifier for the AWS Key Management Service (AWS KMS) customer
318
- # master key (CMK) to use when creating the encrypted volume. This
319
- # parameter is only required if you want to use a non-default CMK; if
320
- # this parameter is not specified, the default CMK for EBS is used. If a
318
+ # master key (CMK) to use to encrypt the volume. This parameter is only
319
+ # required if you want to use a customer-managed CMK; if this parameter
320
+ # is not specified, your AWS-managed CMK for the account is used. If a
321
321
  # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
322
322
  #
323
323
  # The CMK identifier may be provided in any of the following formats:
324
324
  #
325
- # * Key ID
325
+ # * Key ID: For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
326
326
  #
327
- # * Key alias. The alias ARN contains the `arn:aws:kms` namespace,
328
- # followed by the Region of the CMK, the AWS account ID of the CMK
329
- # owner, the `alias` namespace, and then the CMK alias. For example,
330
- # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
327
+ # * Key alias: For example, alias/ExampleAlias.
331
328
  #
332
- # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
333
- # followed by the Region of the CMK, the AWS account ID of the CMK
334
- # owner, the `key` namespace, and then the CMK ID. For example,
329
+ # * Key ARN: The key ARN contains the `arn:aws:kms` namespace, followed
330
+ # by the Region of the CMK, the AWS account ID of the CMK owner, the
331
+ # `key` namespace, and then the CMK ID. For example,
335
332
  # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
336
333
  #
337
- # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
338
- # namespace, followed by the Region of the CMK, the AWS account ID of
339
- # the CMK owner, the `alias` namespace, and then the CMK alias. For
340
- # example,
334
+ # * Alias ARN: The alias ARN contains the `arn:aws:kms` namespace,
335
+ # followed by the Region of the CMK, the AWS account ID of the CMK
336
+ # owner, the `alias` namespace, and then the CMK alias. For example,
341
337
  # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
342
338
  #
343
- # AWS parses `KmsKeyId` asynchronously, meaning that the action you call
344
- # may appear to complete even though you provided an invalid identifier.
345
- # The action will eventually fail.
339
+ # AWS authenticates `KmsKeyId` asynchronously, meaning that the action
340
+ # you call may appear to complete even though you provided an invalid
341
+ # identifier. The action will eventually fail.
346
342
  # @option options [String] :presigned_url
347
343
  # When you copy an encrypted source snapshot using the Amazon EC2 Query
348
344
  # API, you must supply a pre-signed URL. This parameter is optional for
@@ -390,11 +390,7 @@ module Aws::EC2
390
390
  # })
391
391
  # @param [Hash] options ({})
392
392
  # @option options [Array<Types::BlockDeviceMapping>] :block_device_mappings
393
- # The block device mapping entries. You can't specify both a snapshot
394
- # ID and an encryption value. This is because only blank volumes can be
395
- # encrypted on creation. If a snapshot is the basis for a volume, it is
396
- # not blank and its encryption status is used for the volume encryption
397
- # status.
393
+ # The block device mapping entries.
398
394
  # @option options [String] :image_id
399
395
  # The ID of the AMI. An AMI ID is required to launch an instance and
400
396
  # must be specified here or in a launch template.
@@ -442,6 +442,7 @@ module Aws::EC2
442
442
  # ],
443
443
  # },
444
444
  # ],
445
+ # host_recovery: "on", # accepts on, off
445
446
  # }
446
447
  #
447
448
  # @!attribute [rw] auto_placement
@@ -465,11 +466,11 @@ module Aws::EC2
465
466
  # @!attribute [rw] client_token
466
467
  # Unique, case-sensitive identifier that you provide to ensure the
467
468
  # idempotency of the request. For more information, see [How to Ensure
468
- # Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
469
+ # Idempotency][1].
469
470
  #
470
471
  #
471
472
  #
472
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
473
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
473
474
  # @return [String]
474
475
  #
475
476
  # @!attribute [rw] instance_type
@@ -487,6 +488,19 @@ module Aws::EC2
487
488
  # The tags to apply to the Dedicated Host during creation.
488
489
  # @return [Array<Types::TagSpecification>]
489
490
  #
491
+ # @!attribute [rw] host_recovery
492
+ # Indicates whether to enable or disable host recovery for the
493
+ # Dedicated Host. Host recovery is disabled by default. For more
494
+ # information, see [ Host Recovery][1] in the *Amazon Elastic Compute
495
+ # Cloud User Guide*.
496
+ #
497
+ # Default: `off`
498
+ #
499
+ #
500
+ #
501
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-recovery.html
502
+ # @return [String]
503
+ #
490
504
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AllocateHostsRequest AWS API Documentation
491
505
  #
492
506
  class AllocateHostsRequest < Struct.new(
@@ -495,7 +509,8 @@ module Aws::EC2
495
509
  :client_token,
496
510
  :instance_type,
497
511
  :quantity,
498
- :tag_specifications)
512
+ :tag_specifications,
513
+ :host_recovery)
499
514
  include Aws::Structure
500
515
  end
501
516
 
@@ -3796,33 +3811,30 @@ module Aws::EC2
3796
3811
  #
3797
3812
  # @!attribute [rw] kms_key_id
3798
3813
  # An identifier for the AWS Key Management Service (AWS KMS) customer
3799
- # master key (CMK) to use when creating the encrypted volume. This
3800
- # parameter is only required if you want to use a non-default CMK; if
3801
- # this parameter is not specified, the default CMK for EBS is used. If
3802
- # a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
3814
+ # master key (CMK) to use to encrypt the volume. This parameter is
3815
+ # only required if you want to use a customer-managed CMK; if this
3816
+ # parameter is not specified, your AWS-managed CMK for the account is
3817
+ # used. If a `KmsKeyId` is specified, the `Encrypted` flag must also
3818
+ # be set.
3803
3819
  #
3804
3820
  # The CMK identifier may be provided in any of the following formats:
3805
3821
  #
3806
- # * Key ID
3822
+ # * Key ID: For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
3807
3823
  #
3808
- # * Key alias. The alias ARN contains the `arn:aws:kms` namespace,
3809
- # followed by the Region of the CMK, the AWS account ID of the CMK
3810
- # owner, the `alias` namespace, and then the CMK alias. For example,
3811
- # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
3824
+ # * Key alias: For example, alias/ExampleAlias.
3812
3825
  #
3813
- # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
3826
+ # * Key ARN: The key ARN contains the `arn:aws:kms` namespace,
3814
3827
  # followed by the Region of the CMK, the AWS account ID of the CMK
3815
3828
  # owner, the `key` namespace, and then the CMK ID. For example,
3816
3829
  # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
3817
3830
  #
3818
- # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
3819
- # namespace, followed by the Region of the CMK, the AWS account ID
3820
- # of the CMK owner, the `alias` namespace, and then the CMK alias.
3821
- # For example,
3831
+ # * Alias ARN: The alias ARN contains the `arn:aws:kms` namespace,
3832
+ # followed by the Region of the CMK, the AWS account ID of the CMK
3833
+ # owner, the `alias` namespace, and then the CMK alias. For example,
3822
3834
  # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
3823
3835
  #
3824
- # AWS parses `KmsKeyId` asynchronously, meaning that the action you
3825
- # call may appear to complete even though you provided an invalid
3836
+ # AWS authenticates `KmsKeyId` asynchronously, meaning that the action
3837
+ # you call may appear to complete even though you provided an invalid
3826
3838
  # identifier. The action will eventually fail.
3827
3839
  # @return [String]
3828
3840
  #
@@ -5116,7 +5128,7 @@ module Aws::EC2
5116
5128
  # }
5117
5129
  #
5118
5130
  # @!attribute [rw] block_device_mappings
5119
- # Tthe block device mappings. This parameter cannot be used to modify
5131
+ # The block device mappings. This parameter cannot be used to modify
5120
5132
  # the encryption status of existing volumes or snapshots. To create an
5121
5133
  # AMI with encrypted snapshots, use the CopyImage action.
5122
5134
  # @return [Array<Types::BlockDeviceMapping>]
@@ -7053,7 +7065,7 @@ module Aws::EC2
7053
7065
  #
7054
7066
  #
7055
7067
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/account-level-encryption.html
7056
- # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
7068
+ # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-by-default
7057
7069
  # [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances
7058
7070
  # @return [Boolean]
7059
7071
  #
@@ -7077,32 +7089,29 @@ module Aws::EC2
7077
7089
  # @!attribute [rw] kms_key_id
7078
7090
  # An identifier for the AWS Key Management Service (AWS KMS) customer
7079
7091
  # master key (CMK) to use to encrypt the volume. This parameter is
7080
- # only required if you want to use a non-default CMK; if this
7081
- # parameter is not specified, the default CMK for EBS is used. If a
7082
- # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
7092
+ # only required if you want to use a customer-managed CMK; if this
7093
+ # parameter is not specified, your AWS-managed CMK for the account is
7094
+ # used. If a `KmsKeyId` is specified, the `Encrypted` flag must also
7095
+ # be set.
7083
7096
  #
7084
7097
  # The CMK identifier may be provided in any of the following formats:
7085
7098
  #
7086
- # * Key ID
7099
+ # * Key ID: For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
7087
7100
  #
7088
- # * Key alias. The alias ARN contains the `arn:aws:kms` namespace,
7089
- # followed by the Region of the CMK, the AWS account ID of the CMK
7090
- # owner, the `alias` namespace, and then the CMK alias. For example,
7091
- # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
7101
+ # * Key alias: For example, alias/ExampleAlias.
7092
7102
  #
7093
- # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
7103
+ # * Key ARN: The key ARN contains the `arn:aws:kms` namespace,
7094
7104
  # followed by the Region of the CMK, the AWS account ID of the CMK
7095
7105
  # owner, the `key` namespace, and then the CMK ID. For example,
7096
7106
  # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
7097
7107
  #
7098
- # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
7099
- # namespace, followed by the Region of the CMK, the AWS account ID
7100
- # of the CMK owner, the `alias` namespace, and then the CMK alias.
7101
- # For example,
7108
+ # * Alias ARN: The alias ARN contains the `arn:aws:kms` namespace,
7109
+ # followed by the Region of the CMK, the AWS account ID of the CMK
7110
+ # owner, the `alias` namespace, and then the CMK alias. For example,
7102
7111
  # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
7103
7112
  #
7104
- # AWS parses `KmsKeyId` asynchronously, meaning that the action you
7105
- # call may appear to complete even though you provided an invalid
7113
+ # AWS authenticates `KmsKeyId` asynchronously, meaning that the action
7114
+ # you call may appear to complete even though you provided an invalid
7106
7115
  # identifier. The action will eventually fail.
7107
7116
  # @return [String]
7108
7117
  #
@@ -11401,12 +11410,14 @@ module Aws::EC2
11401
11410
  # page. The remaining results can be seen by sending another request
11402
11411
  # with the returned `nextToken` value. This value can be between 5 and
11403
11412
  # 500. If `maxResults` is given a larger value than 500, you receive
11404
- # an error. You cannot specify this parameter and the host IDs
11405
- # parameter in the same request.
11413
+ # an error.
11414
+ #
11415
+ # You cannot specify this parameter and the host IDs parameter in the
11416
+ # same request.
11406
11417
  # @return [Integer]
11407
11418
  #
11408
11419
  # @!attribute [rw] next_token
11409
- # The token to retrieve the next page of results.
11420
+ # The token to use to retrieve the next page of results.
11410
11421
  # @return [String]
11411
11422
  #
11412
11423
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeHostsRequest AWS API Documentation
@@ -20966,13 +20977,13 @@ module Aws::EC2
20966
20977
  # @return [Types::AvailableCapacity]
20967
20978
  #
20968
20979
  # @!attribute [rw] client_token
20969
- # Unique, case-sensitive identifier that you provide to ensure
20980
+ # Unique, case-sensitive identifier that you provide to ensure the
20970
20981
  # idempotency of the request. For more information, see [How to Ensure
20971
- # Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
20982
+ # Idempotency][1].
20972
20983
  #
20973
20984
  #
20974
20985
  #
20975
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
20986
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
20976
20987
  # @return [String]
20977
20988
  #
20978
20989
  # @!attribute [rw] host_id
@@ -21010,6 +21021,11 @@ module Aws::EC2
21010
21021
  # Any tags assigned to the Dedicated Host.
21011
21022
  # @return [Array<Types::Tag>]
21012
21023
  #
21024
+ # @!attribute [rw] host_recovery
21025
+ # Indicates whether host recovery is enabled or disabled for the
21026
+ # Dedicated Host.
21027
+ # @return [String]
21028
+ #
21013
21029
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Host AWS API Documentation
21014
21030
  #
21015
21031
  class Host < Struct.new(
@@ -21024,7 +21040,8 @@ module Aws::EC2
21024
21040
  :state,
21025
21041
  :allocation_time,
21026
21042
  :release_time,
21027
- :tags)
21043
+ :tags,
21044
+ :host_recovery)
21028
21045
  include Aws::Structure
21029
21046
  end
21030
21047
 
@@ -25699,26 +25716,30 @@ module Aws::EC2
25699
25716
  # @!attribute [rw] kms_key_id
25700
25717
  # An identifier for the AWS Key Management Service (AWS KMS) customer
25701
25718
  # master key (CMK) to use to encrypt the volume. This parameter is
25702
- # only required if you want to use a non-default CMK; if this
25703
- # parameter is not specified, the default CMK for EBS is used. If a
25704
- # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
25719
+ # only required if you want to use a customer-managed CMK; if this
25720
+ # parameter is not specified, your AWS-managed CMK for the account is
25721
+ # used. If a `KmsKeyId` is specified, the `Encrypted` flag must also
25722
+ # be set.
25705
25723
  #
25706
25724
  # The CMK identifier may be provided in any of the following formats:
25707
25725
  #
25708
- # * Key ID
25726
+ # * Key ID: For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.
25709
25727
  #
25710
- # * Key alias
25728
+ # * Key alias: For example, alias/ExampleAlias.
25711
25729
  #
25712
- # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
25730
+ # * Key ARN: The key ARN contains the `arn:aws:kms` namespace,
25713
25731
  # followed by the Region of the CMK, the AWS account ID of the CMK
25714
25732
  # owner, the `key` namespace, and then the CMK ID. For example,
25715
25733
  # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
25716
25734
  #
25717
- # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
25718
- # namespace, followed by the Region of the CMK, the AWS account ID
25719
- # of the CMK owner, the `alias` namespace, and then the CMK alias.
25720
- # For example,
25735
+ # * Alias ARN: The alias ARN contains the `arn:aws:kms` namespace,
25736
+ # followed by the Region of the CMK, the AWS account ID of the CMK
25737
+ # owner, the `alias` namespace, and then the CMK alias. For example,
25721
25738
  # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
25739
+ #
25740
+ # AWS authenticates `KmsKeyId` asynchronously, meaning that the action
25741
+ # you call may appear to complete even though you provided an invalid
25742
+ # identifier. The action will eventually fail.
25722
25743
  # @return [String]
25723
25744
  #
25724
25745
  # @!attribute [rw] dry_run
@@ -25913,8 +25934,9 @@ module Aws::EC2
25913
25934
  # data as a hash:
25914
25935
  #
25915
25936
  # {
25916
- # auto_placement: "on", # required, accepts on, off
25937
+ # auto_placement: "on", # accepts on, off
25917
25938
  # host_ids: ["String"], # required
25939
+ # host_recovery: "on", # accepts on, off
25918
25940
  # }
25919
25941
  #
25920
25942
  # @!attribute [rw] auto_placement
@@ -25925,11 +25947,22 @@ module Aws::EC2
25925
25947
  # The IDs of the Dedicated Hosts to modify.
25926
25948
  # @return [Array<String>]
25927
25949
  #
25950
+ # @!attribute [rw] host_recovery
25951
+ # Indicates whether to enable or disable host recovery for the
25952
+ # Dedicated Host. For more information, see [ Host Recovery][1] in the
25953
+ # *Amazon Elastic Compute Cloud User Guide*.
25954
+ #
25955
+ #
25956
+ #
25957
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-recovery.html
25958
+ # @return [String]
25959
+ #
25928
25960
  # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyHostsRequest AWS API Documentation
25929
25961
  #
25930
25962
  class ModifyHostsRequest < Struct.new(
25931
25963
  :auto_placement,
25932
- :host_ids)
25964
+ :host_ids,
25965
+ :host_recovery)
25933
25966
  include Aws::Structure
25934
25967
  end
25935
25968
 
@@ -29085,13 +29118,13 @@ module Aws::EC2
29085
29118
  # }
29086
29119
  #
29087
29120
  # @!attribute [rw] client_token
29088
- # Unique, case-sensitive identifier you provide to ensure idempotency
29089
- # of the request. For more information, see [How to Ensure
29090
- # Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
29121
+ # Unique, case-sensitive identifier that you provide to ensure the
29122
+ # idempotency of the request. For more information, see [How to Ensure
29123
+ # Idempotency][1].
29091
29124
  #
29092
29125
  #
29093
29126
  #
29094
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
29127
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
29095
29128
  # @return [String]
29096
29129
  #
29097
29130
  # @!attribute [rw] currency_code
@@ -29131,13 +29164,13 @@ module Aws::EC2
29131
29164
  end
29132
29165
 
29133
29166
  # @!attribute [rw] client_token
29134
- # Unique, case-sensitive identifier you provide to ensure idempotency
29135
- # of the request. For more information, see [How to Ensure
29136
- # Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
29167
+ # Unique, case-sensitive identifier that you provide to ensure the
29168
+ # idempotency of the request. For more information, see [How to Ensure
29169
+ # Idempotency][1].
29137
29170
  #
29138
29171
  #
29139
29172
  #
29140
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
29173
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
29141
29174
  # @return [String]
29142
29175
  #
29143
29176
  # @!attribute [rw] currency_code
@@ -32681,11 +32714,7 @@ module Aws::EC2
32681
32714
  # }
32682
32715
  #
32683
32716
  # @!attribute [rw] block_device_mappings
32684
- # The block device mapping entries. You can't specify both a snapshot
32685
- # ID and an encryption value. This is because only blank volumes can
32686
- # be encrypted on creation. If a snapshot is the basis for a volume,
32687
- # it is not blank and its encryption status is used for the volume
32688
- # encryption status.
32717
+ # The block device mapping entries.
32689
32718
  # @return [Array<Types::BlockDeviceMapping>]
32690
32719
  #
32691
32720
  # @!attribute [rw] image_id
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aws-sdk-ec2
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.89.0
4
+ version: 1.90.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Amazon Web Services
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-06-03 00:00:00.000000000 Z
11
+ date: 2019-06-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sigv4