aws-sdk-auditmanager 1.45.0 → 1.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66e1a5c76dd20bb9ad091638fa03be42fc0f93856364400b4b88320fd00c676
-  data.tar.gz: da7208c1d07acc060f189889b1656f0481db86020be15fa9cb6b829f469f88da
+  metadata.gz: 1b7be5eb93d73156a2f680380228635288990a47339682979a6eff3aed5a904a
+  data.tar.gz: d2b374ff0713a403a463d772a29e083a3ad05319e7816157836fd4ff3c1e94dc
 SHA512:
-  metadata.gz: '0078a1cc94e3800f3c86ec00ea851e5b889faf29c3dddf65f04187cd4f993de19e77f404fdb9d538dd0864aeb325d96c6cdc22374258ede5d7a26f0e5b7aa4dc'
-  data.tar.gz: '085d4097f16d14008594f01ff30e8cf4164641980338058f5fc13b8907710768eaa5395a81df33c2107f165cf52c2367b2281ddd23f732fed81d7e3a1922913e'
+  metadata.gz: a1725e1b7dc67f6e3d145abe3c8f533fe7e8def4213bdae0ea1ddc3e33f7a07f16f517a6d5f108f990a2b501a21c139b23dde961094980815cb9c7333a11cc19
+  data.tar.gz: 9682ba9440a04005794791eaffe09c10279394b865d1c2b13f728ffb05f0f3f811542f2d6cebd4cda85f779727980aed68c721d7b96fd3f06d8bedd4fa81847d

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Unreleased Changes
 ------------------
 
+1.47.0 (2024-06-24)
+------------------
+
+* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
+
+1.46.0 (2024-06-07)
+------------------
+
+* Feature - New feature: common controls. When creating custom controls, you can now use pre-grouped AWS data sources based on common compliance themes. Also, the awsServices parameter is deprecated because we now manage services in scope for you. If used, the input is ignored and an empty list is returned.
+
 1.45.0 (2024-06-05)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.45.0
+1.47.0

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

@@ -89,6 +89,11 @@ module Aws::AuditManager
 
     # @overload initialize(options)
     #   @param [Hash] options
+    #
+    #   @option options [Array<Seahorse::Client::Plugin>] :plugins ([]])
+    #     A list of plugins to apply to the client. Each plugin is either a
+    #     class name or an instance of a plugin class.
+    #
     #   @option options [required, Aws::CredentialProvider] :credentials
     #     Your AWS credentials. This can be an instance of any one of the
     #     following classes:
@@ -209,7 +214,6 @@ module Aws::AuditManager
     #         'https://example.com'
     #         'http://example.com:123'
     #
-    #
     #   @option options [Integer] :endpoint_cache_max_entries (1000)
     #     Used for the maximum size limit of the LRU cache storing endpoints data
     #     for endpoint discovery enabled operations. Defaults to 1000.
@@ -298,7 +302,6 @@ module Aws::AuditManager
     #       throttling.  This is a provisional mode that may change behavior
     #       in the future.
     #
-    #
     #   @option options [String] :sdk_ua_app_id
     #     A unique and opaque application ID that is appended to the
     #     User-Agent header as app/sdk_ua_app_id. It should have a
@@ -708,8 +711,22 @@ module Aws::AuditManager
     #   being created.
     #
     # @option params [required, Types::Scope] :scope
-    #   The wrapper that contains the Amazon Web Services accounts and
-    #   services that are in scope for the assessment.
+    #   The wrapper that contains the Amazon Web Services accounts that are in
+    #   scope for the assessment.
+    #
+    #   <note markdown="1"> You no longer need to specify which Amazon Web Services are in scope
+    #   when you create or update an assessment. Audit Manager infers the
+    #   services in scope by examining your assessment controls and their data
+    #   sources, and then mapping this information to the relevant Amazon Web
+    #   Services.
+    #
+    #    If an underlying data source changes for your assessment, we
+    #   automatically update the services scope as needed to reflect the
+    #   correct Amazon Web Services. This ensures that your assessment
+    #   collects accurate and comprehensive evidence about all of the relevant
+    #   services in your AWS environment.
+    #
+    #    </note>
     #
     # @option params [required, Array<Types::Role>] :roles
     #   The list of roles for the assessment.
@@ -908,7 +925,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls #=> Array
     #   resp.framework.control_sets[0].controls[0].arn #=> String
     #   resp.framework.control_sets[0].controls[0].id #=> String
-    #   resp.framework.control_sets[0].controls[0].type #=> String, one of "Standard", "Custom"
+    #   resp.framework.control_sets[0].controls[0].type #=> String, one of "Standard", "Custom", "Core"
     #   resp.framework.control_sets[0].controls[0].name #=> String
     #   resp.framework.control_sets[0].controls[0].description #=> String
     #   resp.framework.control_sets[0].controls[0].testing_information #=> String
@@ -920,7 +937,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_name #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_description #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_set_up_option #=> String, one of "System_Controls_Mapping", "Procedural_Controls_Mapping"
-    #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL"
+    #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL", "Common_Control", "Core_Control"
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_keyword.keyword_input_type #=> String, one of "SELECT_FROM_LIST", "UPLOAD_FILE", "INPUT_TEXT"
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_keyword.keyword_value #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_frequency #=> String, one of "DAILY", "WEEKLY", "MONTHLY"
@@ -931,6 +948,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls[0].last_updated_by #=> String
     #   resp.framework.control_sets[0].controls[0].tags #=> Hash
     #   resp.framework.control_sets[0].controls[0].tags["TagKey"] #=> String
+    #   resp.framework.control_sets[0].controls[0].state #=> String, one of "ACTIVE", "END_OF_SUPPORT"
     #   resp.framework.created_at #=> Time
     #   resp.framework.last_updated_at #=> Time
     #   resp.framework.created_by #=> String
@@ -1056,7 +1074,7 @@ module Aws::AuditManager
     #         source_name: "SourceName",
     #         source_description: "SourceDescription",
     #         source_set_up_option: "System_Controls_Mapping", # accepts System_Controls_Mapping, Procedural_Controls_Mapping
-    #         source_type: "AWS_Cloudtrail", # accepts AWS_Cloudtrail, AWS_Config, AWS_Security_Hub, AWS_API_Call, MANUAL
+    #         source_type: "AWS_Cloudtrail", # accepts AWS_Cloudtrail, AWS_Config, AWS_Security_Hub, AWS_API_Call, MANUAL, Common_Control, Core_Control
     #         source_keyword: {
     #           keyword_input_type: "SELECT_FROM_LIST", # accepts SELECT_FROM_LIST, UPLOAD_FILE, INPUT_TEXT
     #           keyword_value: "KeywordValue",
@@ -1074,7 +1092,7 @@ module Aws::AuditManager
     #
     #   resp.control.arn #=> String
     #   resp.control.id #=> String
-    #   resp.control.type #=> String, one of "Standard", "Custom"
+    #   resp.control.type #=> String, one of "Standard", "Custom", "Core"
     #   resp.control.name #=> String
     #   resp.control.description #=> String
     #   resp.control.testing_information #=> String
@@ -1086,7 +1104,7 @@ module Aws::AuditManager
     #   resp.control.control_mapping_sources[0].source_name #=> String
     #   resp.control.control_mapping_sources[0].source_description #=> String
     #   resp.control.control_mapping_sources[0].source_set_up_option #=> String, one of "System_Controls_Mapping", "Procedural_Controls_Mapping"
-    #   resp.control.control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL"
+    #   resp.control.control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL", "Common_Control", "Core_Control"
     #   resp.control.control_mapping_sources[0].source_keyword.keyword_input_type #=> String, one of "SELECT_FROM_LIST", "UPLOAD_FILE", "INPUT_TEXT"
     #   resp.control.control_mapping_sources[0].source_keyword.keyword_value #=> String
     #   resp.control.control_mapping_sources[0].source_frequency #=> String, one of "DAILY", "WEEKLY", "MONTHLY"
@@ -1097,6 +1115,7 @@ module Aws::AuditManager
     #   resp.control.last_updated_by #=> String
     #   resp.control.tags #=> Hash
     #   resp.control.tags["TagKey"] #=> String
+    #   resp.control.state #=> String, one of "ACTIVE", "END_OF_SUPPORT"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/auditmanager-2017-07-25/CreateControl AWS API Documentation
     #
@@ -1572,7 +1591,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls #=> Array
     #   resp.framework.control_sets[0].controls[0].arn #=> String
     #   resp.framework.control_sets[0].controls[0].id #=> String
-    #   resp.framework.control_sets[0].controls[0].type #=> String, one of "Standard", "Custom"
+    #   resp.framework.control_sets[0].controls[0].type #=> String, one of "Standard", "Custom", "Core"
     #   resp.framework.control_sets[0].controls[0].name #=> String
     #   resp.framework.control_sets[0].controls[0].description #=> String
     #   resp.framework.control_sets[0].controls[0].testing_information #=> String
@@ -1584,7 +1603,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_name #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_description #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_set_up_option #=> String, one of "System_Controls_Mapping", "Procedural_Controls_Mapping"
-    #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL"
+    #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL", "Common_Control", "Core_Control"
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_keyword.keyword_input_type #=> String, one of "SELECT_FROM_LIST", "UPLOAD_FILE", "INPUT_TEXT"
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_keyword.keyword_value #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_frequency #=> String, one of "DAILY", "WEEKLY", "MONTHLY"
@@ -1595,6 +1614,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls[0].last_updated_by #=> String
     #   resp.framework.control_sets[0].controls[0].tags #=> Hash
     #   resp.framework.control_sets[0].controls[0].tags["TagKey"] #=> String
+    #   resp.framework.control_sets[0].controls[0].state #=> String, one of "ACTIVE", "END_OF_SUPPORT"
     #   resp.framework.created_at #=> Time
     #   resp.framework.last_updated_at #=> Time
     #   resp.framework.created_by #=> String
@@ -1717,7 +1737,7 @@ module Aws::AuditManager
     #
     #   resp.control.arn #=> String
     #   resp.control.id #=> String
-    #   resp.control.type #=> String, one of "Standard", "Custom"
+    #   resp.control.type #=> String, one of "Standard", "Custom", "Core"
     #   resp.control.name #=> String
     #   resp.control.description #=> String
     #   resp.control.testing_information #=> String
@@ -1729,7 +1749,7 @@ module Aws::AuditManager
     #   resp.control.control_mapping_sources[0].source_name #=> String
     #   resp.control.control_mapping_sources[0].source_description #=> String
     #   resp.control.control_mapping_sources[0].source_set_up_option #=> String, one of "System_Controls_Mapping", "Procedural_Controls_Mapping"
-    #   resp.control.control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL"
+    #   resp.control.control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL", "Common_Control", "Core_Control"
     #   resp.control.control_mapping_sources[0].source_keyword.keyword_input_type #=> String, one of "SELECT_FROM_LIST", "UPLOAD_FILE", "INPUT_TEXT"
     #   resp.control.control_mapping_sources[0].source_keyword.keyword_value #=> String
     #   resp.control.control_mapping_sources[0].source_frequency #=> String, one of "DAILY", "WEEKLY", "MONTHLY"
@@ -1740,6 +1760,7 @@ module Aws::AuditManager
     #   resp.control.last_updated_by #=> String
     #   resp.control.tags #=> Hash
     #   resp.control.tags["TagKey"] #=> String
+    #   resp.control.state #=> String, one of "ACTIVE", "END_OF_SUPPORT"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/auditmanager-2017-07-25/GetControl AWS API Documentation
     #
@@ -2239,15 +2260,25 @@ module Aws::AuditManager
       req.send_request(options)
     end
 
-    # Gets a list of all of the Amazon Web Services that you can choose to
-    # include in your assessment. When you [create an assessment][1],
-    # specify which of these services you want to include to narrow the
-    # assessment's [scope][2].
+    # Gets a list of the Amazon Web Services from which Audit Manager can
+    # collect evidence.
+    #
+    # Audit Manager defines which Amazon Web Services are in scope for an
+    # assessment. Audit Manager infers this scope by examining the
+    # assessment’s controls and their data sources, and then mapping this
+    # information to one or more of the corresponding Amazon Web Services
+    # that are in this list.
     #
+    # <note markdown="1"> For information about why it's no longer possible to specify services
+    # in scope manually, see [I can't edit the services in scope for my
+    # assessment][1] in the *Troubleshooting* section of the Audit Manager
+    # user guide.
+    #
+    #  </note>
     #
     #
-    # [1]: https://docs.aws.amazon.com/audit-manager/latest/APIReference/API_CreateAssessment.html
-    # [2]: https://docs.aws.amazon.com/audit-manager/latest/APIReference/API_Scope.html
+    #
+    # [1]: https://docs.aws.amazon.com/audit-manager/latest/userguide/evidence-collection-issues.html#unable-to-edit-services
     #
     # @return [Types::GetServicesInScopeResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -2326,6 +2357,15 @@ module Aws::AuditManager
     # @option params [required, String] :control_domain_id
     #   The unique identifier for the control domain.
     #
+    #   Audit Manager supports the control domains that are provided by Amazon
+    #   Web Services Control Catalog. For information about how to find a list
+    #   of available control domains, see [ `ListDomains` ][1] in the Amazon
+    #   Web Services Control Catalog API Reference.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
+    #
     # @option params [required, String] :assessment_id
     #   The unique identifier for the active assessment.
     #
@@ -2346,7 +2386,7 @@ module Aws::AuditManager
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_assessment_control_insights_by_control_domain({
-    #     control_domain_id: "UUID", # required
+    #     control_domain_id: "ControlDomainId", # required
     #     assessment_id: "UUID", # required
     #     next_token: "Token",
     #     max_results: 1,
@@ -2595,6 +2635,11 @@ module Aws::AuditManager
     # Lists the latest analytics data for control domains across all of your
     # active assessments.
     #
+    # Audit Manager supports the control domains that are provided by Amazon
+    # Web Services Control Catalog. For information about how to find a list
+    # of available control domains, see [ `ListDomains` ][1] in the Amazon
+    # Web Services Control Catalog API Reference.
+    #
     # <note markdown="1"> A control domain is listed only if at least one of the controls within
     # that domain collected evidence on the `lastUpdated` date of
     # `controlDomainInsights`. If this condition isn’t met, no data is
@@ -2602,6 +2647,10 @@ module Aws::AuditManager
     #
     #  </note>
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
+    #
     # @option params [String] :next_token
     #   The pagination token that's used to fetch the next set of results.
     #
@@ -2648,6 +2697,11 @@ module Aws::AuditManager
     # Lists analytics data for control domains within a specified active
     # assessment.
     #
+    # Audit Manager supports the control domains that are provided by Amazon
+    # Web Services Control Catalog. For information about how to find a list
+    # of available control domains, see [ `ListDomains` ][1] in the Amazon
+    # Web Services Control Catalog API Reference.
+    #
     # <note markdown="1"> A control domain is listed only if at least one of the controls within
     # that domain collected evidence on the `lastUpdated` date of
     # `controlDomainInsights`. If this condition isn’t met, no data is
@@ -2655,6 +2709,10 @@ module Aws::AuditManager
     #
     #  </note>
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
+    #
     # @option params [required, String] :assessment_id
     #   The unique identifier for the active assessment.
     #
@@ -2715,6 +2773,15 @@ module Aws::AuditManager
     # @option params [required, String] :control_domain_id
     #   The unique identifier for the control domain.
     #
+    #   Audit Manager supports the control domains that are provided by Amazon
+    #   Web Services Control Catalog. For information about how to find a list
+    #   of available control domains, see [ `ListDomains` ][1] in the Amazon
+    #   Web Services Control Catalog API Reference.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
+    #
     # @option params [String] :next_token
     #   The pagination token that's used to fetch the next set of results.
     #
@@ -2732,7 +2799,7 @@ module Aws::AuditManager
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_control_insights_by_control_domain({
-    #     control_domain_id: "UUID", # required
+    #     control_domain_id: "ControlDomainId", # required
     #     next_token: "Token",
     #     max_results: 1,
     #   })
@@ -2760,14 +2827,41 @@ module Aws::AuditManager
     # Returns a list of controls from Audit Manager.
     #
     # @option params [required, String] :control_type
-    #   The type of control, such as a standard control or a custom control.
+    #   A filter that narrows the list of controls to a specific type.
     #
     # @option params [String] :next_token
     #   The pagination token that's used to fetch the next set of results.
     #
     # @option params [Integer] :max_results
-    #   Represents the maximum number of results on a page or for an API
-    #   request call.
+    #   The maximum number of results on a page or for an API request call.
+    #
+    # @option params [String] :control_catalog_id
+    #   A filter that narrows the list of controls to a specific resource from
+    #   the Amazon Web Services Control Catalog.
+    #
+    #   To use this parameter, specify the ARN of the Control Catalog
+    #   resource. You can specify either a control domain, a control
+    #   objective, or a common control. For information about how to find the
+    #   ARNs for these resources, see [ `ListDomains` ][1], [ `ListObjectives`
+    #   ][2], and [ `ListCommonControls` ][3].
+    #
+    #   <note markdown="1"> You can only filter by one Control Catalog resource at a time.
+    #   Specifying multiple resource ARNs isn’t currently supported. If you
+    #   want to filter by more than one ARN, we recommend that you run the
+    #   `ListControls` operation separately for each ARN.
+    #
+    #    </note>
+    #
+    #   Alternatively, specify `UNCATEGORIZED` to list controls that aren't
+    #   mapped to a Control Catalog resource. For example, this operation
+    #   might return a list of custom controls that don't belong to any
+    #   control domain or control objective.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
+    #   [2]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListObjectives.html
+    #   [3]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListCommonControls.html
     #
     # @return [Types::ListControlsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -2779,9 +2873,10 @@ module Aws::AuditManager
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_controls({
-    #     control_type: "Standard", # required, accepts Standard, Custom
+    #     control_type: "Standard", # required, accepts Standard, Custom, Core
     #     next_token: "Token",
     #     max_results: 1,
+    #     control_catalog_id: "ControlCatalogId",
     #   })
     #
     # @example Response structure
@@ -3469,7 +3564,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls #=> Array
     #   resp.framework.control_sets[0].controls[0].arn #=> String
     #   resp.framework.control_sets[0].controls[0].id #=> String
-    #   resp.framework.control_sets[0].controls[0].type #=> String, one of "Standard", "Custom"
+    #   resp.framework.control_sets[0].controls[0].type #=> String, one of "Standard", "Custom", "Core"
     #   resp.framework.control_sets[0].controls[0].name #=> String
     #   resp.framework.control_sets[0].controls[0].description #=> String
     #   resp.framework.control_sets[0].controls[0].testing_information #=> String
@@ -3481,7 +3576,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_name #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_description #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_set_up_option #=> String, one of "System_Controls_Mapping", "Procedural_Controls_Mapping"
-    #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL"
+    #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL", "Common_Control", "Core_Control"
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_keyword.keyword_input_type #=> String, one of "SELECT_FROM_LIST", "UPLOAD_FILE", "INPUT_TEXT"
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_keyword.keyword_value #=> String
     #   resp.framework.control_sets[0].controls[0].control_mapping_sources[0].source_frequency #=> String, one of "DAILY", "WEEKLY", "MONTHLY"
@@ -3492,6 +3587,7 @@ module Aws::AuditManager
     #   resp.framework.control_sets[0].controls[0].last_updated_by #=> String
     #   resp.framework.control_sets[0].controls[0].tags #=> Hash
     #   resp.framework.control_sets[0].controls[0].tags["TagKey"] #=> String
+    #   resp.framework.control_sets[0].controls[0].state #=> String, one of "ACTIVE", "END_OF_SUPPORT"
     #   resp.framework.created_at #=> Time
     #   resp.framework.last_updated_at #=> Time
     #   resp.framework.created_by #=> String
@@ -3709,7 +3805,7 @@ module Aws::AuditManager
     #         source_name: "SourceName",
     #         source_description: "SourceDescription",
     #         source_set_up_option: "System_Controls_Mapping", # accepts System_Controls_Mapping, Procedural_Controls_Mapping
-    #         source_type: "AWS_Cloudtrail", # accepts AWS_Cloudtrail, AWS_Config, AWS_Security_Hub, AWS_API_Call, MANUAL
+    #         source_type: "AWS_Cloudtrail", # accepts AWS_Cloudtrail, AWS_Config, AWS_Security_Hub, AWS_API_Call, MANUAL, Common_Control, Core_Control
     #         source_keyword: {
     #           keyword_input_type: "SELECT_FROM_LIST", # accepts SELECT_FROM_LIST, UPLOAD_FILE, INPUT_TEXT
     #           keyword_value: "KeywordValue",
@@ -3724,7 +3820,7 @@ module Aws::AuditManager
     #
     #   resp.control.arn #=> String
     #   resp.control.id #=> String
-    #   resp.control.type #=> String, one of "Standard", "Custom"
+    #   resp.control.type #=> String, one of "Standard", "Custom", "Core"
     #   resp.control.name #=> String
     #   resp.control.description #=> String
     #   resp.control.testing_information #=> String
@@ -3736,7 +3832,7 @@ module Aws::AuditManager
     #   resp.control.control_mapping_sources[0].source_name #=> String
     #   resp.control.control_mapping_sources[0].source_description #=> String
     #   resp.control.control_mapping_sources[0].source_set_up_option #=> String, one of "System_Controls_Mapping", "Procedural_Controls_Mapping"
-    #   resp.control.control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL"
+    #   resp.control.control_mapping_sources[0].source_type #=> String, one of "AWS_Cloudtrail", "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", "MANUAL", "Common_Control", "Core_Control"
     #   resp.control.control_mapping_sources[0].source_keyword.keyword_input_type #=> String, one of "SELECT_FROM_LIST", "UPLOAD_FILE", "INPUT_TEXT"
     #   resp.control.control_mapping_sources[0].source_keyword.keyword_value #=> String
     #   resp.control.control_mapping_sources[0].source_frequency #=> String, one of "DAILY", "WEEKLY", "MONTHLY"
@@ -3747,6 +3843,7 @@ module Aws::AuditManager
     #   resp.control.last_updated_by #=> String
     #   resp.control.tags #=> Hash
     #   resp.control.tags["TagKey"] #=> String
+    #   resp.control.state #=> String, one of "ACTIVE", "END_OF_SUPPORT"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/auditmanager-2017-07-25/UpdateControl AWS API Documentation
     #
@@ -3902,7 +3999,7 @@ module Aws::AuditManager
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-auditmanager'
-      context[:gem_version] = '1.45.0'
+      context[:gem_version] = '1.47.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -78,10 +78,12 @@ module Aws::AuditManager
     CloudTrailArn = Shapes::StringShape.new(name: 'CloudTrailArn')
     ComplianceType = Shapes::StringShape.new(name: 'ComplianceType')
     Control = Shapes::StructureShape.new(name: 'Control')
+    ControlCatalogId = Shapes::StringShape.new(name: 'ControlCatalogId')
     ControlComment = Shapes::StructureShape.new(name: 'ControlComment')
     ControlCommentBody = Shapes::StringShape.new(name: 'ControlCommentBody')
     ControlComments = Shapes::ListShape.new(name: 'ControlComments')
     ControlDescription = Shapes::StringShape.new(name: 'ControlDescription')
+    ControlDomainId = Shapes::StringShape.new(name: 'ControlDomainId')
     ControlDomainInsights = Shapes::StructureShape.new(name: 'ControlDomainInsights')
     ControlDomainInsightsList = Shapes::ListShape.new(name: 'ControlDomainInsightsList')
     ControlInsightsMetadata = Shapes::ListShape.new(name: 'ControlInsightsMetadata')
@@ -101,6 +103,7 @@ module Aws::AuditManager
     ControlSets = Shapes::ListShape.new(name: 'ControlSets')
     ControlSetsCount = Shapes::IntegerShape.new(name: 'ControlSetsCount')
     ControlSources = Shapes::StringShape.new(name: 'ControlSources')
+    ControlState = Shapes::StringShape.new(name: 'ControlState')
     ControlStatus = Shapes::StringShape.new(name: 'ControlStatus')
     ControlType = Shapes::StringShape.new(name: 'ControlType')
     Controls = Shapes::ListShape.new(name: 'Controls')
@@ -122,6 +125,7 @@ module Aws::AuditManager
     CreateDelegationRequest = Shapes::StructureShape.new(name: 'CreateDelegationRequest')
     CreateDelegationRequests = Shapes::ListShape.new(name: 'CreateDelegationRequests')
     CreatedBy = Shapes::StringShape.new(name: 'CreatedBy')
+    DataSourceType = Shapes::StringShape.new(name: 'DataSourceType')
     DefaultExportDestination = Shapes::StructureShape.new(name: 'DefaultExportDestination')
     Delegation = Shapes::StructureShape.new(name: 'Delegation')
     DelegationComment = Shapes::StringShape.new(name: 'DelegationComment')
@@ -590,6 +594,7 @@ module Aws::AuditManager
     Control.add_member(:created_by, Shapes::ShapeRef.new(shape: CreatedBy, location_name: "createdBy"))
     Control.add_member(:last_updated_by, Shapes::ShapeRef.new(shape: LastUpdatedBy, location_name: "lastUpdatedBy"))
     Control.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
+    Control.add_member(:state, Shapes::ShapeRef.new(shape: ControlState, location_name: "state"))
     Control.struct_class = Types::Control
 
     ControlComment.add_member(:author_name, Shapes::ShapeRef.new(shape: Username, location_name: "authorName"))
@@ -599,8 +604,8 @@ module Aws::AuditManager
 
     ControlComments.member = Shapes::ShapeRef.new(shape: ControlComment)
 
-    ControlDomainInsights.add_member(:name, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "name"))
-    ControlDomainInsights.add_member(:id, Shapes::ShapeRef.new(shape: UUID, location_name: "id"))
+    ControlDomainInsights.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "name"))
+    ControlDomainInsights.add_member(:id, Shapes::ShapeRef.new(shape: ControlDomainId, location_name: "id"))
     ControlDomainInsights.add_member(:controls_count_by_noncompliant_evidence, Shapes::ShapeRef.new(shape: NullableInteger, location_name: "controlsCountByNoncompliantEvidence"))
     ControlDomainInsights.add_member(:total_controls_count, Shapes::ShapeRef.new(shape: NullableInteger, location_name: "totalControlsCount"))
     ControlDomainInsights.add_member(:evidence_insights, Shapes::ShapeRef.new(shape: EvidenceInsights, location_name: "evidenceInsights"))
@@ -613,15 +618,15 @@ module Aws::AuditManager
 
     ControlInsightsMetadataByAssessment.member = Shapes::ShapeRef.new(shape: ControlInsightsMetadataByAssessmentItem)
 
-    ControlInsightsMetadataByAssessmentItem.add_member(:name, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "name"))
-    ControlInsightsMetadataByAssessmentItem.add_member(:id, Shapes::ShapeRef.new(shape: UUID, location_name: "id"))
+    ControlInsightsMetadataByAssessmentItem.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "name"))
+    ControlInsightsMetadataByAssessmentItem.add_member(:id, Shapes::ShapeRef.new(shape: ControlDomainId, location_name: "id"))
     ControlInsightsMetadataByAssessmentItem.add_member(:evidence_insights, Shapes::ShapeRef.new(shape: EvidenceInsights, location_name: "evidenceInsights"))
     ControlInsightsMetadataByAssessmentItem.add_member(:control_set_name, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "controlSetName"))
     ControlInsightsMetadataByAssessmentItem.add_member(:last_updated, Shapes::ShapeRef.new(shape: Timestamp, location_name: "lastUpdated"))
     ControlInsightsMetadataByAssessmentItem.struct_class = Types::ControlInsightsMetadataByAssessmentItem
 
-    ControlInsightsMetadataItem.add_member(:name, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "name"))
-    ControlInsightsMetadataItem.add_member(:id, Shapes::ShapeRef.new(shape: UUID, location_name: "id"))
+    ControlInsightsMetadataItem.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "name"))
+    ControlInsightsMetadataItem.add_member(:id, Shapes::ShapeRef.new(shape: ControlDomainId, location_name: "id"))
     ControlInsightsMetadataItem.add_member(:evidence_insights, Shapes::ShapeRef.new(shape: EvidenceInsights, location_name: "evidenceInsights"))
     ControlInsightsMetadataItem.add_member(:last_updated, Shapes::ShapeRef.new(shape: Timestamp, location_name: "lastUpdated"))
     ControlInsightsMetadataItem.struct_class = Types::ControlInsightsMetadataItem
@@ -1024,7 +1029,7 @@ module Aws::AuditManager
 
     Keywords.member = Shapes::ShapeRef.new(shape: KeywordValue)
 
-    ListAssessmentControlInsightsByControlDomainRequest.add_member(:control_domain_id, Shapes::ShapeRef.new(shape: UUID, required: true, location: "querystring", location_name: "controlDomainId"))
+    ListAssessmentControlInsightsByControlDomainRequest.add_member(:control_domain_id, Shapes::ShapeRef.new(shape: ControlDomainId, required: true, location: "querystring", location_name: "controlDomainId"))
     ListAssessmentControlInsightsByControlDomainRequest.add_member(:assessment_id, Shapes::ShapeRef.new(shape: UUID, required: true, location: "querystring", location_name: "assessmentId"))
     ListAssessmentControlInsightsByControlDomainRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "nextToken"))
     ListAssessmentControlInsightsByControlDomainRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location: "querystring", location_name: "maxResults"))
@@ -1088,7 +1093,7 @@ module Aws::AuditManager
     ListControlDomainInsightsResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "nextToken"))
     ListControlDomainInsightsResponse.struct_class = Types::ListControlDomainInsightsResponse
 
-    ListControlInsightsByControlDomainRequest.add_member(:control_domain_id, Shapes::ShapeRef.new(shape: UUID, required: true, location: "querystring", location_name: "controlDomainId"))
+    ListControlInsightsByControlDomainRequest.add_member(:control_domain_id, Shapes::ShapeRef.new(shape: ControlDomainId, required: true, location: "querystring", location_name: "controlDomainId"))
     ListControlInsightsByControlDomainRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "nextToken"))
     ListControlInsightsByControlDomainRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location: "querystring", location_name: "maxResults"))
     ListControlInsightsByControlDomainRequest.struct_class = Types::ListControlInsightsByControlDomainRequest
@@ -1100,13 +1105,14 @@ module Aws::AuditManager
     ListControlsRequest.add_member(:control_type, Shapes::ShapeRef.new(shape: ControlType, required: true, location: "querystring", location_name: "controlType"))
     ListControlsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "nextToken"))
     ListControlsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location: "querystring", location_name: "maxResults"))
+    ListControlsRequest.add_member(:control_catalog_id, Shapes::ShapeRef.new(shape: ControlCatalogId, location: "querystring", location_name: "controlCatalogId"))
     ListControlsRequest.struct_class = Types::ListControlsRequest
 
     ListControlsResponse.add_member(:control_metadata_list, Shapes::ShapeRef.new(shape: ControlMetadataList, location_name: "controlMetadataList"))
     ListControlsResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "nextToken"))
     ListControlsResponse.struct_class = Types::ListControlsResponse
 
-    ListKeywordsForDataSourceRequest.add_member(:source, Shapes::ShapeRef.new(shape: SourceType, required: true, location: "querystring", location_name: "source"))
+    ListKeywordsForDataSourceRequest.add_member(:source, Shapes::ShapeRef.new(shape: DataSourceType, required: true, location: "querystring", location_name: "source"))
     ListKeywordsForDataSourceRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "nextToken"))
     ListKeywordsForDataSourceRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location: "querystring", location_name: "maxResults"))
     ListKeywordsForDataSourceRequest.struct_class = Types::ListKeywordsForDataSourceRequest
@@ -1181,7 +1187,7 @@ module Aws::AuditManager
     Roles.member = Shapes::ShapeRef.new(shape: Role)
 
     Scope.add_member(:aws_accounts, Shapes::ShapeRef.new(shape: AWSAccounts, location_name: "awsAccounts"))
-    Scope.add_member(:aws_services, Shapes::ShapeRef.new(shape: AWSServices, location_name: "awsServices"))
+    Scope.add_member(:aws_services, Shapes::ShapeRef.new(shape: AWSServices, deprecated: true, location_name: "awsServices", metadata: {"deprecatedMessage"=>"You can't specify services in scope when creating/updating an assessment. If you use the parameter to specify one or more AWS services, Audit Manager ignores the input. Instead the value of the parameter will show as empty indicating that the services are defined and managed by Audit Manager."}))
     Scope.struct_class = Types::Scope
 
     ServiceMetadata.add_member(:name, Shapes::ShapeRef.new(shape: AWSServiceName, location_name: "name"))
@@ -1453,6 +1459,7 @@ module Aws::AuditManager
         o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
         o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
         o.errors << Shapes::ShapeRef.new(shape: ServiceQuotaExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
       end)
 
       api.add_operation(:create_assessment_framework, Seahorse::Model::Operation.new.tap do |o|
@@ -2097,6 +2104,7 @@ module Aws::AuditManager
         o.errors << Shapes::ShapeRef.new(shape: ValidationException)
         o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
         o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
       end)
 
       api.add_operation(:update_assessment_control, Seahorse::Model::Operation.new.tap do |o|

data/lib/aws-sdk-auditmanager/endpoint_provider.rb

@@ -32,7 +32,7 @@ module Aws::AuditManager
             raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
           end
           if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
-            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"))
+            if Aws::Endpoints::Matchers.boolean_equals?(Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"), true)
               return Aws::Endpoints::Endpoint.new(url: "https://auditmanager-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
             end
             raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"

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

@@ -165,7 +165,7 @@ module Aws::AuditManager
       :evidence_sources,
       :evidence_count,
       :assessment_report_evidence_count)
-      SENSITIVE = []
+      SENSITIVE = [:description]
       include Aws::Structure
     end
 
@@ -1180,6 +1180,13 @@ module Aws::AuditManager
     #   The tags associated with the control.
     #   @return [Hash<String,String>]
     #
+    # @!attribute [rw] state
+    #   The state of the control. The `END_OF_SUPPORT` state is applicable
+    #   to standard controls only. This state indicates that the standard
+    #   control can still be used to collect evidence, but Audit Manager is
+    #   no longer updating or maintaining that control.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/auditmanager-2017-07-25/Control AWS API Documentation
     #
     class Control < Struct.new(
@@ -1197,8 +1204,9 @@ module Aws::AuditManager
       :last_updated_at,
       :created_by,
       :last_updated_by,
-      :tags)
-      SENSITIVE = [:testing_information, :action_plan_title, :action_plan_instructions, :created_by, :last_updated_by]
+      :tags,
+      :state)
+      SENSITIVE = [:description, :testing_information, :action_plan_title, :action_plan_instructions, :created_by, :last_updated_by]
       include Aws::Structure
     end
 
@@ -1237,7 +1245,15 @@ module Aws::AuditManager
     #   @return [String]
     #
     # @!attribute [rw] id
-    #   The unique identifier for the control domain.
+    #   The unique identifier for the control domain. Audit Manager supports
+    #   the control domains that are provided by Amazon Web Services Control
+    #   Catalog. For information about how to find a list of available
+    #   control domains, see [ `ListDomains` ][1] in the Amazon Web Services
+    #   Control Catalog API Reference.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
     #   @return [String]
     #
     # @!attribute [rw] controls_count_by_noncompliant_evidence
@@ -1362,11 +1378,21 @@ module Aws::AuditManager
     #
     # @!attribute [rw] source_set_up_option
     #   The setup option for the data source. This option reflects if the
-    #   evidence collection is automated or manual.
+    #   evidence collection method is automated or manual. If you don’t
+    #   provide a value for `sourceSetUpOption`, Audit Manager automatically
+    #   infers and populates the correct value based on the `sourceType`
+    #   that you specify.
     #   @return [String]
     #
     # @!attribute [rw] source_type
-    #   Specifies one of the five data source types for evidence collection.
+    #   Specifies which type of data source is used to collect evidence.
+    #
+    #   * The source can be an individual data source type, such as
+    #     `AWS_Cloudtrail`, `AWS_Config`, `AWS_Security_Hub`,
+    #     `AWS_API_Call`, or `MANUAL`.
+    #
+    #   * The source can also be a managed grouping of data sources, such as
+    #     a `Core_Control` or a `Common_Control`.
     #   @return [String]
     #
     # @!attribute [rw] source_keyword
@@ -1647,8 +1673,22 @@ module Aws::AuditManager
     #   @return [Types::AssessmentReportsDestination]
     #
     # @!attribute [rw] scope
-    #   The wrapper that contains the Amazon Web Services accounts and
-    #   services that are in scope for the assessment.
+    #   The wrapper that contains the Amazon Web Services accounts that are
+    #   in scope for the assessment.
+    #
+    #   <note markdown="1"> You no longer need to specify which Amazon Web Services are in scope
+    #   when you create or update an assessment. Audit Manager infers the
+    #   services in scope by examining your assessment controls and their
+    #   data sources, and then mapping this information to the relevant
+    #   Amazon Web Services.
+    #
+    #    If an underlying data source changes for your assessment, we
+    #   automatically update the services scope as needed to reflect the
+    #   correct Amazon Web Services. This ensures that your assessment
+    #   collects accurate and comprehensive evidence about all of the
+    #   relevant services in your AWS environment.
+    #
+    #    </note>
     #   @return [Types::Scope]
     #
     # @!attribute [rw] roles
@@ -1692,8 +1732,8 @@ module Aws::AuditManager
       include Aws::Structure
     end
 
-    # The control mapping fields that represent the source for evidence
-    # collection, along with related parameters and metadata. This doesn't
+    # The mapping attributes that determine the evidence source for a given
+    # control, along with related parameters and metadata. This doesn't
     # contain `mappingID`.
     #
     # @!attribute [rw] source_name
@@ -1706,13 +1746,22 @@ module Aws::AuditManager
     #   @return [String]
     #
     # @!attribute [rw] source_set_up_option
-    #   The setup option for the data source, which reflects if the evidence
-    #   collection is automated or manual.
+    #   The setup option for the data source. This option reflects if the
+    #   evidence collection method is automated or manual. If you don’t
+    #   provide a value for `sourceSetUpOption`, Audit Manager automatically
+    #   infers and populates the correct value based on the `sourceType`
+    #   that you specify.
     #   @return [String]
     #
     # @!attribute [rw] source_type
-    #   Specifies one of the five types of data sources for evidence
-    #   collection.
+    #   Specifies which type of data source is used to collect evidence.
+    #
+    #   * The source can be an individual data source type, such as
+    #     `AWS_Cloudtrail`, `AWS_Config`, `AWS_Security_Hub`,
+    #     `AWS_API_Call`, or `MANUAL`.
+    #
+    #   * The source can also be a managed grouping of data sources, such as
+    #     a `Core_Control` or a `Common_Control`.
     #   @return [String]
     #
     # @!attribute [rw] source_keyword
@@ -1807,7 +1856,7 @@ module Aws::AuditManager
       :action_plan_instructions,
       :control_mapping_sources,
       :tags)
-      SENSITIVE = [:testing_information, :action_plan_title, :action_plan_instructions]
+      SENSITIVE = [:description, :testing_information, :action_plan_title, :action_plan_instructions]
       include Aws::Structure
     end
 
@@ -3280,6 +3329,15 @@ module Aws::AuditManager
 
     # @!attribute [rw] control_domain_id
     #   The unique identifier for the control domain.
+    #
+    #   Audit Manager supports the control domains that are provided by
+    #   Amazon Web Services Control Catalog. For information about how to
+    #   find a list of available control domains, see [ `ListDomains` ][1]
+    #   in the Amazon Web Services Control Catalog API Reference.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
     #   @return [String]
     #
     # @!attribute [rw] assessment_id
@@ -3564,6 +3622,15 @@ module Aws::AuditManager
 
     # @!attribute [rw] control_domain_id
     #   The unique identifier for the control domain.
+    #
+    #   Audit Manager supports the control domains that are provided by
+    #   Amazon Web Services Control Catalog. For information about how to
+    #   find a list of available control domains, see [ `ListDomains` ][1]
+    #   in the Amazon Web Services Control Catalog API Reference.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
     #   @return [String]
     #
     # @!attribute [rw] next_token
@@ -3604,7 +3671,7 @@ module Aws::AuditManager
     end
 
     # @!attribute [rw] control_type
-    #   The type of control, such as a standard control or a custom control.
+    #   A filter that narrows the list of controls to a specific type.
     #   @return [String]
     #
     # @!attribute [rw] next_token
@@ -3612,16 +3679,45 @@ module Aws::AuditManager
     #   @return [String]
     #
     # @!attribute [rw] max_results
-    #   Represents the maximum number of results on a page or for an API
-    #   request call.
+    #   The maximum number of results on a page or for an API request call.
     #   @return [Integer]
     #
+    # @!attribute [rw] control_catalog_id
+    #   A filter that narrows the list of controls to a specific resource
+    #   from the Amazon Web Services Control Catalog.
+    #
+    #   To use this parameter, specify the ARN of the Control Catalog
+    #   resource. You can specify either a control domain, a control
+    #   objective, or a common control. For information about how to find
+    #   the ARNs for these resources, see [ `ListDomains` ][1], [
+    #   `ListObjectives` ][2], and [ `ListCommonControls` ][3].
+    #
+    #   <note markdown="1"> You can only filter by one Control Catalog resource at a time.
+    #   Specifying multiple resource ARNs isn’t currently supported. If you
+    #   want to filter by more than one ARN, we recommend that you run the
+    #   `ListControls` operation separately for each ARN.
+    #
+    #    </note>
+    #
+    #   Alternatively, specify `UNCATEGORIZED` to list controls that aren't
+    #   mapped to a Control Catalog resource. For example, this operation
+    #   might return a list of custom controls that don't belong to any
+    #   control domain or control objective.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html
+    #   [2]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListObjectives.html
+    #   [3]: https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListCommonControls.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/auditmanager-2017-07-25/ListControlsRequest AWS API Documentation
     #
     class ListControlsRequest < Struct.new(
       :control_type,
       :next_token,
-      :max_results)
+      :max_results,
+      :control_catalog_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3668,7 +3764,7 @@ module Aws::AuditManager
     end
 
     # @!attribute [rw] keywords
-    #   The list of keywords for the event mapping source.
+    #   The list of keywords for the control mapping source.
     #   @return [Array<String>]
     #
     # @!attribute [rw] next_token
@@ -3981,8 +4077,22 @@ module Aws::AuditManager
       include Aws::Structure
     end
 
-    # The wrapper that contains the Amazon Web Services accounts and
-    # services that are in scope for the assessment.
+    # The wrapper that contains the Amazon Web Services accounts that are in
+    # scope for the assessment.
+    #
+    # <note markdown="1"> You no longer need to specify which Amazon Web Services are in scope
+    # when you create or update an assessment. Audit Manager infers the
+    # services in scope by examining your assessment controls and their data
+    # sources, and then mapping this information to the relevant Amazon Web
+    # Services.
+    #
+    #  If an underlying data source changes for your assessment, we
+    # automatically update the services scope as needed to reflect the
+    # correct Amazon Web Services. This ensures that your assessment
+    # collects accurate and comprehensive evidence about all of the relevant
+    # services in your AWS environment.
+    #
+    #  </note>
     #
     # @!attribute [rw] aws_accounts
     #   The Amazon Web Services accounts that are included in the scope of
@@ -3992,6 +4102,10 @@ module Aws::AuditManager
     # @!attribute [rw] aws_services
     #   The Amazon Web Services services that are included in the scope of
     #   the assessment.
+    #
+    #   This API parameter is no longer supported. If you use this parameter
+    #   to specify one or more Amazon Web Services, Audit Manager ignores
+    #   this input. Instead, the value for `awsServices` will show as empty.
     #   @return [Array<Types::AWSService>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/auditmanager-2017-07-25/Scope AWS API Documentation
@@ -4696,7 +4810,7 @@ module Aws::AuditManager
       :action_plan_title,
       :action_plan_instructions,
       :control_mapping_sources)
-      SENSITIVE = [:testing_information, :action_plan_title, :action_plan_instructions]
+      SENSITIVE = [:description, :testing_information, :action_plan_title, :action_plan_instructions]
       include Aws::Structure
     end
 

data/lib/aws-sdk-auditmanager.rb

@@ -52,6 +52,6 @@ require_relative 'aws-sdk-auditmanager/customizations'
 # @!group service
 module Aws::AuditManager
 
-  GEM_VERSION = '1.45.0'
+  GEM_VERSION = '1.47.0'
 
 end

data/sig/client.rbs

@@ -246,7 +246,7 @@ module Aws
                                 source_name: ::String?,
                                 source_description: ::String?,
                                 source_set_up_option: ("System_Controls_Mapping" | "Procedural_Controls_Mapping")?,
-                                source_type: ("AWS_Cloudtrail" | "AWS_Config" | "AWS_Security_Hub" | "AWS_API_Call" | "MANUAL")?,
+                                source_type: ("AWS_Cloudtrail" | "AWS_Config" | "AWS_Security_Hub" | "AWS_API_Call" | "MANUAL" | "Common_Control" | "Core_Control")?,
                                 source_keyword: {
                                   keyword_input_type: ("SELECT_FROM_LIST" | "UPLOAD_FILE" | "INPUT_TEXT")?,
                                   keyword_value: ::String?
@@ -649,9 +649,10 @@ module Aws
       end
       # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/AuditManager/Client.html#list_controls-instance_method
       def list_controls: (
-                           control_type: ("Standard" | "Custom"),
+                           control_type: ("Standard" | "Custom" | "Core"),
                            ?next_token: ::String,
-                           ?max_results: ::Integer
+                           ?max_results: ::Integer,
+                           ?control_catalog_id: ::String
                          ) -> _ListControlsResponseSuccess
                        | (Hash[Symbol, untyped] params, ?Hash[Symbol, untyped] options) -> _ListControlsResponseSuccess
 
@@ -873,7 +874,7 @@ module Aws
                                 source_name: ::String?,
                                 source_description: ::String?,
                                 source_set_up_option: ("System_Controls_Mapping" | "Procedural_Controls_Mapping")?,
-                                source_type: ("AWS_Cloudtrail" | "AWS_Config" | "AWS_Security_Hub" | "AWS_API_Call" | "MANUAL")?,
+                                source_type: ("AWS_Cloudtrail" | "AWS_Config" | "AWS_Security_Hub" | "AWS_API_Call" | "MANUAL" | "Common_Control" | "Core_Control")?,
                                 source_keyword: {
                                   keyword_input_type: ("SELECT_FROM_LIST" | "UPLOAD_FILE" | "INPUT_TEXT")?,
                                   keyword_value: ::String?

data/sig/types.rbs

@@ -44,7 +44,7 @@ module Aws::AuditManager
       attr_accessor evidence_sources: ::Array[::String]
       attr_accessor evidence_count: ::Integer
       attr_accessor assessment_report_evidence_count: ::Integer
-      SENSITIVE: []
+      SENSITIVE: [:description]
     end
 
     class AssessmentControlSet
@@ -292,7 +292,7 @@ module Aws::AuditManager
     class Control
       attr_accessor arn: ::String
       attr_accessor id: ::String
-      attr_accessor type: ("Standard" | "Custom")
+      attr_accessor type: ("Standard" | "Custom" | "Core")
       attr_accessor name: ::String
       attr_accessor description: ::String
       attr_accessor testing_information: ::String
@@ -305,7 +305,8 @@ module Aws::AuditManager
       attr_accessor created_by: ::String
       attr_accessor last_updated_by: ::String
       attr_accessor tags: ::Hash[::String, ::String]
-      SENSITIVE: [:testing_information, :action_plan_title, :action_plan_instructions, :created_by, :last_updated_by]
+      attr_accessor state: ("ACTIVE" | "END_OF_SUPPORT")
+      SENSITIVE: [:description, :testing_information, :action_plan_title, :action_plan_instructions, :created_by, :last_updated_by]
     end
 
     class ControlComment
@@ -347,7 +348,7 @@ module Aws::AuditManager
       attr_accessor source_name: ::String
       attr_accessor source_description: ::String
       attr_accessor source_set_up_option: ("System_Controls_Mapping" | "Procedural_Controls_Mapping")
-      attr_accessor source_type: ("AWS_Cloudtrail" | "AWS_Config" | "AWS_Security_Hub" | "AWS_API_Call" | "MANUAL")
+      attr_accessor source_type: ("AWS_Cloudtrail" | "AWS_Config" | "AWS_Security_Hub" | "AWS_API_Call" | "MANUAL" | "Common_Control" | "Core_Control")
       attr_accessor source_keyword: Types::SourceKeyword
       attr_accessor source_frequency: ("DAILY" | "WEEKLY" | "MONTHLY")
       attr_accessor troubleshooting_text: ::String
@@ -429,7 +430,7 @@ module Aws::AuditManager
       attr_accessor source_name: ::String
       attr_accessor source_description: ::String
       attr_accessor source_set_up_option: ("System_Controls_Mapping" | "Procedural_Controls_Mapping")
-      attr_accessor source_type: ("AWS_Cloudtrail" | "AWS_Config" | "AWS_Security_Hub" | "AWS_API_Call" | "MANUAL")
+      attr_accessor source_type: ("AWS_Cloudtrail" | "AWS_Config" | "AWS_Security_Hub" | "AWS_API_Call" | "MANUAL" | "Common_Control" | "Core_Control")
       attr_accessor source_keyword: Types::SourceKeyword
       attr_accessor source_frequency: ("DAILY" | "WEEKLY" | "MONTHLY")
       attr_accessor troubleshooting_text: ::String
@@ -444,7 +445,7 @@ module Aws::AuditManager
       attr_accessor action_plan_instructions: ::String
       attr_accessor control_mapping_sources: ::Array[Types::CreateControlMappingSource]
       attr_accessor tags: ::Hash[::String, ::String]
-      SENSITIVE: [:testing_information, :action_plan_title, :action_plan_instructions]
+      SENSITIVE: [:description, :testing_information, :action_plan_title, :action_plan_instructions]
     end
 
     class CreateControlResponse
@@ -955,9 +956,10 @@ module Aws::AuditManager
     end
 
     class ListControlsRequest
-      attr_accessor control_type: ("Standard" | "Custom")
+      attr_accessor control_type: ("Standard" | "Custom" | "Core")
       attr_accessor next_token: ::String
       attr_accessor max_results: ::Integer
+      attr_accessor control_catalog_id: ::String
       SENSITIVE: []
     end
 
@@ -1236,7 +1238,7 @@ module Aws::AuditManager
       attr_accessor action_plan_title: ::String
       attr_accessor action_plan_instructions: ::String
       attr_accessor control_mapping_sources: ::Array[Types::ControlMappingSource]
-      SENSITIVE: [:testing_information, :action_plan_title, :action_plan_instructions]
+      SENSITIVE: [:description, :testing_information, :action_plan_title, :action_plan_instructions]
     end
 
     class UpdateControlResponse

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-auditmanager
 version: !ruby/object:Gem::Version
-  version: 1.45.0
+  version: 1.47.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-24 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.197.0
+        version: 3.198.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.197.0
+        version: 3.198.0
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement