aws-sdk-imagebuilder 1.33.0 → 1.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27448cd578cb4ee5908fa9185bd697131f79d153261ecfc1d13ca2c61b96f7ed
-  data.tar.gz: 4ad244769c5d0944a90a712b59f4e055b0d2ec62f3416c150225553710a698ff
+  metadata.gz: 006e3ce2e7fbeab5ed0e2a3023812e4493d7d0a5aaca79d752c1fdf7fb6c048d
+  data.tar.gz: 80649fd685b0e4d29ee4b6c6e752b53f5dacadda183600a08ce9cb8a543b56f1
 SHA512:
-  metadata.gz: e1b078f72de53e517c54afb2e4f2bd171f87ad138c855b39c0d477b47a2b2979f17af2cc6e84976bc4777c32d653bcb6a3d7c59983215a039eb070e64bff4295
-  data.tar.gz: 35763d8856f2c53e2f2c77996e8a274caa6957ba6f82df50d36b3bb513ec9ce975457798e57c02bea8c335c5753ac22f87e639fe627b6a3078bdbef52667de39
+  metadata.gz: bdb7a2166defaced9aa96d106ea20fa72848f7ccd9e07fc7e3f07a3e0641782549c15a905b3f9ca0f4fec5cee0f18827149ff22a9acdc6426a31a9e36915c5e1
+  data.tar.gz: 514b1c5c6d83100aaeafe75ea1ba4d554408472779b523c58cc4c9680a515d743a52ac0a4922c4018a12e153db625340e93ef83fc49945b1f8b56fe654725177

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 Unreleased Changes
 ------------------
 
+1.37.0 (2021-12-21)
+------------------
+
+* Feature - Added a note to infrastructure configuration actions and data types concerning delivery of Image Builder event messages to encrypted SNS topics. The key that's used to encrypt the SNS topic must reside in the account that Image Builder runs under.
+
+1.36.0 (2021-12-20)
+------------------
+
+* Feature - This release adds support for importing and exporting VM Images as part of the Image Creation workflow via EC2 VM Import/Export.
+
+1.35.0 (2021-11-30)
+------------------
+
+* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
+
+1.34.0 (2021-11-24)
+------------------
+
+* Feature - This release adds support for sharing AMIs with Organizations within an EC2 Image Builder Distribution Configuration.
+
 1.33.0 (2021-11-04)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.33.0
+1.37.0

data/lib/aws-sdk-imagebuilder/client.rb

@@ -27,6 +27,7 @@ require 'aws-sdk-core/plugins/client_metrics_plugin.rb'
 require 'aws-sdk-core/plugins/client_metrics_send_plugin.rb'
 require 'aws-sdk-core/plugins/transfer_encoding.rb'
 require 'aws-sdk-core/plugins/http_checksum.rb'
+require 'aws-sdk-core/plugins/defaults_mode.rb'
 require 'aws-sdk-core/plugins/signature_v4.rb'
 require 'aws-sdk-core/plugins/protocols/rest_json.rb'
 
@@ -73,6 +74,7 @@ module Aws::Imagebuilder
     add_plugin(Aws::Plugins::ClientMetricsSendPlugin)
     add_plugin(Aws::Plugins::TransferEncoding)
     add_plugin(Aws::Plugins::HttpChecksum)
+    add_plugin(Aws::Plugins::DefaultsMode)
     add_plugin(Aws::Plugins::SignatureV4)
     add_plugin(Aws::Plugins::Protocols::RestJson)
 
@@ -119,7 +121,9 @@ module Aws::Imagebuilder
     #     * EC2/ECS IMDS instance profile - When used by default, the timeouts
     #       are very aggressive. Construct and pass an instance of
     #       `Aws::InstanceProfileCredentails` or `Aws::ECSCredentials` to
-    #       enable retries and extended timeouts.
+    #       enable retries and extended timeouts. Instance profile credential
+    #       fetching can be disabled by setting ENV['AWS_EC2_METADATA_DISABLED']
+    #       to true.
     #
     #   @option options [required, String] :region
     #     The AWS region to connect to.  The configured `:region` is
@@ -173,6 +177,10 @@ module Aws::Imagebuilder
     #     Used only in `standard` and adaptive retry modes. Specifies whether to apply
     #     a clock skew correction and retry requests with skewed client clocks.
     #
+    #   @option options [String] :defaults_mode ("legacy")
+    #     See {Aws::DefaultsModeConfiguration} for a list of the
+    #     accepted modes and the configuration defaults that are included.
+    #
     #   @option options [Boolean] :disable_host_prefix_injection (false)
     #     Set to true to disable SDK automatically adding host prefix
     #     to default service endpoint when available.
@@ -295,7 +303,7 @@ module Aws::Imagebuilder
     #     seconds to wait when opening a HTTP session before raising a
     #     `Timeout::Error`.
     #
-    #   @option options [Integer] :http_read_timeout (60) The default
+    #   @option options [Float] :http_read_timeout (60) The default
     #     number of seconds to wait for response data.  This value can
     #     safely be set per-request on the session.
     #
@@ -311,6 +319,9 @@ module Aws::Imagebuilder
     #     disables this behaviour.  This value can safely be set per
     #     request on the session.
     #
+    #   @option options [Float] :ssl_timeout (nil) Sets the SSL timeout
+    #     in seconds.
+    #
     #   @option options [Boolean] :http_wire_trace (false) When `true`,
     #     HTTP debug output will be sent to the `:logger`.
     #
@@ -344,11 +355,17 @@ module Aws::Imagebuilder
     #   cancel.
     #
     # @option params [required, String] :client_token
-    #   The idempotency token used to make this request idempotent.
+    #   Unique, case-sensitive identifier you provide to ensure idempotency of
+    #   the request. For more information, see [Ensuring idempotency][1] in
+    #   the *Amazon EC2 API Reference*.
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.**
     #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
+    #
     # @return [Types::CancelImageCreationResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::CancelImageCreationResponse#request_id #request_id} => String
@@ -679,6 +696,8 @@ module Aws::Imagebuilder
     #           launch_permission: {
     #             user_ids: ["AccountId"],
     #             user_groups: ["NonEmptyString"],
+    #             organization_arns: ["OrganizationArn"],
+    #             organizational_unit_arns: ["OrganizationalUnitArn"],
     #           },
     #         },
     #         container_distribution_configuration: {
@@ -697,6 +716,12 @@ module Aws::Imagebuilder
     #             set_default_version: false,
     #           },
     #         ],
+    #         s3_export_configuration: {
+    #           role_name: "NonEmptyString", # required
+    #           disk_image_format: "VMDK", # required, accepts VMDK, RAW, VHD
+    #           s3_bucket: "NonEmptyString", # required
+    #           s3_prefix: "NonEmptyString",
+    #         },
     #       },
     #     ],
     #     tags: {
@@ -1067,7 +1092,15 @@ module Aws::Imagebuilder
     #   workflow fails.
     #
     # @option params [String] :sns_topic_arn
-    #   The SNS topic on which to send image build events.
+    #   The Amazon Resource Name (ARN) for the SNS topic to which we send
+    #   image build event notifications.
+    #
+    #   <note markdown="1"> EC2 Image Builder is unable to send notifications to SNS topics that
+    #   are encrypted using keys from other accounts. The key that is used to
+    #   encrypt the SNS topic must reside in the account that the Image
+    #   Builder service runs under.
+    #
+    #    </note>
     #
     # @option params [Hash<String,String>] :resource_tags
     #   The tags attached to the resource created by Image Builder.
@@ -1247,7 +1280,7 @@ module Aws::Imagebuilder
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/deregister-ami.html
     # [2]: https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/deregister-ami.html
-    # [3]: https://docs.aws.amazon.com/https:/docs.aws.amazon.comAmazonECR/latest/userguide/delete_image.html
+    # [3]: https://docs.aws.amazon.com/AmazonECR/latest/userguide/delete_image.html
     #
     # @option params [required, String] :image_build_version_arn
     #   The Amazon Resource Name (ARN) of the Image Builder image resource to
@@ -1586,6 +1619,10 @@ module Aws::Imagebuilder
     #   resp.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.user_ids[0] #=> String
     #   resp.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.user_groups #=> Array
     #   resp.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.user_groups[0] #=> String
+    #   resp.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.organization_arns #=> Array
+    #   resp.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.organization_arns[0] #=> String
+    #   resp.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.organizational_unit_arns #=> Array
+    #   resp.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.organizational_unit_arns[0] #=> String
     #   resp.distribution_configuration.distributions[0].container_distribution_configuration.description #=> String
     #   resp.distribution_configuration.distributions[0].container_distribution_configuration.container_tags #=> Array
     #   resp.distribution_configuration.distributions[0].container_distribution_configuration.container_tags[0] #=> String
@@ -1597,6 +1634,10 @@ module Aws::Imagebuilder
     #   resp.distribution_configuration.distributions[0].launch_template_configurations[0].launch_template_id #=> String
     #   resp.distribution_configuration.distributions[0].launch_template_configurations[0].account_id #=> String
     #   resp.distribution_configuration.distributions[0].launch_template_configurations[0].set_default_version #=> Boolean
+    #   resp.distribution_configuration.distributions[0].s3_export_configuration.role_name #=> String
+    #   resp.distribution_configuration.distributions[0].s3_export_configuration.disk_image_format #=> String, one of "VMDK", "RAW", "VHD"
+    #   resp.distribution_configuration.distributions[0].s3_export_configuration.s3_bucket #=> String
+    #   resp.distribution_configuration.distributions[0].s3_export_configuration.s3_prefix #=> String
     #   resp.distribution_configuration.timeout_minutes #=> Integer
     #   resp.distribution_configuration.date_created #=> String
     #   resp.distribution_configuration.date_updated #=> String
@@ -1748,6 +1789,10 @@ module Aws::Imagebuilder
     #   resp.image.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.user_ids[0] #=> String
     #   resp.image.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.user_groups #=> Array
     #   resp.image.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.user_groups[0] #=> String
+    #   resp.image.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.organization_arns #=> Array
+    #   resp.image.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.organization_arns[0] #=> String
+    #   resp.image.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.organizational_unit_arns #=> Array
+    #   resp.image.distribution_configuration.distributions[0].ami_distribution_configuration.launch_permission.organizational_unit_arns[0] #=> String
     #   resp.image.distribution_configuration.distributions[0].container_distribution_configuration.description #=> String
     #   resp.image.distribution_configuration.distributions[0].container_distribution_configuration.container_tags #=> Array
     #   resp.image.distribution_configuration.distributions[0].container_distribution_configuration.container_tags[0] #=> String
@@ -1759,6 +1804,10 @@ module Aws::Imagebuilder
     #   resp.image.distribution_configuration.distributions[0].launch_template_configurations[0].launch_template_id #=> String
     #   resp.image.distribution_configuration.distributions[0].launch_template_configurations[0].account_id #=> String
     #   resp.image.distribution_configuration.distributions[0].launch_template_configurations[0].set_default_version #=> Boolean
+    #   resp.image.distribution_configuration.distributions[0].s3_export_configuration.role_name #=> String
+    #   resp.image.distribution_configuration.distributions[0].s3_export_configuration.disk_image_format #=> String, one of "VMDK", "RAW", "VHD"
+    #   resp.image.distribution_configuration.distributions[0].s3_export_configuration.s3_bucket #=> String
+    #   resp.image.distribution_configuration.distributions[0].s3_export_configuration.s3_prefix #=> String
     #   resp.image.distribution_configuration.timeout_minutes #=> Integer
     #   resp.image.distribution_configuration.date_created #=> String
     #   resp.image.distribution_configuration.date_updated #=> String
@@ -1781,6 +1830,7 @@ module Aws::Imagebuilder
     #   resp.image.output_resources.containers[0].image_uris[0] #=> String
     #   resp.image.tags #=> Hash
     #   resp.image.tags["TagKey"] #=> String
+    #   resp.image.build_type #=> String, one of "USER_INITIATED", "SCHEDULED", "IMPORT"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/GetImage AWS API Documentation
     #
@@ -2120,6 +2170,113 @@ module Aws::Imagebuilder
       req.send_request(options)
     end
 
+    # When you export your virtual machine (VM) from its virtualization
+    # environment, that process creates a set of one or more disk container
+    # files that act as snapshots of your VM’s environment, settings, and
+    # data. The Amazon EC2 API [ImportImage][1] action uses those files to
+    # import your VM and create an AMI. To import using the CLI command, see
+    # [import-image][2]
+    #
+    # You can reference the task ID from the VM import to pull in the AMI
+    # that the import created as the base image for your Image Builder
+    # recipe.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportImage.html
+    # [2]: https://docs.aws.amazon.com/cli/latest/reference/ec2/import-image.html
+    #
+    # @option params [required, String] :name
+    #   The name of the base image that is created by the import process.
+    #
+    # @option params [required, String] :semantic_version
+    #   The semantic version to attach to the base image that was created
+    #   during the import process. This version follows the semantic version
+    #   syntax.
+    #
+    #   <note markdown="1"> The semantic version has four nodes:
+    #   &lt;major&gt;.&lt;minor&gt;.&lt;patch&gt;/&lt;build&gt;. You can
+    #   assign values for the first three, and can filter on all of them.
+    #
+    #    **Assignment:** For the first three nodes you can assign any positive
+    #   integer value, including zero, with an upper limit of 2^30-1, or
+    #   1073741823 for each node. Image Builder automatically assigns the
+    #   build number to the fourth node.
+    #
+    #    **Patterns:** You can use any numeric pattern that adheres to the
+    #   assignment requirements for the nodes that you can assign. For
+    #   example, you might choose a software version pattern, such as 1.0.0,
+    #   or a date, such as 2021.01.01.
+    #
+    #    </note>
+    #
+    # @option params [String] :description
+    #   The description for the base image that is created by the import
+    #   process.
+    #
+    # @option params [required, String] :platform
+    #   The operating system platform for the imported VM.
+    #
+    # @option params [String] :os_version
+    #   The operating system version for the imported VM.
+    #
+    # @option params [required, String] :vm_import_task_id
+    #   The `importTaskId` (API) or `ImportTaskId` (CLI) from the Amazon EC2
+    #   VM import process. Image Builder retrieves information from the import
+    #   process to pull in the AMI that is created from the VM source as the
+    #   base image for your recipe.
+    #
+    # @option params [Hash<String,String>] :tags
+    #   Tags that are attached to the import resources.
+    #
+    # @option params [required, String] :client_token
+    #   Unique, case-sensitive identifier you provide to ensure idempotency of
+    #   the request. For more information, see [Ensuring idempotency][1] in
+    #   the *Amazon EC2 API Reference*.
+    #
+    #   **A suitable default value is auto-generated.** You should normally
+    #   not need to pass this option.**
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
+    #
+    # @return [Types::ImportVmImageResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::ImportVmImageResponse#request_id #request_id} => String
+    #   * {Types::ImportVmImageResponse#image_arn #image_arn} => String
+    #   * {Types::ImportVmImageResponse#client_token #client_token} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.import_vm_image({
+    #     name: "NonEmptyString", # required
+    #     semantic_version: "VersionNumber", # required
+    #     description: "NonEmptyString",
+    #     platform: "Windows", # required, accepts Windows, Linux
+    #     os_version: "OsVersion",
+    #     vm_import_task_id: "NonEmptyString", # required
+    #     tags: {
+    #       "TagKey" => "TagValue",
+    #     },
+    #     client_token: "ClientToken", # required
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.request_id #=> String
+    #   resp.image_arn #=> String
+    #   resp.client_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/ImportVmImage AWS API Documentation
+    #
+    # @overload import_vm_image(params = {})
+    # @param [Hash] params ({})
+    def import_vm_image(params = {}, options = {})
+      req = build_request(:import_vm_image, params)
+      req.send_request(options)
+    end
+
     # Returns the list of component build versions for the specified
     # semantic version.
     #
@@ -2492,6 +2649,7 @@ module Aws::Imagebuilder
     #   resp.image_summary_list[0].output_resources.containers[0].image_uris[0] #=> String
     #   resp.image_summary_list[0].tags #=> Hash
     #   resp.image_summary_list[0].tags["TagKey"] #=> String
+    #   resp.image_summary_list[0].build_type #=> String, one of "USER_INITIATED", "SCHEDULED", "IMPORT"
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/ListImageBuildVersions AWS API Documentation
@@ -2622,6 +2780,7 @@ module Aws::Imagebuilder
     #   resp.image_summary_list[0].output_resources.containers[0].image_uris[0] #=> String
     #   resp.image_summary_list[0].tags #=> Hash
     #   resp.image_summary_list[0].tags["TagKey"] #=> String
+    #   resp.image_summary_list[0].build_type #=> String, one of "USER_INITIATED", "SCHEDULED", "IMPORT"
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/ListImagePipelineImages AWS API Documentation
@@ -2855,6 +3014,7 @@ module Aws::Imagebuilder
     #   resp.image_version_list[0].os_version #=> String
     #   resp.image_version_list[0].owner #=> String
     #   resp.image_version_list[0].date_created #=> String
+    #   resp.image_version_list[0].build_type #=> String, one of "USER_INITIATED", "SCHEDULED", "IMPORT"
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/ListImages AWS API Documentation
@@ -3002,11 +3162,11 @@ module Aws::Imagebuilder
 
     # Applies a policy to a container image. We recommend that you call the
     # RAM API CreateResourceShare
-    # (https://docs.aws.amazon.com/ram/latest/APIReference/API\_CreateResourceShare.html)
+    # (https://docs.aws.amazon.com//ram/latest/APIReference/API\_CreateResourceShare.html)
     # to share resources. If you call the Image Builder API
     # `PutContainerImagePolicy`, you must also call the RAM API
     # PromoteResourceShareCreatedFromPolicy
-    # (https://docs.aws.amazon.com/ram/latest/APIReference/API\_PromoteResourceShareCreatedFromPolicy.html)
+    # (https://docs.aws.amazon.com//ram/latest/APIReference/API\_PromoteResourceShareCreatedFromPolicy.html)
     # in order for the resource to be visible to all principals with whom
     # the resource is shared.
     #
@@ -3270,6 +3430,8 @@ module Aws::Imagebuilder
     #           launch_permission: {
     #             user_ids: ["AccountId"],
     #             user_groups: ["NonEmptyString"],
+    #             organization_arns: ["OrganizationArn"],
+    #             organizational_unit_arns: ["OrganizationalUnitArn"],
     #           },
     #         },
     #         container_distribution_configuration: {
@@ -3288,6 +3450,12 @@ module Aws::Imagebuilder
     #             set_default_version: false,
     #           },
     #         ],
+    #         s3_export_configuration: {
+    #           role_name: "NonEmptyString", # required
+    #           disk_image_format: "VMDK", # required, accepts VMDK, RAW, VHD
+    #           s3_bucket: "NonEmptyString", # required
+    #           s3_prefix: "NonEmptyString",
+    #         },
     #       },
     #     ],
     #     client_token: "ClientToken", # required
@@ -3447,7 +3615,15 @@ module Aws::Imagebuilder
     #   workflow fails.
     #
     # @option params [String] :sns_topic_arn
-    #   The SNS topic on which to send image build events.
+    #   The Amazon Resource Name (ARN) for the SNS topic to which we send
+    #   image build event notifications.
+    #
+    #   <note markdown="1"> EC2 Image Builder is unable to send notifications to SNS topics that
+    #   are encrypted using keys from other accounts. The key that is used to
+    #   encrypt the SNS topic must reside in the account that the Image
+    #   Builder service runs under.
+    #
+    #    </note>
     #
     # @option params [required, String] :client_token
     #   The idempotency token used to make this request idempotent.
@@ -3537,7 +3713,7 @@ module Aws::Imagebuilder
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-imagebuilder'
-      context[:gem_version] = '1.33.0'
+      context[:gem_version] = '1.37.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-imagebuilder/client_api.rb

@@ -22,6 +22,7 @@ module Aws::Imagebuilder
     AmiNameString = Shapes::StringShape.new(name: 'AmiNameString')
     Arn = Shapes::StringShape.new(name: 'Arn')
     Boolean = Shapes::BooleanShape.new(name: 'Boolean')
+    BuildType = Shapes::StringShape.new(name: 'BuildType')
     CallRateLimitExceededException = Shapes::StructureShape.new(name: 'CallRateLimitExceededException')
     CancelImageCreationRequest = Shapes::StructureShape.new(name: 'CancelImageCreationRequest')
     CancelImageCreationResponse = Shapes::StructureShape.new(name: 'CancelImageCreationResponse')
@@ -89,6 +90,7 @@ module Aws::Imagebuilder
     DeleteImageResponse = Shapes::StructureShape.new(name: 'DeleteImageResponse')
     DeleteInfrastructureConfigurationRequest = Shapes::StructureShape.new(name: 'DeleteInfrastructureConfigurationRequest')
     DeleteInfrastructureConfigurationResponse = Shapes::StructureShape.new(name: 'DeleteInfrastructureConfigurationResponse')
+    DiskImageFormat = Shapes::StringShape.new(name: 'DiskImageFormat')
     Distribution = Shapes::StructureShape.new(name: 'Distribution')
     DistributionConfiguration = Shapes::StructureShape.new(name: 'DistributionConfiguration')
     DistributionConfigurationArn = Shapes::StringShape.new(name: 'DistributionConfigurationArn')
@@ -160,6 +162,8 @@ module Aws::Imagebuilder
     ImageVersionList = Shapes::ListShape.new(name: 'ImageVersionList')
     ImportComponentRequest = Shapes::StructureShape.new(name: 'ImportComponentRequest')
     ImportComponentResponse = Shapes::StructureShape.new(name: 'ImportComponentResponse')
+    ImportVmImageRequest = Shapes::StructureShape.new(name: 'ImportVmImageRequest')
+    ImportVmImageResponse = Shapes::StructureShape.new(name: 'ImportVmImageResponse')
     InfrastructureConfiguration = Shapes::StructureShape.new(name: 'InfrastructureConfiguration')
     InfrastructureConfigurationArn = Shapes::StringShape.new(name: 'InfrastructureConfigurationArn')
     InfrastructureConfigurationSummary = Shapes::StructureShape.new(name: 'InfrastructureConfigurationSummary')
@@ -212,6 +216,10 @@ module Aws::Imagebuilder
     Logging = Shapes::StructureShape.new(name: 'Logging')
     NonEmptyString = Shapes::StringShape.new(name: 'NonEmptyString')
     NullableBoolean = Shapes::BooleanShape.new(name: 'NullableBoolean')
+    OrganizationArn = Shapes::StringShape.new(name: 'OrganizationArn')
+    OrganizationArnList = Shapes::ListShape.new(name: 'OrganizationArnList')
+    OrganizationalUnitArn = Shapes::StringShape.new(name: 'OrganizationalUnitArn')
+    OrganizationalUnitArnList = Shapes::ListShape.new(name: 'OrganizationalUnitArnList')
     OsVersion = Shapes::StringShape.new(name: 'OsVersion')
     OsVersionList = Shapes::ListShape.new(name: 'OsVersionList')
     OutputResources = Shapes::StructureShape.new(name: 'OutputResources')
@@ -237,6 +245,7 @@ module Aws::Imagebuilder
     ResourcePolicyDocument = Shapes::StringShape.new(name: 'ResourcePolicyDocument')
     ResourceTagMap = Shapes::MapShape.new(name: 'ResourceTagMap')
     RestrictedInteger = Shapes::IntegerShape.new(name: 'RestrictedInteger')
+    S3ExportConfiguration = Shapes::StructureShape.new(name: 'S3ExportConfiguration')
     S3Logs = Shapes::StructureShape.new(name: 'S3Logs')
     Schedule = Shapes::StructureShape.new(name: 'Schedule')
     SecurityGroupIds = Shapes::ListShape.new(name: 'SecurityGroupIds')
@@ -601,6 +610,7 @@ module Aws::Imagebuilder
     Distribution.add_member(:container_distribution_configuration, Shapes::ShapeRef.new(shape: ContainerDistributionConfiguration, location_name: "containerDistributionConfiguration"))
     Distribution.add_member(:license_configuration_arns, Shapes::ShapeRef.new(shape: LicenseConfigurationArnList, location_name: "licenseConfigurationArns"))
     Distribution.add_member(:launch_template_configurations, Shapes::ShapeRef.new(shape: LaunchTemplateConfigurationList, location_name: "launchTemplateConfigurations"))
+    Distribution.add_member(:s3_export_configuration, Shapes::ShapeRef.new(shape: S3ExportConfiguration, location_name: "s3ExportConfiguration"))
     Distribution.struct_class = Types::Distribution
 
     DistributionConfiguration.add_member(:arn, Shapes::ShapeRef.new(shape: ImageBuilderArn, location_name: "arn"))
@@ -745,6 +755,7 @@ module Aws::Imagebuilder
     Image.add_member(:date_created, Shapes::ShapeRef.new(shape: DateTime, location_name: "dateCreated"))
     Image.add_member(:output_resources, Shapes::ShapeRef.new(shape: OutputResources, location_name: "outputResources"))
     Image.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
+    Image.add_member(:build_type, Shapes::ShapeRef.new(shape: BuildType, location_name: "buildType"))
     Image.struct_class = Types::Image
 
     ImagePackage.add_member(:package_name, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "packageName"))
@@ -816,6 +827,7 @@ module Aws::Imagebuilder
     ImageSummary.add_member(:date_created, Shapes::ShapeRef.new(shape: DateTime, location_name: "dateCreated"))
     ImageSummary.add_member(:output_resources, Shapes::ShapeRef.new(shape: OutputResources, location_name: "outputResources"))
     ImageSummary.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
+    ImageSummary.add_member(:build_type, Shapes::ShapeRef.new(shape: BuildType, location_name: "buildType"))
     ImageSummary.struct_class = Types::ImageSummary
 
     ImageSummaryList.member = Shapes::ShapeRef.new(shape: ImageSummary)
@@ -832,6 +844,7 @@ module Aws::Imagebuilder
     ImageVersion.add_member(:os_version, Shapes::ShapeRef.new(shape: OsVersion, location_name: "osVersion"))
     ImageVersion.add_member(:owner, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "owner"))
     ImageVersion.add_member(:date_created, Shapes::ShapeRef.new(shape: DateTime, location_name: "dateCreated"))
+    ImageVersion.add_member(:build_type, Shapes::ShapeRef.new(shape: BuildType, location_name: "buildType"))
     ImageVersion.struct_class = Types::ImageVersion
 
     ImageVersionList.member = Shapes::ShapeRef.new(shape: ImageVersion)
@@ -855,6 +868,21 @@ module Aws::Imagebuilder
     ImportComponentResponse.add_member(:component_build_version_arn, Shapes::ShapeRef.new(shape: ComponentBuildVersionArn, location_name: "componentBuildVersionArn"))
     ImportComponentResponse.struct_class = Types::ImportComponentResponse
 
+    ImportVmImageRequest.add_member(:name, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "name"))
+    ImportVmImageRequest.add_member(:semantic_version, Shapes::ShapeRef.new(shape: VersionNumber, required: true, location_name: "semanticVersion"))
+    ImportVmImageRequest.add_member(:description, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "description"))
+    ImportVmImageRequest.add_member(:platform, Shapes::ShapeRef.new(shape: Platform, required: true, location_name: "platform"))
+    ImportVmImageRequest.add_member(:os_version, Shapes::ShapeRef.new(shape: OsVersion, location_name: "osVersion"))
+    ImportVmImageRequest.add_member(:vm_import_task_id, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "vmImportTaskId"))
+    ImportVmImageRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
+    ImportVmImageRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: ClientToken, required: true, location_name: "clientToken", metadata: {"idempotencyToken"=>true}))
+    ImportVmImageRequest.struct_class = Types::ImportVmImageRequest
+
+    ImportVmImageResponse.add_member(:request_id, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "requestId"))
+    ImportVmImageResponse.add_member(:image_arn, Shapes::ShapeRef.new(shape: Arn, location_name: "imageArn"))
+    ImportVmImageResponse.add_member(:client_token, Shapes::ShapeRef.new(shape: ClientToken, location_name: "clientToken"))
+    ImportVmImageResponse.struct_class = Types::ImportVmImageResponse
+
     InfrastructureConfiguration.add_member(:arn, Shapes::ShapeRef.new(shape: ImageBuilderArn, location_name: "arn"))
     InfrastructureConfiguration.add_member(:name, Shapes::ShapeRef.new(shape: ResourceName, location_name: "name"))
     InfrastructureConfiguration.add_member(:description, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "description"))
@@ -924,6 +952,8 @@ module Aws::Imagebuilder
 
     LaunchPermissionConfiguration.add_member(:user_ids, Shapes::ShapeRef.new(shape: AccountList, location_name: "userIds"))
     LaunchPermissionConfiguration.add_member(:user_groups, Shapes::ShapeRef.new(shape: StringList, location_name: "userGroups"))
+    LaunchPermissionConfiguration.add_member(:organization_arns, Shapes::ShapeRef.new(shape: OrganizationArnList, location_name: "organizationArns"))
+    LaunchPermissionConfiguration.add_member(:organizational_unit_arns, Shapes::ShapeRef.new(shape: OrganizationalUnitArnList, location_name: "organizationalUnitArns"))
     LaunchPermissionConfiguration.struct_class = Types::LaunchPermissionConfiguration
 
     LaunchTemplateConfiguration.add_member(:launch_template_id, Shapes::ShapeRef.new(shape: LaunchTemplateId, required: true, location_name: "launchTemplateId"))
@@ -1063,6 +1093,10 @@ module Aws::Imagebuilder
     Logging.add_member(:s3_logs, Shapes::ShapeRef.new(shape: S3Logs, location_name: "s3Logs"))
     Logging.struct_class = Types::Logging
 
+    OrganizationArnList.member = Shapes::ShapeRef.new(shape: OrganizationArn)
+
+    OrganizationalUnitArnList.member = Shapes::ShapeRef.new(shape: OrganizationalUnitArn)
+
     OsVersionList.member = Shapes::ShapeRef.new(shape: OsVersion)
 
     OutputResources.add_member(:amis, Shapes::ShapeRef.new(shape: AmiList, location_name: "amis"))
@@ -1118,6 +1152,12 @@ module Aws::Imagebuilder
     ResourceTagMap.key = Shapes::ShapeRef.new(shape: TagKey)
     ResourceTagMap.value = Shapes::ShapeRef.new(shape: TagValue)
 
+    S3ExportConfiguration.add_member(:role_name, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "roleName"))
+    S3ExportConfiguration.add_member(:disk_image_format, Shapes::ShapeRef.new(shape: DiskImageFormat, required: true, location_name: "diskImageFormat"))
+    S3ExportConfiguration.add_member(:s3_bucket, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "s3Bucket"))
+    S3ExportConfiguration.add_member(:s3_prefix, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "s3Prefix"))
+    S3ExportConfiguration.struct_class = Types::S3ExportConfiguration
+
     S3Logs.add_member(:s3_bucket_name, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "s3BucketName"))
     S3Logs.add_member(:s3_key_prefix, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "s3KeyPrefix"))
     S3Logs.struct_class = Types::S3Logs
@@ -1663,6 +1703,17 @@ module Aws::Imagebuilder
         o.errors << Shapes::ShapeRef.new(shape: InvalidParameterCombinationException)
       end)
 
+      api.add_operation(:import_vm_image, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ImportVmImage"
+        o.http_method = "PUT"
+        o.http_request_uri = "/ImportVmImage"
+        o.input = Shapes::ShapeRef.new(shape: ImportVmImageRequest)
+        o.output = Shapes::ShapeRef.new(shape: ImportVmImageResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ServiceException)
+        o.errors << Shapes::ShapeRef.new(shape: ClientException)
+        o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
+      end)
+
       api.add_operation(:list_component_build_versions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListComponentBuildVersions"
         o.http_method = "POST"

data/lib/aws-sdk-imagebuilder/types.rb

@@ -110,6 +110,8 @@ module Aws::Imagebuilder
     #         launch_permission: {
     #           user_ids: ["AccountId"],
     #           user_groups: ["NonEmptyString"],
+    #           organization_arns: ["OrganizationArn"],
+    #           organizational_unit_arns: ["OrganizationalUnitArn"],
     #         },
     #       }
     #
@@ -118,7 +120,7 @@ module Aws::Imagebuilder
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   The description of the distribution configuration. Minimum and
+    #   The description of the AMI distribution configuration. Minimum and
     #   maximum length are in characters.
     #   @return [String]
     #
@@ -180,10 +182,16 @@ module Aws::Imagebuilder
     #   @return [String]
     #
     # @!attribute [rw] client_token
-    #   The idempotency token used to make this request idempotent.
+    #   Unique, case-sensitive identifier you provide to ensure idempotency
+    #   of the request. For more information, see [Ensuring idempotency][1]
+    #   in the *Amazon EC2 API Reference*.
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/CancelImageCreationRequest AWS API Documentation
@@ -200,7 +208,7 @@ module Aws::Imagebuilder
     #   @return [String]
     #
     # @!attribute [rw] client_token
-    #   The idempotency token used to make this request idempotent.
+    #   The idempotency token that was used for this request.
     #   @return [String]
     #
     # @!attribute [rw] image_build_version_arn
@@ -1197,6 +1205,8 @@ module Aws::Imagebuilder
     #               launch_permission: {
     #                 user_ids: ["AccountId"],
     #                 user_groups: ["NonEmptyString"],
+    #                 organization_arns: ["OrganizationArn"],
+    #                 organizational_unit_arns: ["OrganizationalUnitArn"],
     #               },
     #             },
     #             container_distribution_configuration: {
@@ -1215,6 +1225,12 @@ module Aws::Imagebuilder
     #                 set_default_version: false,
     #               },
     #             ],
+    #             s3_export_configuration: {
+    #               role_name: "NonEmptyString", # required
+    #               disk_image_format: "VMDK", # required, accepts VMDK, RAW, VHD
+    #               s3_bucket: "NonEmptyString", # required
+    #               s3_prefix: "NonEmptyString",
+    #             },
     #           },
     #         ],
     #         tags: {
@@ -1744,7 +1760,15 @@ module Aws::Imagebuilder
     #   @return [Boolean]
     #
     # @!attribute [rw] sns_topic_arn
-    #   The SNS topic on which to send image build events.
+    #   The Amazon Resource Name (ARN) for the SNS topic to which we send
+    #   image build event notifications.
+    #
+    #   <note markdown="1"> EC2 Image Builder is unable to send notifications to SNS topics that
+    #   are encrypted using keys from other accounts. The key that is used
+    #   to encrypt the SNS topic must reside in the account that the Image
+    #   Builder service runs under.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] resource_tags
@@ -2091,6 +2115,8 @@ module Aws::Imagebuilder
     #           launch_permission: {
     #             user_ids: ["AccountId"],
     #             user_groups: ["NonEmptyString"],
+    #             organization_arns: ["OrganizationArn"],
+    #             organizational_unit_arns: ["OrganizationalUnitArn"],
     #           },
     #         },
     #         container_distribution_configuration: {
@@ -2109,6 +2135,12 @@ module Aws::Imagebuilder
     #             set_default_version: false,
     #           },
     #         ],
+    #         s3_export_configuration: {
+    #           role_name: "NonEmptyString", # required
+    #           disk_image_format: "VMDK", # required, accepts VMDK, RAW, VHD
+    #           s3_bucket: "NonEmptyString", # required
+    #           s3_prefix: "NonEmptyString",
+    #         },
     #       }
     #
     # @!attribute [rw] region
@@ -2135,6 +2167,12 @@ module Aws::Imagebuilder
     #   distribution for specified accounts.
     #   @return [Array<Types::LaunchTemplateConfiguration>]
     #
+    # @!attribute [rw] s3_export_configuration
+    #   Configure export settings to deliver disk images created from your
+    #   image build, using a file format that is compatible with your VMs in
+    #   that Region.
+    #   @return [Types::S3ExportConfiguration]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/Distribution AWS API Documentation
     #
     class Distribution < Struct.new(
@@ -2142,7 +2180,8 @@ module Aws::Imagebuilder
       :ami_distribution_configuration,
       :container_distribution_configuration,
       :license_configuration_arns,
-      :launch_template_configurations)
+      :launch_template_configurations,
+      :s3_export_configuration)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -2892,6 +2931,19 @@ module Aws::Imagebuilder
     #   The tags of the image.
     #   @return [Hash<String,String>]
     #
+    # @!attribute [rw] build_type
+    #   Indicates the type of build that created this image. The build can
+    #   be initiated in the following ways:
+    #
+    #   * **USER\_INITIATED** – A manual pipeline build request.
+    #
+    #   * **SCHEDULED** – A pipeline build initiated by a cron expression in
+    #     the Image Builder pipeline, or from EventBridge.
+    #
+    #   * **IMPORT** – A VM import created the image to use as the base
+    #     image for the recipe.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/Image AWS API Documentation
     #
     class Image < Struct.new(
@@ -2912,7 +2964,8 @@ module Aws::Imagebuilder
       :image_tests_configuration,
       :date_created,
       :output_resources,
-      :tags)
+      :tags,
+      :build_type)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3234,6 +3287,19 @@ module Aws::Imagebuilder
     #   The tags of the image.
     #   @return [Hash<String,String>]
     #
+    # @!attribute [rw] build_type
+    #   Indicates the type of build that created this image. The build can
+    #   be initiated in the following ways:
+    #
+    #   * **USER\_INITIATED** – A manual pipeline build request.
+    #
+    #   * **SCHEDULED** – A pipeline build initiated by a cron expression in
+    #     the Image Builder pipeline, or from EventBridge.
+    #
+    #   * **IMPORT** – A VM import created the image to use as the base
+    #     image for the recipe.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/ImageSummary AWS API Documentation
     #
     class ImageSummary < Struct.new(
@@ -3247,12 +3313,15 @@ module Aws::Imagebuilder
       :owner,
       :date_created,
       :output_resources,
-      :tags)
+      :tags,
+      :build_type)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # Image tests configuration.
+    # Configure image tests for your pipeline build. Tests run after
+    # building the image, to verify that the AMI or container image is valid
+    # before distributing it.
     #
     # @note When making an API call, you may pass ImageTestsConfiguration
     #   data as a hash:
@@ -3263,7 +3332,9 @@ module Aws::Imagebuilder
     #       }
     #
     # @!attribute [rw] image_tests_enabled
-    #   Defines if tests should be executed when building this image.
+    #   Determines if tests should run after building the image. Image
+    #   Builder defaults to enable tests to run following the image build,
+    #   before image distribution.
     #   @return [Boolean]
     #
     # @!attribute [rw] timeout_minutes
@@ -3357,6 +3428,19 @@ module Aws::Imagebuilder
     #   was created.
     #   @return [String]
     #
+    # @!attribute [rw] build_type
+    #   Indicates the type of build that created this image. The build can
+    #   be initiated in the following ways:
+    #
+    #   * **USER\_INITIATED** – A manual pipeline build request.
+    #
+    #   * **SCHEDULED** – A pipeline build initiated by a cron expression in
+    #     the Image Builder pipeline, or from EventBridge.
+    #
+    #   * **IMPORT** – A VM import created the image to use as the base
+    #     image for the recipe.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/ImageVersion AWS API Documentation
     #
     class ImageVersion < Struct.new(
@@ -3367,7 +3451,8 @@ module Aws::Imagebuilder
       :platform,
       :os_version,
       :owner,
-      :date_created)
+      :date_created,
+      :build_type)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3507,6 +3592,124 @@ module Aws::Imagebuilder
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ImportVmImageRequest
+    #   data as a hash:
+    #
+    #       {
+    #         name: "NonEmptyString", # required
+    #         semantic_version: "VersionNumber", # required
+    #         description: "NonEmptyString",
+    #         platform: "Windows", # required, accepts Windows, Linux
+    #         os_version: "OsVersion",
+    #         vm_import_task_id: "NonEmptyString", # required
+    #         tags: {
+    #           "TagKey" => "TagValue",
+    #         },
+    #         client_token: "ClientToken", # required
+    #       }
+    #
+    # @!attribute [rw] name
+    #   The name of the base image that is created by the import process.
+    #   @return [String]
+    #
+    # @!attribute [rw] semantic_version
+    #   The semantic version to attach to the base image that was created
+    #   during the import process. This version follows the semantic version
+    #   syntax.
+    #
+    #   <note markdown="1"> The semantic version has four nodes:
+    #   &lt;major&gt;.&lt;minor&gt;.&lt;patch&gt;/&lt;build&gt;. You can
+    #   assign values for the first three, and can filter on all of them.
+    #
+    #    **Assignment:** For the first three nodes you can assign any
+    #   positive integer value, including zero, with an upper limit of
+    #   2^30-1, or 1073741823 for each node. Image Builder automatically
+    #   assigns the build number to the fourth node.
+    #
+    #    **Patterns:** You can use any numeric pattern that adheres to the
+    #   assignment requirements for the nodes that you can assign. For
+    #   example, you might choose a software version pattern, such as 1.0.0,
+    #   or a date, such as 2021.01.01.
+    #
+    #    </note>
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   The description for the base image that is created by the import
+    #   process.
+    #   @return [String]
+    #
+    # @!attribute [rw] platform
+    #   The operating system platform for the imported VM.
+    #   @return [String]
+    #
+    # @!attribute [rw] os_version
+    #   The operating system version for the imported VM.
+    #   @return [String]
+    #
+    # @!attribute [rw] vm_import_task_id
+    #   The `importTaskId` (API) or `ImportTaskId` (CLI) from the Amazon EC2
+    #   VM import process. Image Builder retrieves information from the
+    #   import process to pull in the AMI that is created from the VM source
+    #   as the base image for your recipe.
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   Tags that are attached to the import resources.
+    #   @return [Hash<String,String>]
+    #
+    # @!attribute [rw] client_token
+    #   Unique, case-sensitive identifier you provide to ensure idempotency
+    #   of the request. For more information, see [Ensuring idempotency][1]
+    #   in the *Amazon EC2 API Reference*.
+    #
+    #   **A suitable default value is auto-generated.** You should normally
+    #   not need to pass this option.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/ImportVmImageRequest AWS API Documentation
+    #
+    class ImportVmImageRequest < Struct.new(
+      :name,
+      :semantic_version,
+      :description,
+      :platform,
+      :os_version,
+      :vm_import_task_id,
+      :tags,
+      :client_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] request_id
+    #   The request ID that uniquely identifies this request.
+    #   @return [String]
+    #
+    # @!attribute [rw] image_arn
+    #   The Amazon Resource Name (ARN) of the AMI that was created during
+    #   the VM import process. This AMI is used as the base image for the
+    #   recipe that imported the VM.
+    #   @return [String]
+    #
+    # @!attribute [rw] client_token
+    #   The idempotency token that was used for this request.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/ImportVmImageResponse AWS API Documentation
+    #
+    class ImportVmImageResponse < Struct.new(
+      :request_id,
+      :image_arn,
+      :client_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Details of the infrastructure configuration.
     #
     # @!attribute [rw] arn
@@ -3551,8 +3754,15 @@ module Aws::Imagebuilder
     #   @return [Boolean]
     #
     # @!attribute [rw] sns_topic_arn
-    #   The SNS topic Amazon Resource Name (ARN) of the infrastructure
-    #   configuration.
+    #   The Amazon Resource Name (ARN) for the SNS topic to which we send
+    #   image build event notifications.
+    #
+    #   <note markdown="1"> EC2 Image Builder is unable to send notifications to SNS topics that
+    #   are encrypted using keys from other accounts. The key that is used
+    #   to encrypt the SNS topic must reside in the account that the Image
+    #   Builder service runs under.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] date_created
@@ -3899,6 +4109,8 @@ module Aws::Imagebuilder
     #       {
     #         user_ids: ["AccountId"],
     #         user_groups: ["NonEmptyString"],
+    #         organization_arns: ["OrganizationArn"],
+    #         organizational_unit_arns: ["OrganizationalUnitArn"],
     #       }
     #
     # @!attribute [rw] user_ids
@@ -3909,11 +4121,33 @@ module Aws::Imagebuilder
     #   The name of the group.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] organization_arns
+    #   The ARN for an Amazon Web Services Organization that you want to
+    #   share your AMI with. For more information, see [What is
+    #   Organizations?][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/organizations/latest/userguide/orgs_introduction.html
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] organizational_unit_arns
+    #   The ARN for an Organizations organizational unit (OU) that you want
+    #   to share your AMI with. For more information about key concepts for
+    #   Organizations, see [Organizations terminology and concepts][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html
+    #   @return [Array<String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/LaunchPermissionConfiguration AWS API Documentation
     #
     class LaunchPermissionConfiguration < Struct.new(
       :user_ids,
-      :user_groups)
+      :user_groups,
+      :organization_arns,
+      :organizational_unit_arns)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -5084,6 +5318,57 @@ module Aws::Imagebuilder
       include Aws::Structure
     end
 
+    # Properties that configure export from your build instance to a
+    # compatible file format for your VM.
+    #
+    # @note When making an API call, you may pass S3ExportConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         role_name: "NonEmptyString", # required
+    #         disk_image_format: "VMDK", # required, accepts VMDK, RAW, VHD
+    #         s3_bucket: "NonEmptyString", # required
+    #         s3_prefix: "NonEmptyString",
+    #       }
+    #
+    # @!attribute [rw] role_name
+    #   The name of the role that grants VM Import/Export permission to
+    #   export images to your S3 bucket.
+    #   @return [String]
+    #
+    # @!attribute [rw] disk_image_format
+    #   Export the updated image to one of the following supported disk
+    #   image formats:
+    #
+    #   * **Virtual Hard Disk (VHD)** – Compatible with Citrix Xen and
+    #     Microsoft Hyper-V virtualization products.
+    #
+    #   * **Stream-optimized ESX Virtual Machine Disk (VMDK)** – Compatible
+    #     with VMware ESX and VMware vSphere versions 4, 5, and 6.
+    #
+    #   * **Raw** – Raw format.
+    #   @return [String]
+    #
+    # @!attribute [rw] s3_bucket
+    #   The S3 bucket in which to store the output disk images for your VM.
+    #   @return [String]
+    #
+    # @!attribute [rw] s3_prefix
+    #   The Amazon S3 path for the bucket where the output disk images for
+    #   your VM are stored.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/S3ExportConfiguration AWS API Documentation
+    #
+    class S3ExportConfiguration < Struct.new(
+      :role_name,
+      :disk_image_format,
+      :s3_bucket,
+      :s3_prefix)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Amazon S3 logging configuration.
     #
     # @note When making an API call, you may pass S3Logs
@@ -5095,11 +5380,11 @@ module Aws::Imagebuilder
     #       }
     #
     # @!attribute [rw] s3_bucket_name
-    #   The Amazon S3 bucket in which to store the logs.
+    #   The S3 bucket in which to store the logs.
     #   @return [String]
     #
     # @!attribute [rw] s3_key_prefix
-    #   The Amazon S3 path in which to store the logs.
+    #   The Amazon S3 path to the bucket where the logs are stored.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/imagebuilder-2019-12-02/S3Logs AWS API Documentation
@@ -5406,6 +5691,8 @@ module Aws::Imagebuilder
     #               launch_permission: {
     #                 user_ids: ["AccountId"],
     #                 user_groups: ["NonEmptyString"],
+    #                 organization_arns: ["OrganizationArn"],
+    #                 organizational_unit_arns: ["OrganizationalUnitArn"],
     #               },
     #             },
     #             container_distribution_configuration: {
@@ -5424,6 +5711,12 @@ module Aws::Imagebuilder
     #                 set_default_version: false,
     #               },
     #             ],
+    #             s3_export_configuration: {
+    #               role_name: "NonEmptyString", # required
+    #               disk_image_format: "VMDK", # required, accepts VMDK, RAW, VHD
+    #               s3_bucket: "NonEmptyString", # required
+    #               s3_prefix: "NonEmptyString",
+    #             },
     #           },
     #         ],
     #         client_token: "ClientToken", # required
@@ -5679,7 +5972,15 @@ module Aws::Imagebuilder
     #   @return [Boolean]
     #
     # @!attribute [rw] sns_topic_arn
-    #   The SNS topic on which to send image build events.
+    #   The Amazon Resource Name (ARN) for the SNS topic to which we send
+    #   image build event notifications.
+    #
+    #   <note markdown="1"> EC2 Image Builder is unable to send notifications to SNS topics that
+    #   are encrypted using keys from other accounts. The key that is used
+    #   to encrypt the SNS topic must reside in the account that the Image
+    #   Builder service runs under.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] client_token

data/lib/aws-sdk-imagebuilder.rb

@@ -48,6 +48,6 @@ require_relative 'aws-sdk-imagebuilder/customizations'
 # @!group service
 module Aws::Imagebuilder
 
-  GEM_VERSION = '1.33.0'
+  GEM_VERSION = '1.37.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-imagebuilder
 version: !ruby/object:Gem::Version
-  version: 1.33.0
+  version: 1.37.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -19,7 +19,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.122.0
+        version: 3.125.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.122.0
+        version: 3.125.0
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement