aws-sdk-ec2 1.55.0 → 1.56.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: b2f5b5a6884a20fb1d5ead5573415ddac1944adb
4
- data.tar.gz: 7b8f1011d03026acea87dcf33071cd2e5f4a828d
3
+ metadata.gz: ca9d6e4b22e378f2368b5faadb338dec831cf76b
4
+ data.tar.gz: cffb436f95a46813cdfce209a664c336b8495de7
5
5
  SHA512:
6
- metadata.gz: 45e9a29187f1cb10db8d5b6efe4eb67f4cf4a454eaeaf19219e8a8fcd203c229db3d8c0efc51b56ffcfcd7dafc3457d8b0750f80ea8cb27a9a6ca434cb3c90b5
7
- data.tar.gz: fe8eeebfb16ded4968fef0fb8c7c217f833ecd0af411527f88de095936a4a5bcda61e00693d8cee694da7821a2e3fdcc0afbd4e0df511b3a576450f808d928ac
6
+ metadata.gz: e7cd598c3abc2d6aee474beac33d08177c6bfa4cc048bc3d27af2040721edfb5da0740d4fbdb011e1224666dbee796c026217c7763e23ae272dba7a1e0570b80
7
+ data.tar.gz: 6ece7ce29754c099c046ca6e8376f2cb84318d30626ac9395f554c2f3d29abb23cd63d2dc2bf5f567a1019acba492694b5f584776a7e1416f2b5e888d57e522d
@@ -65,6 +65,6 @@ require_relative 'aws-sdk-ec2/customizations'
65
65
  # @service
66
66
  module Aws::EC2
67
67
 
68
- GEM_VERSION = '1.55.0'
68
+ GEM_VERSION = '1.56.0'
69
69
 
70
70
  end
@@ -11233,9 +11233,11 @@ module Aws::EC2
11233
11233
  # resp.import_image_tasks #=> Array
11234
11234
  # resp.import_image_tasks[0].architecture #=> String
11235
11235
  # resp.import_image_tasks[0].description #=> String
11236
+ # resp.import_image_tasks[0].encrypted #=> Boolean
11236
11237
  # resp.import_image_tasks[0].hypervisor #=> String
11237
11238
  # resp.import_image_tasks[0].image_id #=> String
11238
11239
  # resp.import_image_tasks[0].import_task_id #=> String
11240
+ # resp.import_image_tasks[0].kms_key_id #=> String
11239
11241
  # resp.import_image_tasks[0].license_type #=> String
11240
11242
  # resp.import_image_tasks[0].platform #=> String
11241
11243
  # resp.import_image_tasks[0].progress #=> String
@@ -11313,7 +11315,9 @@ module Aws::EC2
11313
11315
  # resp.import_snapshot_tasks[0].import_task_id #=> String
11314
11316
  # resp.import_snapshot_tasks[0].snapshot_task_detail.description #=> String
11315
11317
  # resp.import_snapshot_tasks[0].snapshot_task_detail.disk_image_size #=> Float
11318
+ # resp.import_snapshot_tasks[0].snapshot_task_detail.encrypted #=> Boolean
11316
11319
  # resp.import_snapshot_tasks[0].snapshot_task_detail.format #=> String
11320
+ # resp.import_snapshot_tasks[0].snapshot_task_detail.kms_key_id #=> String
11317
11321
  # resp.import_snapshot_tasks[0].snapshot_task_detail.progress #=> String
11318
11322
  # resp.import_snapshot_tasks[0].snapshot_task_detail.snapshot_id #=> String
11319
11323
  # resp.import_snapshot_tasks[0].snapshot_task_detail.status #=> String
@@ -19973,11 +19977,53 @@ module Aws::EC2
19973
19977
  # If you have the required permissions, the error response is
19974
19978
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
19975
19979
  #
19980
+ # @option params [Boolean] :encrypted
19981
+ # Specifies whether the destination AMI of the imported image should be
19982
+ # encrypted. The default CMK for EBS is used unless you specify a
19983
+ # non-default AWS Key Management Service (AWS KMS) CMK using `KmsKeyId`.
19984
+ # For more information, see [Amazon EBS Encryption][1] in the *Amazon
19985
+ # Elastic Compute Cloud User Guide*.
19986
+ #
19987
+ #
19988
+ #
19989
+ # [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
19990
+ #
19976
19991
  # @option params [String] :hypervisor
19977
19992
  # The target hypervisor platform.
19978
19993
  #
19979
19994
  # Valid values: `xen`
19980
19995
  #
19996
+ # @option params [String] :kms_key_id
19997
+ # An identifier for the AWS Key Management Service (AWS KMS) customer
19998
+ # master key (CMK) to use when creating the encrypted AMI. This
19999
+ # parameter is only required if you want to use a non-default CMK; if
20000
+ # this parameter is not specified, the default CMK for EBS is used. If a
20001
+ # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
20002
+ #
20003
+ # The CMK identifier may be provided in any of the following formats:
20004
+ #
20005
+ # * Key ID
20006
+ #
20007
+ # * Key alias, in the form `alias/ExampleAlias `
20008
+ #
20009
+ # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
20010
+ # followed by the region of the CMK, the AWS account ID of the CMK
20011
+ # owner, the `key` namespace, and then the CMK ID. For example,
20012
+ # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
20013
+ #
20014
+ # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
20015
+ # namespace, followed by the region of the CMK, the AWS account ID of
20016
+ # the CMK owner, the `alias` namespace, and then the CMK alias. For
20017
+ # example,
20018
+ # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
20019
+ #
20020
+ # AWS parses `KmsKeyId` asynchronously, meaning that the action you call
20021
+ # may appear to complete even though you provided an invalid identifier.
20022
+ # This action will eventually report failure.
20023
+ #
20024
+ # The specified CMK must exist in the region that the AMI is being
20025
+ # copied to.
20026
+ #
19981
20027
  # @option params [String] :license_type
19982
20028
  # The license type to be used for the Amazon Machine Image (AMI) after
19983
20029
  # importing.
@@ -20006,9 +20052,11 @@ module Aws::EC2
20006
20052
  #
20007
20053
  # * {Types::ImportImageResult#architecture #architecture} => String
20008
20054
  # * {Types::ImportImageResult#description #description} => String
20055
+ # * {Types::ImportImageResult#encrypted #encrypted} => Boolean
20009
20056
  # * {Types::ImportImageResult#hypervisor #hypervisor} => String
20010
20057
  # * {Types::ImportImageResult#image_id #image_id} => String
20011
20058
  # * {Types::ImportImageResult#import_task_id #import_task_id} => String
20059
+ # * {Types::ImportImageResult#kms_key_id #kms_key_id} => String
20012
20060
  # * {Types::ImportImageResult#license_type #license_type} => String
20013
20061
  # * {Types::ImportImageResult#platform #platform} => String
20014
20062
  # * {Types::ImportImageResult#progress #progress} => String
@@ -20042,7 +20090,9 @@ module Aws::EC2
20042
20090
  # },
20043
20091
  # ],
20044
20092
  # dry_run: false,
20093
+ # encrypted: false,
20045
20094
  # hypervisor: "String",
20095
+ # kms_key_id: "String",
20046
20096
  # license_type: "String",
20047
20097
  # platform: "String",
20048
20098
  # role_name: "String",
@@ -20052,9 +20102,11 @@ module Aws::EC2
20052
20102
  #
20053
20103
  # resp.architecture #=> String
20054
20104
  # resp.description #=> String
20105
+ # resp.encrypted #=> Boolean
20055
20106
  # resp.hypervisor #=> String
20056
20107
  # resp.image_id #=> String
20057
20108
  # resp.import_task_id #=> String
20109
+ # resp.kms_key_id #=> String
20058
20110
  # resp.license_type #=> String
20059
20111
  # resp.platform #=> String
20060
20112
  # resp.progress #=> String
@@ -20277,6 +20329,48 @@ module Aws::EC2
20277
20329
  # If you have the required permissions, the error response is
20278
20330
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
20279
20331
  #
20332
+ # @option params [Boolean] :encrypted
20333
+ # Specifies whether the destination snapshot of the imported image
20334
+ # should be encrypted. The default CMK for EBS is used unless you
20335
+ # specify a non-default AWS Key Management Service (AWS KMS) CMK using
20336
+ # `KmsKeyId`. For more information, see [Amazon EBS Encryption][1] in
20337
+ # the *Amazon Elastic Compute Cloud User Guide*.
20338
+ #
20339
+ #
20340
+ #
20341
+ # [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
20342
+ #
20343
+ # @option params [String] :kms_key_id
20344
+ # An identifier for the AWS Key Management Service (AWS KMS) customer
20345
+ # master key (CMK) to use when creating the encrypted snapshot. This
20346
+ # parameter is only required if you want to use a non-default CMK; if
20347
+ # this parameter is not specified, the default CMK for EBS is used. If a
20348
+ # `KmsKeyId` is specified, the `Encrypted` flag must also be set.
20349
+ #
20350
+ # The CMK identifier may be provided in any of the following formats:
20351
+ #
20352
+ # * Key ID
20353
+ #
20354
+ # * Key alias, in the form `alias/ExampleAlias `
20355
+ #
20356
+ # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
20357
+ # followed by the region of the CMK, the AWS account ID of the CMK
20358
+ # owner, the `key` namespace, and then the CMK ID. For example,
20359
+ # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
20360
+ #
20361
+ # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
20362
+ # namespace, followed by the region of the CMK, the AWS account ID of
20363
+ # the CMK owner, the `alias` namespace, and then the CMK alias. For
20364
+ # example,
20365
+ # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
20366
+ #
20367
+ # AWS parses `KmsKeyId` asynchronously, meaning that the action you call
20368
+ # may appear to complete even though you provided an invalid identifier.
20369
+ # This action will eventually report failure.
20370
+ #
20371
+ # The specified CMK must exist in the region that the snapshot is being
20372
+ # copied to.
20373
+ #
20280
20374
  # @option params [String] :role_name
20281
20375
  # The name of the role to use when not using the default role,
20282
20376
  # 'vmimport'.
@@ -20308,6 +20402,8 @@ module Aws::EC2
20308
20402
  # },
20309
20403
  # },
20310
20404
  # dry_run: false,
20405
+ # encrypted: false,
20406
+ # kms_key_id: "String",
20311
20407
  # role_name: "String",
20312
20408
  # })
20313
20409
  #
@@ -20317,7 +20413,9 @@ module Aws::EC2
20317
20413
  # resp.import_task_id #=> String
20318
20414
  # resp.snapshot_task_detail.description #=> String
20319
20415
  # resp.snapshot_task_detail.disk_image_size #=> Float
20416
+ # resp.snapshot_task_detail.encrypted #=> Boolean
20320
20417
  # resp.snapshot_task_detail.format #=> String
20418
+ # resp.snapshot_task_detail.kms_key_id #=> String
20321
20419
  # resp.snapshot_task_detail.progress #=> String
20322
20420
  # resp.snapshot_task_detail.snapshot_id #=> String
20323
20421
  # resp.snapshot_task_detail.status #=> String
@@ -26593,7 +26691,7 @@ module Aws::EC2
26593
26691
  params: params,
26594
26692
  config: config)
26595
26693
  context[:gem_name] = 'aws-sdk-ec2'
26596
- context[:gem_version] = '1.55.0'
26694
+ context[:gem_version] = '1.56.0'
26597
26695
  Seahorse::Client::Request.new(handlers, context)
26598
26696
  end
26599
26697
 
@@ -3829,7 +3829,9 @@ module Aws::EC2
3829
3829
  ImportImageRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
3830
3830
  ImportImageRequest.add_member(:disk_containers, Shapes::ShapeRef.new(shape: ImageDiskContainerList, location_name: "DiskContainer"))
3831
3831
  ImportImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
3832
+ ImportImageRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "Encrypted"))
3832
3833
  ImportImageRequest.add_member(:hypervisor, Shapes::ShapeRef.new(shape: String, location_name: "Hypervisor"))
3834
+ ImportImageRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "KmsKeyId"))
3833
3835
  ImportImageRequest.add_member(:license_type, Shapes::ShapeRef.new(shape: String, location_name: "LicenseType"))
3834
3836
  ImportImageRequest.add_member(:platform, Shapes::ShapeRef.new(shape: String, location_name: "Platform"))
3835
3837
  ImportImageRequest.add_member(:role_name, Shapes::ShapeRef.new(shape: String, location_name: "RoleName"))
@@ -3837,9 +3839,11 @@ module Aws::EC2
3837
3839
 
3838
3840
  ImportImageResult.add_member(:architecture, Shapes::ShapeRef.new(shape: String, location_name: "architecture"))
3839
3841
  ImportImageResult.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
3842
+ ImportImageResult.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
3840
3843
  ImportImageResult.add_member(:hypervisor, Shapes::ShapeRef.new(shape: String, location_name: "hypervisor"))
3841
3844
  ImportImageResult.add_member(:image_id, Shapes::ShapeRef.new(shape: String, location_name: "imageId"))
3842
3845
  ImportImageResult.add_member(:import_task_id, Shapes::ShapeRef.new(shape: String, location_name: "importTaskId"))
3846
+ ImportImageResult.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "kmsKeyId"))
3843
3847
  ImportImageResult.add_member(:license_type, Shapes::ShapeRef.new(shape: String, location_name: "licenseType"))
3844
3848
  ImportImageResult.add_member(:platform, Shapes::ShapeRef.new(shape: String, location_name: "platform"))
3845
3849
  ImportImageResult.add_member(:progress, Shapes::ShapeRef.new(shape: String, location_name: "progress"))
@@ -3850,9 +3854,11 @@ module Aws::EC2
3850
3854
 
3851
3855
  ImportImageTask.add_member(:architecture, Shapes::ShapeRef.new(shape: String, location_name: "architecture"))
3852
3856
  ImportImageTask.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
3857
+ ImportImageTask.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
3853
3858
  ImportImageTask.add_member(:hypervisor, Shapes::ShapeRef.new(shape: String, location_name: "hypervisor"))
3854
3859
  ImportImageTask.add_member(:image_id, Shapes::ShapeRef.new(shape: String, location_name: "imageId"))
3855
3860
  ImportImageTask.add_member(:import_task_id, Shapes::ShapeRef.new(shape: String, location_name: "importTaskId"))
3861
+ ImportImageTask.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "kmsKeyId"))
3856
3862
  ImportImageTask.add_member(:license_type, Shapes::ShapeRef.new(shape: String, location_name: "licenseType"))
3857
3863
  ImportImageTask.add_member(:platform, Shapes::ShapeRef.new(shape: String, location_name: "platform"))
3858
3864
  ImportImageTask.add_member(:progress, Shapes::ShapeRef.new(shape: String, location_name: "progress"))
@@ -3917,6 +3923,8 @@ module Aws::EC2
3917
3923
  ImportSnapshotRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
3918
3924
  ImportSnapshotRequest.add_member(:disk_container, Shapes::ShapeRef.new(shape: SnapshotDiskContainer, location_name: "DiskContainer"))
3919
3925
  ImportSnapshotRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
3926
+ ImportSnapshotRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "Encrypted"))
3927
+ ImportSnapshotRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "KmsKeyId"))
3920
3928
  ImportSnapshotRequest.add_member(:role_name, Shapes::ShapeRef.new(shape: String, location_name: "RoleName"))
3921
3929
  ImportSnapshotRequest.struct_class = Types::ImportSnapshotRequest
3922
3930
 
@@ -5797,7 +5805,9 @@ module Aws::EC2
5797
5805
 
5798
5806
  SnapshotTaskDetail.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
5799
5807
  SnapshotTaskDetail.add_member(:disk_image_size, Shapes::ShapeRef.new(shape: Double, location_name: "diskImageSize"))
5808
+ SnapshotTaskDetail.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
5800
5809
  SnapshotTaskDetail.add_member(:format, Shapes::ShapeRef.new(shape: String, location_name: "format"))
5810
+ SnapshotTaskDetail.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "kmsKeyId"))
5801
5811
  SnapshotTaskDetail.add_member(:progress, Shapes::ShapeRef.new(shape: String, location_name: "progress"))
5802
5812
  SnapshotTaskDetail.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
5803
5813
  SnapshotTaskDetail.add_member(:status, Shapes::ShapeRef.new(shape: String, location_name: "status"))
@@ -17759,7 +17759,9 @@ module Aws::EC2
17759
17759
  # },
17760
17760
  # ],
17761
17761
  # dry_run: false,
17762
+ # encrypted: false,
17762
17763
  # hypervisor: "String",
17764
+ # kms_key_id: "String",
17763
17765
  # license_type: "String",
17764
17766
  # platform: "String",
17765
17767
  # role_name: "String",
@@ -17794,12 +17796,56 @@ module Aws::EC2
17794
17796
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
17795
17797
  # @return [Boolean]
17796
17798
  #
17799
+ # @!attribute [rw] encrypted
17800
+ # Specifies whether the destination AMI of the imported image should
17801
+ # be encrypted. The default CMK for EBS is used unless you specify a
17802
+ # non-default AWS Key Management Service (AWS KMS) CMK using
17803
+ # `KmsKeyId`. For more information, see [Amazon EBS Encryption][1] in
17804
+ # the *Amazon Elastic Compute Cloud User Guide*.
17805
+ #
17806
+ #
17807
+ #
17808
+ # [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
17809
+ # @return [Boolean]
17810
+ #
17797
17811
  # @!attribute [rw] hypervisor
17798
17812
  # The target hypervisor platform.
17799
17813
  #
17800
17814
  # Valid values: `xen`
17801
17815
  # @return [String]
17802
17816
  #
17817
+ # @!attribute [rw] kms_key_id
17818
+ # An identifier for the AWS Key Management Service (AWS KMS) customer
17819
+ # master key (CMK) to use when creating the encrypted AMI. This
17820
+ # parameter is only required if you want to use a non-default CMK; if
17821
+ # this parameter is not specified, the default CMK for EBS is used. If
17822
+ # a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
17823
+ #
17824
+ # The CMK identifier may be provided in any of the following formats:
17825
+ #
17826
+ # * Key ID
17827
+ #
17828
+ # * Key alias, in the form `alias/ExampleAlias `
17829
+ #
17830
+ # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
17831
+ # followed by the region of the CMK, the AWS account ID of the CMK
17832
+ # owner, the `key` namespace, and then the CMK ID. For example,
17833
+ # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
17834
+ #
17835
+ # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
17836
+ # namespace, followed by the region of the CMK, the AWS account ID
17837
+ # of the CMK owner, the `alias` namespace, and then the CMK alias.
17838
+ # For example,
17839
+ # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
17840
+ #
17841
+ # AWS parses `KmsKeyId` asynchronously, meaning that the action you
17842
+ # call may appear to complete even though you provided an invalid
17843
+ # identifier. This action will eventually report failure.
17844
+ #
17845
+ # The specified CMK must exist in the region that the AMI is being
17846
+ # copied to.
17847
+ # @return [String]
17848
+ #
17803
17849
  # @!attribute [rw] license_type
17804
17850
  # The license type to be used for the Amazon Machine Image (AMI) after
17805
17851
  # importing.
@@ -17836,7 +17882,9 @@ module Aws::EC2
17836
17882
  :description,
17837
17883
  :disk_containers,
17838
17884
  :dry_run,
17885
+ :encrypted,
17839
17886
  :hypervisor,
17887
+ :kms_key_id,
17840
17888
  :license_type,
17841
17889
  :platform,
17842
17890
  :role_name)
@@ -17853,6 +17901,10 @@ module Aws::EC2
17853
17901
  # A description of the import task.
17854
17902
  # @return [String]
17855
17903
  #
17904
+ # @!attribute [rw] encrypted
17905
+ # Indicates whether the AMI is encypted.
17906
+ # @return [Boolean]
17907
+ #
17856
17908
  # @!attribute [rw] hypervisor
17857
17909
  # The target hypervisor of the import task.
17858
17910
  # @return [String]
@@ -17865,6 +17917,11 @@ module Aws::EC2
17865
17917
  # The task ID of the import image task.
17866
17918
  # @return [String]
17867
17919
  #
17920
+ # @!attribute [rw] kms_key_id
17921
+ # The identifier for the AWS Key Management Service (AWS KMS) customer
17922
+ # master key (CMK) that was used to create the encrypted AMI.
17923
+ # @return [String]
17924
+ #
17868
17925
  # @!attribute [rw] license_type
17869
17926
  # The license type of the virtual machine.
17870
17927
  # @return [String]
@@ -17894,9 +17951,11 @@ module Aws::EC2
17894
17951
  class ImportImageResult < Struct.new(
17895
17952
  :architecture,
17896
17953
  :description,
17954
+ :encrypted,
17897
17955
  :hypervisor,
17898
17956
  :image_id,
17899
17957
  :import_task_id,
17958
+ :kms_key_id,
17900
17959
  :license_type,
17901
17960
  :platform,
17902
17961
  :progress,
@@ -17918,6 +17977,10 @@ module Aws::EC2
17918
17977
  # A description of the import task.
17919
17978
  # @return [String]
17920
17979
  #
17980
+ # @!attribute [rw] encrypted
17981
+ # Indicates whether the image is encrypted.
17982
+ # @return [Boolean]
17983
+ #
17921
17984
  # @!attribute [rw] hypervisor
17922
17985
  # The target hypervisor for the import task.
17923
17986
  #
@@ -17933,6 +17996,11 @@ module Aws::EC2
17933
17996
  # The ID of the import image task.
17934
17997
  # @return [String]
17935
17998
  #
17999
+ # @!attribute [rw] kms_key_id
18000
+ # The identifier for the AWS Key Management Service (AWS KMS) customer
18001
+ # master key (CMK) that was used to create the encrypted image.
18002
+ # @return [String]
18003
+ #
17936
18004
  # @!attribute [rw] license_type
17937
18005
  # The license type of the virtual machine.
17938
18006
  # @return [String]
@@ -17962,9 +18030,11 @@ module Aws::EC2
17962
18030
  class ImportImageTask < Struct.new(
17963
18031
  :architecture,
17964
18032
  :description,
18033
+ :encrypted,
17965
18034
  :hypervisor,
17966
18035
  :image_id,
17967
18036
  :import_task_id,
18037
+ :kms_key_id,
17968
18038
  :license_type,
17969
18039
  :platform,
17970
18040
  :progress,
@@ -18311,6 +18381,8 @@ module Aws::EC2
18311
18381
  # },
18312
18382
  # },
18313
18383
  # dry_run: false,
18384
+ # encrypted: false,
18385
+ # kms_key_id: "String",
18314
18386
  # role_name: "String",
18315
18387
  # }
18316
18388
  #
@@ -18337,6 +18409,50 @@ module Aws::EC2
18337
18409
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
18338
18410
  # @return [Boolean]
18339
18411
  #
18412
+ # @!attribute [rw] encrypted
18413
+ # Specifies whether the destination snapshot of the imported image
18414
+ # should be encrypted. The default CMK for EBS is used unless you
18415
+ # specify a non-default AWS Key Management Service (AWS KMS) CMK using
18416
+ # `KmsKeyId`. For more information, see [Amazon EBS Encryption][1] in
18417
+ # the *Amazon Elastic Compute Cloud User Guide*.
18418
+ #
18419
+ #
18420
+ #
18421
+ # [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
18422
+ # @return [Boolean]
18423
+ #
18424
+ # @!attribute [rw] kms_key_id
18425
+ # An identifier for the AWS Key Management Service (AWS KMS) customer
18426
+ # master key (CMK) to use when creating the encrypted snapshot. This
18427
+ # parameter is only required if you want to use a non-default CMK; if
18428
+ # this parameter is not specified, the default CMK for EBS is used. If
18429
+ # a `KmsKeyId` is specified, the `Encrypted` flag must also be set.
18430
+ #
18431
+ # The CMK identifier may be provided in any of the following formats:
18432
+ #
18433
+ # * Key ID
18434
+ #
18435
+ # * Key alias, in the form `alias/ExampleAlias `
18436
+ #
18437
+ # * ARN using key ID. The ID ARN contains the `arn:aws:kms` namespace,
18438
+ # followed by the region of the CMK, the AWS account ID of the CMK
18439
+ # owner, the `key` namespace, and then the CMK ID. For example,
18440
+ # arn:aws:kms:*us-east-1*\:*012345678910*\:key/*abcd1234-a123-456a-a12b-a123b4cd56ef*.
18441
+ #
18442
+ # * ARN using key alias. The alias ARN contains the `arn:aws:kms`
18443
+ # namespace, followed by the region of the CMK, the AWS account ID
18444
+ # of the CMK owner, the `alias` namespace, and then the CMK alias.
18445
+ # For example,
18446
+ # arn:aws:kms:*us-east-1*\:*012345678910*\:alias/*ExampleAlias*.
18447
+ #
18448
+ # AWS parses `KmsKeyId` asynchronously, meaning that the action you
18449
+ # call may appear to complete even though you provided an invalid
18450
+ # identifier. This action will eventually report failure.
18451
+ #
18452
+ # The specified CMK must exist in the region that the snapshot is
18453
+ # being copied to.
18454
+ # @return [String]
18455
+ #
18340
18456
  # @!attribute [rw] role_name
18341
18457
  # The name of the role to use when not using the default role,
18342
18458
  # 'vmimport'.
@@ -18350,6 +18466,8 @@ module Aws::EC2
18350
18466
  :description,
18351
18467
  :disk_container,
18352
18468
  :dry_run,
18469
+ :encrypted,
18470
+ :kms_key_id,
18353
18471
  :role_name)
18354
18472
  include Aws::Structure
18355
18473
  end
@@ -29364,10 +29482,19 @@ module Aws::EC2
29364
29482
  # The size of the disk in the snapshot, in GiB.
29365
29483
  # @return [Float]
29366
29484
  #
29485
+ # @!attribute [rw] encrypted
29486
+ # Indicates whether the snapshot is encrypted.
29487
+ # @return [Boolean]
29488
+ #
29367
29489
  # @!attribute [rw] format
29368
29490
  # The format of the disk image from which the snapshot is created.
29369
29491
  # @return [String]
29370
29492
  #
29493
+ # @!attribute [rw] kms_key_id
29494
+ # The identifier for the AWS Key Management Service (AWS KMS) customer
29495
+ # master key (CMK) that was used to create the encrypted snapshot.
29496
+ # @return [String]
29497
+ #
29371
29498
  # @!attribute [rw] progress
29372
29499
  # The percentage of completion for the import snapshot task.
29373
29500
  # @return [String]
@@ -29397,7 +29524,9 @@ module Aws::EC2
29397
29524
  class SnapshotTaskDetail < Struct.new(
29398
29525
  :description,
29399
29526
  :disk_image_size,
29527
+ :encrypted,
29400
29528
  :format,
29529
+ :kms_key_id,
29401
29530
  :progress,
29402
29531
  :snapshot_id,
29403
29532
  :status,
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.55.0
4
+ version: 1.56.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: 2018-11-06 00:00:00.000000000 Z
11
+ date: 2018-11-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sigv4