aws-sdk-macie2 1.2.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9323daf274a3d568f2587d30798fea1e8dd726c5a83ece2b968b8bba4b71085b
-  data.tar.gz: 4d13643f0955b4e8e1045ca7172d42febd0d7ef6a0f219e27cb754765593864a
+  metadata.gz: ee2cde70f8885abb6f361b9b9ffdaf0fe735e9b71b220b81a0b3a3ff1d064c28
+  data.tar.gz: 6059d20a0e6834f00bc0da5366bccab9509d42f0607ec61b837d35c4fef15124
 SHA512:
-  metadata.gz: 76943a9f4e73c41574238508d5eae62d69f71ed2f2aebb8a133675357795ccca899bcde950f6805ae1c4d9ebef3d466161009dab8d92133071a674d9fdf22b62
-  data.tar.gz: 2f07951cfdc7318fdd8b540db89f04b317d208091b6e58eebf0ffd5429a3d53d3ce03df8dcc96718a4bbaaa5190e7a95923b86a57b7dac792b3931362d02b66b
+  metadata.gz: 8db40a4546a5e6da768c159bc8373e0c353219b1669240a400fa2ebcecd67f37c00ee545e59e0cc33466b9f33ab2f44312b84f2a7f2b37fd9ea112f9f11231d6
+  data.tar.gz: be2b727cc11bcf0f22fca2ca95fb7ddc716c787966b09f6b8919a46306899e6f40555b417da63c546c0cd82b568c201b685a088fe89e5bc290f7260504f454b2

data/lib/aws-sdk-macie2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -45,6 +47,6 @@ require_relative 'aws-sdk-macie2/customizations'
 # @service
 module Aws::Macie2
 
-  GEM_VERSION = '1.2.0'
+  GEM_VERSION = '1.7.0'
 
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -24,6 +26,7 @@ require 'aws-sdk-core/plugins/jsonvalue_converter.rb'
 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/signature_v4.rb'
 require 'aws-sdk-core/plugins/protocols/rest_json.rb'
 
@@ -69,6 +72,7 @@ module Aws::Macie2
     add_plugin(Aws::Plugins::ClientMetricsPlugin)
     add_plugin(Aws::Plugins::ClientMetricsSendPlugin)
     add_plugin(Aws::Plugins::TransferEncoding)
+    add_plugin(Aws::Plugins::HttpChecksum)
     add_plugin(Aws::Plugins::SignatureV4)
     add_plugin(Aws::Plugins::Protocols::RestJson)
 
@@ -161,7 +165,7 @@ module Aws::Macie2
     #   @option options [String] :endpoint
     #     The client endpoint is normally constructed from the `:region`
     #     option. You should only configure an `:endpoint` when connecting
-    #     to test endpoints. This should be a valid HTTP(S) URI.
+    #     to test or custom endpoints. This should be a valid HTTP(S) URI.
     #
     #   @option options [Integer] :endpoint_cache_max_entries (1000)
     #     Used for the maximum size limit of the LRU cache storing endpoints data
@@ -333,27 +337,6 @@ module Aws::Macie2
       req.send_request(options)
     end
 
-    # Archives one or more findings.
-    #
-    # @option params [required, Array<String>] :finding_ids
-    #
-    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
-    #
-    # @example Request syntax with placeholder values
-    #
-    #   resp = client.archive_findings({
-    #     finding_ids: ["__string"], # required
-    #   })
-    #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/ArchiveFindings AWS API Documentation
-    #
-    # @overload archive_findings(params = {})
-    # @param [Hash] params ({})
-    def archive_findings(params = {}, options = {})
-      req = build_request(:archive_findings, params)
-      req.send_request(options)
-    end
-
     # Retrieves information about one or more custom data identifiers.
     #
     # @option params [Array<String>] :ids
@@ -579,8 +562,9 @@ module Aws::Macie2
     # filter.
     #
     # @option params [required, String] :action
-    #   The action to perform on findings that meet the filter criteria. Valid
-    #   values are:
+    #   The action to perform on findings that meet the filter criteria. To
+    #   suppress (automatically archive) findings that meet the criteria, set
+    #   this value to ARCHIVE. Valid values are:
     #
     # @option params [String] :client_token
     #   **A suitable default value is auto-generated.** You should normally
@@ -773,7 +757,7 @@ module Aws::Macie2
       req.send_request(options)
     end
 
-    # Deletes a custom data identifier.
+    # Soft deletes a custom data identifier.
     #
     # @option params [required, String] :id
     #
@@ -888,6 +872,8 @@ module Aws::Macie2
     #   * {Types::DescribeBucketsResponse#buckets #buckets} => Array&lt;Types::BucketMetadata&gt;
     #   * {Types::DescribeBucketsResponse#next_token #next_token} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.describe_buckets({
@@ -1147,9 +1133,10 @@ module Aws::Macie2
     #   not need to pass this option.**
     #
     # @option params [String] :finding_publishing_frequency
-    #   The frequency with which Amazon Macie publishes findings for an
-    #   account. This includes adding findings to AWS Security Hub and
-    #   exporting finding events to Amazon CloudWatch. Valid values are:
+    #   The frequency with which Amazon Macie publishes updates to policy
+    #   findings for an account. This includes publishing updates to AWS
+    #   Security Hub and Amazon EventBridge (formerly called Amazon CloudWatch
+    #   Events). Valid values are:
     #
     # @option params [String] :status
     #   The status of an Amazon Macie account. Valid values are:
@@ -1250,7 +1237,7 @@ module Aws::Macie2
       req.send_request(options)
     end
 
-    # Retrieves the configuration settings for exporting data classification
+    # Retrieves the configuration settings for storing data classification
     # results.
     #
     # @return [Types::GetClassificationExportConfigurationResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
@@ -1334,8 +1321,8 @@ module Aws::Macie2
     # @option params [Integer] :size
     #
     # @option params [Types::FindingStatisticsSortCriteria] :sort_criteria
-    #   Specifies criteria for sorting the results of a query for information
-    #   about findings.
+    #   Specifies criteria for sorting the results of a query that retrieves
+    #   aggregated statistical data about findings.
     #
     # @return [Types::GetFindingStatisticsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -1482,7 +1469,7 @@ module Aws::Macie2
     #   resp.findings[0].region #=> String
     #   resp.findings[0].resources_affected.s3_bucket.arn #=> String
     #   resp.findings[0].resources_affected.s3_bucket.created_at #=> Time
-    #   resp.findings[0].resources_affected.s3_bucket.default_server_side_encryption.encryption_type #=> String, one of "NONE", "AES256", "aws:kms"
+    #   resp.findings[0].resources_affected.s3_bucket.default_server_side_encryption.encryption_type #=> String, one of "NONE", "AES256", "aws:kms", "UNKNOWN"
     #   resp.findings[0].resources_affected.s3_bucket.default_server_side_encryption.kms_master_key_id #=> String
     #   resp.findings[0].resources_affected.s3_bucket.name #=> String
     #   resp.findings[0].resources_affected.s3_bucket.owner.display_name #=> String
@@ -1510,7 +1497,7 @@ module Aws::Macie2
     #   resp.findings[0].resources_affected.s3_object.last_modified #=> Time
     #   resp.findings[0].resources_affected.s3_object.path #=> String
     #   resp.findings[0].resources_affected.s3_object.public_access #=> Boolean
-    #   resp.findings[0].resources_affected.s3_object.server_side_encryption.encryption_type #=> String, one of "NONE", "AES256", "aws:kms"
+    #   resp.findings[0].resources_affected.s3_object.server_side_encryption.encryption_type #=> String, one of "NONE", "AES256", "aws:kms", "UNKNOWN"
     #   resp.findings[0].resources_affected.s3_object.server_side_encryption.kms_master_key_id #=> String
     #   resp.findings[0].resources_affected.s3_object.size #=> Integer
     #   resp.findings[0].resources_affected.s3_object.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "INTELLIGENT_TIERING", "DEEP_ARCHIVE", "ONEZONE_IA", "GLACIER"
@@ -1646,7 +1633,7 @@ module Aws::Macie2
     #   resp.master.account_id #=> String
     #   resp.master.invitation_id #=> String
     #   resp.master.invited_at #=> Time
-    #   resp.master.relationship_status #=> String, one of "Enabled", "Paused", "Invited", "Created", "Removed", "Resigned", "EmailVerificationInProgress", "EmailVerificationFailed"
+    #   resp.master.relationship_status #=> String, one of "Enabled", "Paused", "Invited", "Created", "Removed", "Resigned", "EmailVerificationInProgress", "EmailVerificationFailed", "RegionDisabled", "AccountSuspended"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetMasterAccount AWS API Documentation
     #
@@ -1686,7 +1673,7 @@ module Aws::Macie2
     #   resp.email #=> String
     #   resp.invited_at #=> Time
     #   resp.master_account_id #=> String
-    #   resp.relationship_status #=> String, one of "Enabled", "Paused", "Invited", "Created", "Removed", "Resigned", "EmailVerificationInProgress", "EmailVerificationFailed"
+    #   resp.relationship_status #=> String, one of "Enabled", "Paused", "Invited", "Created", "Removed", "Resigned", "EmailVerificationInProgress", "EmailVerificationFailed", "RegionDisabled", "AccountSuspended"
     #   resp.tags #=> Hash
     #   resp.tags["__string"] #=> String
     #   resp.updated_at #=> Time
@@ -1718,19 +1705,22 @@ module Aws::Macie2
     #   * {Types::GetUsageStatisticsResponse#next_token #next_token} => String
     #   * {Types::GetUsageStatisticsResponse#records #records} => Array&lt;Types::UsageRecord&gt;
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.get_usage_statistics({
     #     filter_by: [
     #       {
-    #         key: "accountId", # accepts accountId
+    #         comparator: "GT", # accepts GT, GTE, LT, LTE, EQ, NE, CONTAINS
+    #         key: "accountId", # accepts accountId, serviceLimit, freeTrialStartDate, total
     #         values: ["__string"],
     #       },
     #     ],
     #     max_results: 1,
     #     next_token: "__string",
     #     sort_by: {
-    #       key: "accountId", # accepts accountId, total
+    #       key: "accountId", # accepts accountId, total, serviceLimitValue, freeTrialStartDate
     #       order_by: "ASC", # accepts ASC, DESC
     #     },
     #   })
@@ -1780,8 +1770,8 @@ module Aws::Macie2
       req.send_request(options)
     end
 
-    # Retrieves information about the status and settings for one or more
-    # classification jobs.
+    # Retrieves a subset of information about one or more classification
+    # jobs.
     #
     # @option params [Types::ListJobsFilterCriteria] :filter_criteria
     #   Specifies criteria for filtering the results of a request for
@@ -1800,6 +1790,8 @@ module Aws::Macie2
     #   * {Types::ListClassificationJobsResponse#items #items} => Array&lt;Types::JobSummary&gt;
     #   * {Types::ListClassificationJobsResponse#next_token #next_token} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_classification_jobs({
@@ -1862,6 +1854,8 @@ module Aws::Macie2
     #   * {Types::ListCustomDataIdentifiersResponse#items #items} => Array&lt;Types::CustomDataIdentifierSummary&gt;
     #   * {Types::ListCustomDataIdentifiersResponse#next_token #next_token} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_custom_data_identifiers({
@@ -1907,6 +1901,8 @@ module Aws::Macie2
     #   * {Types::ListFindingsResponse#finding_ids #finding_ids} => Array&lt;String&gt;
     #   * {Types::ListFindingsResponse#next_token #next_token} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_findings({
@@ -1957,6 +1953,8 @@ module Aws::Macie2
     #   * {Types::ListFindingsFiltersResponse#findings_filter_list_items #findings_filter_list_items} => Array&lt;Types::FindingsFilterListItem&gt;
     #   * {Types::ListFindingsFiltersResponse#next_token #next_token} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_findings_filters({
@@ -1967,6 +1965,7 @@ module Aws::Macie2
     # @example Response structure
     #
     #   resp.findings_filter_list_items #=> Array
+    #   resp.findings_filter_list_items[0].action #=> String, one of "ARCHIVE", "NOOP"
     #   resp.findings_filter_list_items[0].arn #=> String
     #   resp.findings_filter_list_items[0].id #=> String
     #   resp.findings_filter_list_items[0].name #=> String
@@ -1995,6 +1994,8 @@ module Aws::Macie2
     #   * {Types::ListInvitationsResponse#invitations #invitations} => Array&lt;Types::Invitation&gt;
     #   * {Types::ListInvitationsResponse#next_token #next_token} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_invitations({
@@ -2008,7 +2009,7 @@ module Aws::Macie2
     #   resp.invitations[0].account_id #=> String
     #   resp.invitations[0].invitation_id #=> String
     #   resp.invitations[0].invited_at #=> Time
-    #   resp.invitations[0].relationship_status #=> String, one of "Enabled", "Paused", "Invited", "Created", "Removed", "Resigned", "EmailVerificationInProgress", "EmailVerificationFailed"
+    #   resp.invitations[0].relationship_status #=> String, one of "Enabled", "Paused", "Invited", "Created", "Removed", "Resigned", "EmailVerificationInProgress", "EmailVerificationFailed", "RegionDisabled", "AccountSuspended"
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/ListInvitations AWS API Documentation
@@ -2034,6 +2035,8 @@ module Aws::Macie2
     #   * {Types::ListMembersResponse#members #members} => Array&lt;Types::Member&gt;
     #   * {Types::ListMembersResponse#next_token #next_token} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_members({
@@ -2050,7 +2053,7 @@ module Aws::Macie2
     #   resp.members[0].email #=> String
     #   resp.members[0].invited_at #=> Time
     #   resp.members[0].master_account_id #=> String
-    #   resp.members[0].relationship_status #=> String, one of "Enabled", "Paused", "Invited", "Created", "Removed", "Resigned", "EmailVerificationInProgress", "EmailVerificationFailed"
+    #   resp.members[0].relationship_status #=> String, one of "Enabled", "Paused", "Invited", "Created", "Removed", "Resigned", "EmailVerificationInProgress", "EmailVerificationFailed", "RegionDisabled", "AccountSuspended"
     #   resp.members[0].tags #=> Hash
     #   resp.members[0].tags["__string"] #=> String
     #   resp.members[0].updated_at #=> Time
@@ -2077,6 +2080,8 @@ module Aws::Macie2
     #   * {Types::ListOrganizationAdminAccountsResponse#admin_accounts #admin_accounts} => Array&lt;Types::AdminAccount&gt;
     #   * {Types::ListOrganizationAdminAccountsResponse#next_token #next_token} => String
     #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
     # @example Request syntax with placeholder values
     #
     #   resp = client.list_organization_admin_accounts({
@@ -2130,13 +2135,13 @@ module Aws::Macie2
       req.send_request(options)
     end
 
-    # Creates or updates the configuration settings for exporting data
+    # Creates or updates the configuration settings for storing data
     # classification results.
     #
     # @option params [required, Types::ClassificationExportConfiguration] :configuration
-    #   Specifies where to export data classification results to, and the
+    #   Specifies where to store data classification results, and the
     #   encryption settings to use when storing results in that location.
-    #   Currently, you can export classification results only to an S3 bucket.
+    #   Currently, you can store classification results only in an S3 bucket.
     #
     # @return [Types::PutClassificationExportConfigurationResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -2239,27 +2244,6 @@ module Aws::Macie2
       req.send_request(options)
     end
 
-    # Reactivates (unarchives) one or more findings.
-    #
-    # @option params [required, Array<String>] :finding_ids
-    #
-    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
-    #
-    # @example Request syntax with placeholder values
-    #
-    #   resp = client.unarchive_findings({
-    #     finding_ids: ["__string"], # required
-    #   })
-    #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/UnarchiveFindings AWS API Documentation
-    #
-    # @overload unarchive_findings(params = {})
-    # @param [Hash] params ({})
-    def unarchive_findings(params = {}, options = {})
-      req = build_request(:unarchive_findings, params)
-      req.send_request(options)
-    end
-
     # Removes one or more tags (keys and values) from a classification job,
     # custom data identifier, findings filter, or member account.
     #
@@ -2290,7 +2274,7 @@ module Aws::Macie2
     # @option params [required, String] :job_id
     #
     # @option params [required, String] :job_status
-    #   The current status of a classification job. Valid values are:
+    #   The current status of a classification job. Possible values are:
     #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
@@ -2313,8 +2297,9 @@ module Aws::Macie2
     # Updates the criteria and other settings for a findings filter.
     #
     # @option params [String] :action
-    #   The action to perform on findings that meet the filter criteria. Valid
-    #   values are:
+    #   The action to perform on findings that meet the filter criteria. To
+    #   suppress (automatically archive) findings that meet the criteria, set
+    #   this value to ARCHIVE. Valid values are:
     #
     # @option params [String] :description
     #
@@ -2373,9 +2358,10 @@ module Aws::Macie2
     # configuration settings for a Macie account.
     #
     # @option params [String] :finding_publishing_frequency
-    #   The frequency with which Amazon Macie publishes findings for an
-    #   account. This includes adding findings to AWS Security Hub and
-    #   exporting finding events to Amazon CloudWatch. Valid values are:
+    #   The frequency with which Amazon Macie publishes updates to policy
+    #   findings for an account. This includes publishing updates to AWS
+    #   Security Hub and Amazon EventBridge (formerly called Amazon CloudWatch
+    #   Events). Valid values are:
     #
     # @option params [String] :status
     #   The status of an Amazon Macie account. Valid values are:
@@ -2458,7 +2444,7 @@ module Aws::Macie2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-macie2'
-      context[:gem_version] = '1.2.0'
+      context[:gem_version] = '1.7.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -20,8 +22,6 @@ module Aws::Macie2
     AdminAccount = Shapes::StructureShape.new(name: 'AdminAccount')
     AdminStatus = Shapes::StringShape.new(name: 'AdminStatus')
     ApiCallDetails = Shapes::StructureShape.new(name: 'ApiCallDetails')
-    ArchiveFindingsRequest = Shapes::StructureShape.new(name: 'ArchiveFindingsRequest')
-    ArchiveFindingsResponse = Shapes::StructureShape.new(name: 'ArchiveFindingsResponse')
     AssumedRole = Shapes::StructureShape.new(name: 'AssumedRole')
     AwsAccount = Shapes::StructureShape.new(name: 'AwsAccount')
     AwsService = Shapes::StructureShape.new(name: 'AwsService')
@@ -224,8 +224,6 @@ module Aws::Macie2
     TestCustomDataIdentifierRequest = Shapes::StructureShape.new(name: 'TestCustomDataIdentifierRequest')
     TestCustomDataIdentifierResponse = Shapes::StructureShape.new(name: 'TestCustomDataIdentifierResponse')
     ThrottlingException = Shapes::StructureShape.new(name: 'ThrottlingException')
-    UnarchiveFindingsRequest = Shapes::StructureShape.new(name: 'UnarchiveFindingsRequest')
-    UnarchiveFindingsResponse = Shapes::StructureShape.new(name: 'UnarchiveFindingsResponse')
     Unit = Shapes::StringShape.new(name: 'Unit')
     UnprocessedAccount = Shapes::StructureShape.new(name: 'UnprocessedAccount')
     UntagResourceRequest = Shapes::StructureShape.new(name: 'UntagResourceRequest')
@@ -243,6 +241,7 @@ module Aws::Macie2
     UsageByAccount = Shapes::StructureShape.new(name: 'UsageByAccount')
     UsageRecord = Shapes::StructureShape.new(name: 'UsageRecord')
     UsageStatisticsFilter = Shapes::StructureShape.new(name: 'UsageStatisticsFilter')
+    UsageStatisticsFilterComparator = Shapes::StringShape.new(name: 'UsageStatisticsFilterComparator')
     UsageStatisticsFilterKey = Shapes::StringShape.new(name: 'UsageStatisticsFilterKey')
     UsageStatisticsSortBy = Shapes::StructureShape.new(name: 'UsageStatisticsSortBy')
     UsageStatisticsSortKey = Shapes::StringShape.new(name: 'UsageStatisticsSortKey')
@@ -313,11 +312,6 @@ module Aws::Macie2
     ApiCallDetails.add_member(:last_seen, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "lastSeen"))
     ApiCallDetails.struct_class = Types::ApiCallDetails
 
-    ArchiveFindingsRequest.add_member(:finding_ids, Shapes::ShapeRef.new(shape: __listOf__string, required: true, location_name: "findingIds"))
-    ArchiveFindingsRequest.struct_class = Types::ArchiveFindingsRequest
-
-    ArchiveFindingsResponse.struct_class = Types::ArchiveFindingsResponse
-
     AssumedRole.add_member(:access_key_id, Shapes::ShapeRef.new(shape: __string, location_name: "accessKeyId"))
     AssumedRole.add_member(:account_id, Shapes::ShapeRef.new(shape: __string, location_name: "accountId"))
     AssumedRole.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
@@ -684,6 +678,7 @@ module Aws::Macie2
     FindingStatisticsSortCriteria.add_member(:order_by, Shapes::ShapeRef.new(shape: OrderBy, location_name: "orderBy"))
     FindingStatisticsSortCriteria.struct_class = Types::FindingStatisticsSortCriteria
 
+    FindingsFilterListItem.add_member(:action, Shapes::ShapeRef.new(shape: FindingsFilterAction, location_name: "action"))
     FindingsFilterListItem.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     FindingsFilterListItem.add_member(:id, Shapes::ShapeRef.new(shape: __string, location_name: "id"))
     FindingsFilterListItem.add_member(:name, Shapes::ShapeRef.new(shape: __string, location_name: "name"))
@@ -1118,11 +1113,6 @@ module Aws::Macie2
     ThrottlingException.add_member(:message, Shapes::ShapeRef.new(shape: __string, location_name: "message"))
     ThrottlingException.struct_class = Types::ThrottlingException
 
-    UnarchiveFindingsRequest.add_member(:finding_ids, Shapes::ShapeRef.new(shape: __listOf__string, required: true, location_name: "findingIds"))
-    UnarchiveFindingsRequest.struct_class = Types::UnarchiveFindingsRequest
-
-    UnarchiveFindingsResponse.struct_class = Types::UnarchiveFindingsResponse
-
     UnprocessedAccount.add_member(:account_id, Shapes::ShapeRef.new(shape: __string, location_name: "accountId"))
     UnprocessedAccount.add_member(:error_code, Shapes::ShapeRef.new(shape: ErrorCode, location_name: "errorCode"))
     UnprocessedAccount.add_member(:error_message, Shapes::ShapeRef.new(shape: __string, location_name: "errorMessage"))
@@ -1180,6 +1170,7 @@ module Aws::Macie2
     UsageRecord.add_member(:usage, Shapes::ShapeRef.new(shape: __listOfUsageByAccount, location_name: "usage"))
     UsageRecord.struct_class = Types::UsageRecord
 
+    UsageStatisticsFilter.add_member(:comparator, Shapes::ShapeRef.new(shape: UsageStatisticsFilterComparator, location_name: "comparator"))
     UsageStatisticsFilter.add_member(:key, Shapes::ShapeRef.new(shape: UsageStatisticsFilterKey, location_name: "key"))
     UsageStatisticsFilter.add_member(:values, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "values"))
     UsageStatisticsFilter.struct_class = Types::UsageStatisticsFilter
@@ -1290,21 +1281,6 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
       end)
 
-      api.add_operation(:archive_findings, Seahorse::Model::Operation.new.tap do |o|
-        o.name = "ArchiveFindings"
-        o.http_method = "POST"
-        o.http_request_uri = "/findings/archive"
-        o.input = Shapes::ShapeRef.new(shape: ArchiveFindingsRequest)
-        o.output = Shapes::ShapeRef.new(shape: ArchiveFindingsResponse)
-        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
-        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
-        o.errors << Shapes::ShapeRef.new(shape: ServiceQuotaExceededException)
-        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
-        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
-        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
-        o.errors << Shapes::ShapeRef.new(shape: ConflictException)
-      end)
-
       api.add_operation(:batch_get_custom_data_identifiers, Seahorse::Model::Operation.new.tap do |o|
         o.name = "BatchGetCustomDataIdentifiers"
         o.http_method = "POST"
@@ -1498,6 +1474,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:describe_classification_job, Seahorse::Model::Operation.new.tap do |o|
@@ -1783,6 +1765,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:get_usage_totals, Seahorse::Model::Operation.new.tap do |o|
@@ -1813,6 +1801,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:list_custom_data_identifiers, Seahorse::Model::Operation.new.tap do |o|
@@ -1828,6 +1822,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:list_findings, Seahorse::Model::Operation.new.tap do |o|
@@ -1843,6 +1843,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:list_findings_filters, Seahorse::Model::Operation.new.tap do |o|
@@ -1858,6 +1864,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:list_invitations, Seahorse::Model::Operation.new.tap do |o|
@@ -1873,6 +1885,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:list_members, Seahorse::Model::Operation.new.tap do |o|
@@ -1888,6 +1906,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:list_organization_admin_accounts, Seahorse::Model::Operation.new.tap do |o|
@@ -1903,6 +1927,12 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
       end)
 
       api.add_operation(:list_tags_for_resource, Seahorse::Model::Operation.new.tap do |o|
@@ -1951,21 +1981,6 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
       end)
 
-      api.add_operation(:unarchive_findings, Seahorse::Model::Operation.new.tap do |o|
-        o.name = "UnarchiveFindings"
-        o.http_method = "POST"
-        o.http_request_uri = "/findings/unarchive"
-        o.input = Shapes::ShapeRef.new(shape: UnarchiveFindingsRequest)
-        o.output = Shapes::ShapeRef.new(shape: UnarchiveFindingsResponse)
-        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
-        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
-        o.errors << Shapes::ShapeRef.new(shape: ServiceQuotaExceededException)
-        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
-        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
-        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
-        o.errors << Shapes::ShapeRef.new(shape: ConflictException)
-      end)
-
       api.add_operation(:untag_resource, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UntagResource"
         o.http_method = "DELETE"