aws-sdk-macie2 1.9.0 → 1.14.0

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

@@ -120,15 +120,15 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about an account that's designated as a
-    # delegated administrator of Amazon Macie for an AWS organization.
+    # Provides information about the delegated Amazon Macie administrator
+    # account for an AWS organization.
     #
     # @!attribute [rw] account_id
     #   @return [String]
     #
     # @!attribute [rw] status
-    #   The current status of an account as a delegated administrator of
-    #   Amazon Macie for an AWS organization.
+    #   The current status of an account as the delegated Amazon Macie
+    #   administrator account for an AWS organization.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/AdminAccount AWS API Documentation
@@ -350,12 +350,16 @@ module Aws::Macie2
     # @!attribute [rw] publicly_writable
     #   @return [Integer]
     #
+    # @!attribute [rw] unknown
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/BucketCountByEffectivePermission AWS API Documentation
     #
     class BucketCountByEffectivePermission < Struct.new(
       :publicly_accessible,
       :publicly_readable,
-      :publicly_writable)
+      :publicly_writable,
+      :unknown)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -394,12 +398,16 @@ module Aws::Macie2
     # @!attribute [rw] not_shared
     #   @return [Integer]
     #
+    # @!attribute [rw] unknown
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/BucketCountBySharedAccessType AWS API Documentation
     #
     class BucketCountBySharedAccessType < Struct.new(
       :external,
       :internal,
-      :not_shared)
+      :not_shared,
+      :unknown)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -455,8 +463,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about bucket-level permissions settings for an S3
-    # bucket.
+    # Provides information about the bucket-level permissions settings for
+    # an S3 bucket.
     #
     # @!attribute [rw] access_control_list
     #   Provides information about the permissions settings of the
@@ -508,6 +516,9 @@ module Aws::Macie2
     # @!attribute [rw] classifiable_object_count
     #   @return [Integer]
     #
+    # @!attribute [rw] classifiable_size_in_bytes
+    #   @return [Integer]
+    #
     # @!attribute [rw] last_updated
     #   @return [Time]
     #
@@ -521,7 +532,7 @@ module Aws::Macie2
     #   @return [Types::ObjectCountByEncryptionType]
     #
     # @!attribute [rw] public_access
-    #   Provides information about permissions settings that determine
+    #   Provides information about the permissions settings that determine
     #   whether an S3 bucket is publicly accessible.
     #   @return [Types::BucketPublicAccess]
     #
@@ -546,6 +557,22 @@ module Aws::Macie2
     # @!attribute [rw] tags
     #   @return [Array<Types::KeyValuePair>]
     #
+    # @!attribute [rw] unclassifiable_object_count
+    #   Provides information about the total storage size (in bytes) or
+    #   number of objects that Amazon Macie can't analyze in one or more S3
+    #   buckets. In a BucketMetadata object, this data is for a specific
+    #   bucket. In a GetBucketStatisticsResponse object, this data is
+    #   aggregated for all the buckets in the query results.
+    #   @return [Types::ObjectLevelStatistics]
+    #
+    # @!attribute [rw] unclassifiable_object_size_in_bytes
+    #   Provides information about the total storage size (in bytes) or
+    #   number of objects that Amazon Macie can't analyze in one or more S3
+    #   buckets. In a BucketMetadata object, this data is for a specific
+    #   bucket. In a GetBucketStatisticsResponse object, this data is
+    #   aggregated for all the buckets in the query results.
+    #   @return [Types::ObjectLevelStatistics]
+    #
     # @!attribute [rw] versioning
     #   @return [Boolean]
     #
@@ -557,6 +584,7 @@ module Aws::Macie2
       :bucket_created_at,
       :bucket_name,
       :classifiable_object_count,
+      :classifiable_size_in_bytes,
       :last_updated,
       :object_count,
       :object_count_by_encryption_type,
@@ -567,13 +595,15 @@ module Aws::Macie2
       :size_in_bytes,
       :size_in_bytes_compressed,
       :tags,
+      :unclassifiable_object_count,
+      :unclassifiable_object_size_in_bytes,
       :versioning)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # The account-level and bucket-level permissions settings for an S3
-    # bucket.
+    # Provides information about the account-level and bucket-level
+    # permissions settings for an S3 bucket.
     #
     # @!attribute [rw] account_level_permissions
     #   Provides information about account-level permissions settings that
@@ -581,8 +611,8 @@ module Aws::Macie2
     #   @return [Types::AccountLevelPermissions]
     #
     # @!attribute [rw] bucket_level_permissions
-    #   Provides information about bucket-level permissions settings for an
-    #   S3 bucket.
+    #   Provides information about the bucket-level permissions settings for
+    #   an S3 bucket.
     #   @return [Types::BucketLevelPermissions]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/BucketPermissionConfiguration AWS API Documentation
@@ -612,15 +642,15 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about permissions settings that determine whether
-    # an S3 bucket is publicly accessible.
+    # Provides information about the permissions settings that determine
+    # whether an S3 bucket is publicly accessible.
     #
     # @!attribute [rw] effective_permission
     #   @return [String]
     #
     # @!attribute [rw] permission_configuration
-    #   The account-level and bucket-level permissions settings for an S3
-    #   bucket.
+    #   Provides information about the account-level and bucket-level
+    #   permissions settings for an S3 bucket.
     #   @return [Types::BucketPermissionConfiguration]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/BucketPublicAccess AWS API Documentation
@@ -658,6 +688,32 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Specifies the location of an occurrence of sensitive data in a
+    # Microsoft Excel workbook, CSV file, or TSV file.
+    #
+    # @!attribute [rw] cell_reference
+    #   @return [String]
+    #
+    # @!attribute [rw] column
+    #   @return [Integer]
+    #
+    # @!attribute [rw] column_name
+    #   @return [String]
+    #
+    # @!attribute [rw] row
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/Cell AWS API Documentation
+    #
+    class Cell < Struct.new(
+      :cell_reference,
+      :column,
+      :column_name,
+      :row)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Provides information about a sensitive data finding, including the
     # classification job that produced the finding.
     #
@@ -671,9 +727,9 @@ module Aws::Macie2
     #   @return [String]
     #
     # @!attribute [rw] result
-    #   Provides detailed information about a sensitive data finding,
-    #   including the types and number of occurrences of the sensitive data
-    #   that was found.
+    #   Provides the details of a sensitive data finding, including the
+    #   types, number of occurrences, and locations of the sensitive data
+    #   that was detected.
     #   @return [Types::ClassificationResult]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/ClassificationDetails AWS API Documentation
@@ -715,14 +771,17 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides detailed information about a sensitive data finding,
-    # including the types and number of occurrences of the sensitive data
-    # that was found.
+    # Provides the details of a sensitive data finding, including the types,
+    # number of occurrences, and locations of the sensitive data that was
+    # detected.
+    #
+    # @!attribute [rw] additional_occurrences
+    #   @return [Boolean]
     #
     # @!attribute [rw] custom_data_identifiers
-    #   Provides information about the number of occurrences of the data
-    #   that produced a sensitive data finding, and the custom data
-    #   identifiers that detected the data for the finding.
+    #   Provides information about custom data identifiers that produced a
+    #   sensitive data finding, and the number of occurrences of the data
+    #   that they detected for the finding.
     #   @return [Types::CustomDataIdentifiers]
     #
     # @!attribute [rw] mime_type
@@ -743,6 +802,7 @@ module Aws::Macie2
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/ClassificationResult AWS API Documentation
     #
     class ClassificationResult < Struct.new(
+      :additional_occurrences,
       :custom_data_identifiers,
       :mime_type,
       :sensitive_data,
@@ -784,10 +844,10 @@ module Aws::Macie2
     end
 
     # Specifies the scope, schedule, and other settings for a classification
-    # job. You can't delete or change the settings for a classification job
-    # after you create it. In Amazon Macie, classification jobs are
-    # immutable. This ensures accurate data classification results for
-    # audits or investigations.
+    # job. You can't change any settings for a classification job after you
+    # create it. This helps ensure that you have an immutable history of
+    # sensitive data findings and discovery results for data privacy and
+    # protection audits or investigations.
     #
     # @note When making an API call, you may pass CreateClassificationJobRequest
     #   data as a hash:
@@ -945,9 +1005,9 @@ module Aws::Macie2
 
     # Specifies the criteria and other settings for a new custom data
     # identifier. You can't change a custom data identifier after you
-    # create it. In Amazon Macie, custom data identifiers are immutable.
-    # This ensures accurate data classification results for audits or
-    # investigations.
+    # create it. This helps ensure that you have an immutable history of
+    # sensitive data findings and discovery results for data privacy and
+    # protection audits or investigations.
     #
     # @note When making an API call, you may pass CreateCustomDataIdentifierRequest
     #   data as a hash:
@@ -1307,9 +1367,9 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about the number of occurrences of the data that
-    # produced a sensitive data finding, and the custom data identifiers
-    # that detected the data for the finding.
+    # Provides information about custom data identifiers that produced a
+    # sensitive data finding, and the number of occurrences of the data that
+    # they detected for the finding.
     #
     # @!attribute [rw] detections
     #   Provides information about custom data identifiers that produced a
@@ -1330,8 +1390,8 @@ module Aws::Macie2
     end
 
     # Provides information about a custom data identifier that produced a
-    # sensitive data finding, and the number of occurrences of the data that
-    # it detected for the finding.
+    # sensitive data finding, and the sensitive data that it detected for
+    # the finding.
     #
     # @!attribute [rw] arn
     #   @return [String]
@@ -1342,12 +1402,19 @@ module Aws::Macie2
     # @!attribute [rw] name
     #   @return [String]
     #
+    # @!attribute [rw] occurrences
+    #   Provides the location of 1-15 occurrences of sensitive data that was
+    #   detected by managed data identifiers or a custom data identifier and
+    #   produced a sensitive data finding.
+    #   @return [Types::Occurrences]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/CustomDetection AWS API Documentation
     #
     class CustomDetection < Struct.new(
       :arn,
       :count,
-      :name)
+      :name,
+      :occurrences)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1397,12 +1464,18 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about sensitive data that was detected by managed
-    # data identifiers and produced a sensitive data finding.
+    # Provides information about a type of sensitive data that was detected
+    # by managed data identifiers and produced a sensitive data finding.
     #
     # @!attribute [rw] count
     #   @return [Integer]
     #
+    # @!attribute [rw] occurrences
+    #   Provides the location of 1-15 occurrences of sensitive data that was
+    #   detected by managed data identifiers or a custom data identifier and
+    #   produced a sensitive data finding.
+    #   @return [Types::Occurrences]
+    #
     # @!attribute [rw] type
     #   @return [String]
     #
@@ -1410,6 +1483,7 @@ module Aws::Macie2
     #
     class DefaultDetection < Struct.new(
       :count,
+      :occurrences,
       :type)
       SENSITIVE = []
       include Aws::Structure
@@ -1633,7 +1707,7 @@ module Aws::Macie2
     #   @return [String]
     #
     # @!attribute [rw] job_status
-    #   The current status of a classification job. Possible values are:
+    #   The status of a classification job. Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] job_type
@@ -1668,6 +1742,13 @@ module Aws::Macie2
     #   findings filter, or member account.
     #   @return [Hash<String,String>]
     #
+    # @!attribute [rw] user_paused_details
+    #   Provides information about when a classification job was paused and
+    #   when it will expire and be cancelled if it isn’t resumed. This
+    #   object is present only if a job’s current status (jobStatus) is
+    #   USER\_PAUSED.
+    #   @return [Types::UserPausedDetails]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/DescribeClassificationJobResponse AWS API Documentation
     #
     class DescribeClassificationJobResponse < Struct.new(
@@ -1686,7 +1767,8 @@ module Aws::Macie2
       :sampling_percentage,
       :schedule_frequency,
       :statistics,
-      :tags)
+      :tags,
+      :user_paused_details)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1842,9 +1924,9 @@ module Aws::Macie2
     #
     class EnableMacieResponse < Aws::EmptyStructure; end
 
-    # Specifies an account to designate as a delegated administrator of
-    # Amazon Macie for an AWS organization. To submit this request, you must
-    # be a user of the master account for the AWS organization.
+    # Specifies an account to designate as a delegated Amazon Macie
+    # administrator account for an AWS organization. To submit this request,
+    # you must be a user of the management account for the AWS organization.
     #
     # @note When making an API call, you may pass EnableOrganizationAdminAccountRequest
     #   data as a hash:
@@ -1909,7 +1991,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about a finding.
+    # Provides the details of a finding.
     #
     # @!attribute [rw] account_id
     #   @return [String]
@@ -1959,15 +2041,21 @@ module Aws::Macie2
     #   @return [String]
     #
     # @!attribute [rw] severity
-    #   Provides the numeric score and textual representation of a severity
-    #   value.
+    #   Provides the numerical and qualitative representations of a
+    #   finding's severity.
     #   @return [Types::Severity]
     #
     # @!attribute [rw] title
     #   @return [String]
     #
     # @!attribute [rw] type
-    #   The type of finding. Valid values are:
+    #   The type of finding. For details about each type, see [Types of
+    #   Amazon Macie findings][1] in the *Amazon Macie User Guide*. Valid
+    #   values are:
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/macie/latest/user/findings-types.html
     #   @return [String]
     #
     # @!attribute [rw] updated_at
@@ -2142,8 +2230,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies an account that's associated with the S3 buckets to
-    # retrieve aggregated statistical data for.
+    # Specifies the account that owns the S3 buckets to retrieve aggregated
+    # statistical data for.
     #
     # @note When making an API call, you may pass GetBucketStatisticsRequest
     #   data as a hash:
@@ -2164,8 +2252,7 @@ module Aws::Macie2
     end
 
     # Provides the results of a query that retrieved aggregated statistical
-    # data for all the S3 buckets that Amazon Macie monitors and analyzes
-    # for an account.
+    # data for the S3 buckets that are owned by an account.
     #
     # @!attribute [rw] bucket_count
     #   @return [Integer]
@@ -2190,6 +2277,9 @@ module Aws::Macie2
     # @!attribute [rw] classifiable_object_count
     #   @return [Integer]
     #
+    # @!attribute [rw] classifiable_size_in_bytes
+    #   @return [Integer]
+    #
     # @!attribute [rw] last_updated
     #   @return [Time]
     #
@@ -2202,6 +2292,22 @@ module Aws::Macie2
     # @!attribute [rw] size_in_bytes_compressed
     #   @return [Integer]
     #
+    # @!attribute [rw] unclassifiable_object_count
+    #   Provides information about the total storage size (in bytes) or
+    #   number of objects that Amazon Macie can't analyze in one or more S3
+    #   buckets. In a BucketMetadata object, this data is for a specific
+    #   bucket. In a GetBucketStatisticsResponse object, this data is
+    #   aggregated for all the buckets in the query results.
+    #   @return [Types::ObjectLevelStatistics]
+    #
+    # @!attribute [rw] unclassifiable_object_size_in_bytes
+    #   Provides information about the total storage size (in bytes) or
+    #   number of objects that Amazon Macie can't analyze in one or more S3
+    #   buckets. In a BucketMetadata object, this data is for a specific
+    #   bucket. In a GetBucketStatisticsResponse object, this data is
+    #   aggregated for all the buckets in the query results.
+    #   @return [Types::ObjectLevelStatistics]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetBucketStatisticsResponse AWS API Documentation
     #
     class GetBucketStatisticsResponse < Struct.new(
@@ -2210,10 +2316,13 @@ module Aws::Macie2
       :bucket_count_by_encryption_type,
       :bucket_count_by_shared_access_type,
       :classifiable_object_count,
+      :classifiable_size_in_bytes,
       :last_updated,
       :object_count,
       :size_in_bytes,
-      :size_in_bytes_compressed)
+      :size_in_bytes_compressed,
+      :unclassifiable_object_count,
+      :unclassifiable_object_size_in_bytes)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -2454,7 +2563,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies one or more findings to retrieve information about.
+    # Specifies one or more findings to retrieve.
     #
     # @note When making an API call, you may pass GetFindingsRequest
     #   data as a hash:
@@ -2472,7 +2581,7 @@ module Aws::Macie2
     #
     # @!attribute [rw] sort_criteria
     #   Specifies criteria for sorting the results of a request for
-    #   information about findings.
+    #   findings.
     #   @return [Types::SortCriteria]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetFindingsRequest AWS API Documentation
@@ -2484,8 +2593,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides the results of a request for information about one or more
-    # findings.
+    # Provides the results of a request for one or more findings.
     #
     # @!attribute [rw] findings
     #   @return [Array<Types::Finding>]
@@ -3022,6 +3130,8 @@ module Aws::Macie2
 
     # Specifies one or more property- and tag-based conditions that define
     # criteria for including or excluding objects from a classification job.
+    # If you specify more than one condition, Amazon Macie uses an AND
+    # operator to join the conditions.
     #
     # @note When making an API call, you may pass JobScopingBlock
     #   data as a hash:
@@ -3073,7 +3183,7 @@ module Aws::Macie2
     #   @return [String]
     #
     # @!attribute [rw] job_status
-    #   The current status of a classification job. Possible values are:
+    #   The status of a classification job. Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] job_type
@@ -3083,6 +3193,13 @@ module Aws::Macie2
     # @!attribute [rw] name
     #   @return [String]
     #
+    # @!attribute [rw] user_paused_details
+    #   Provides information about when a classification job was paused and
+    #   when it will expire and be cancelled if it isn’t resumed. This
+    #   object is present only if a job’s current status (jobStatus) is
+    #   USER\_PAUSED.
+    #   @return [Types::UserPausedDetails]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/JobSummary AWS API Documentation
     #
     class JobSummary < Struct.new(
@@ -3091,7 +3208,8 @@ module Aws::Macie2
       :job_id,
       :job_status,
       :job_type,
-      :name)
+      :name,
+      :user_paused_details)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3315,7 +3433,7 @@ module Aws::Macie2
     #
     # @!attribute [rw] sort_criteria
     #   Specifies criteria for sorting the results of a request for
-    #   information about findings.
+    #   findings.
     #   @return [Types::SortCriteria]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/ListFindingsRequest AWS API Documentation
@@ -3556,8 +3674,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about the accounts that are designated as
-    # delegated administrators of Amazon Macie for an AWS organization.
+    # Provides information about the delegated Amazon Macie administrator
+    # accounts for an AWS organization.
     #
     # @!attribute [rw] admin_accounts
     #   @return [Array<Types::AdminAccount>]
@@ -3706,6 +3824,102 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Provides information about the total storage size (in bytes) or number
+    # of objects that Amazon Macie can't analyze in one or more S3 buckets.
+    # In a BucketMetadata object, this data is for a specific bucket. In a
+    # GetBucketStatisticsResponse object, this data is aggregated for all
+    # the buckets in the query results.
+    #
+    # @!attribute [rw] file_type
+    #   @return [Integer]
+    #
+    # @!attribute [rw] storage_class
+    #   @return [Integer]
+    #
+    # @!attribute [rw] total
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/ObjectLevelStatistics AWS API Documentation
+    #
+    class ObjectLevelStatistics < Struct.new(
+      :file_type,
+      :storage_class,
+      :total)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Provides the location of 1-15 occurrences of sensitive data that was
+    # detected by managed data identifiers or a custom data identifier and
+    # produced a sensitive data finding.
+    #
+    # @!attribute [rw] cells
+    #   Specifies the location of occurrences of sensitive data in a
+    #   Microsoft Excel workbook, CSV file, or TSV file.
+    #   @return [Array<Types::Cell>]
+    #
+    # @!attribute [rw] line_ranges
+    #   Provides details about the location of occurrences of sensitive data
+    #   in an Adobe Portable Document Format file, Apache Avro object
+    #   container, Microsoft Word document, or non-binary text file.
+    #   @return [Array<Types::Range>]
+    #
+    # @!attribute [rw] offset_ranges
+    #   Provides details about the location of occurrences of sensitive data
+    #   in an Adobe Portable Document Format file, Apache Avro object
+    #   container, Microsoft Word document, or non-binary text file.
+    #   @return [Array<Types::Range>]
+    #
+    # @!attribute [rw] pages
+    #   Specifies the location of occurrences of sensitive data in an Adobe
+    #   Portable Document Format file.
+    #   @return [Array<Types::Page>]
+    #
+    # @!attribute [rw] records
+    #   Specifies the location of occurrences of sensitive data in an Apache
+    #   Parquet file.
+    #   @return [Array<Types::Record>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/Occurrences AWS API Documentation
+    #
+    class Occurrences < Struct.new(
+      :cells,
+      :line_ranges,
+      :offset_ranges,
+      :pages,
+      :records)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Specifies the location of an occurrence of sensitive data in an Adobe
+    # Portable Document Format file.
+    #
+    # @!attribute [rw] line_range
+    #   Provides details about the location of an occurrence of sensitive
+    #   data in an Adobe Portable Document Format file, Apache Avro object
+    #   container, Microsoft Word document, or non-binary text file.
+    #   @return [Types::Range]
+    #
+    # @!attribute [rw] offset_range
+    #   Provides details about the location of an occurrence of sensitive
+    #   data in an Adobe Portable Document Format file, Apache Avro object
+    #   container, Microsoft Word document, or non-binary text file.
+    #   @return [Types::Range]
+    #
+    # @!attribute [rw] page_number
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/Page AWS API Documentation
+    #
+    class Page < Struct.new(
+      :line_range,
+      :offset_range,
+      :page_number)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Provides the details of a policy finding.
     #
     # @!attribute [rw] action
@@ -3777,6 +3991,43 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Provides details about the location of an occurrence of sensitive data
+    # in an Adobe Portable Document Format file, Apache Avro object
+    # container, Microsoft Word document, or non-binary text file.
+    #
+    # @!attribute [rw] end
+    #   @return [Integer]
+    #
+    # @!attribute [rw] start
+    #   @return [Integer]
+    #
+    # @!attribute [rw] start_column
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/Range AWS API Documentation
+    #
+    class Range < Struct.new(
+      :end,
+      :start,
+      :start_column)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Specifies the location of an occurrence of sensitive data in an Apache
+    # Parquet file.
+    #
+    # @!attribute [rw] record_index
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/Record AWS API Documentation
+    #
+    class Record < Struct.new(
+      :record_index)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Provides information about settings that define whether one or more
     # objects in an S3 bucket are replicated to S3 buckets for other AWS
     # accounts and, if so, which accounts.
@@ -3843,7 +4094,7 @@ module Aws::Macie2
     #
     # @!attribute [rw] default_server_side_encryption
     #   Provides information about the server-side encryption settings for
-    #   an S3 bucket or object.
+    #   an S3 bucket or S3 object.
     #   @return [Types::ServerSideEncryption]
     #
     # @!attribute [rw] name
@@ -3854,7 +4105,7 @@ module Aws::Macie2
     #   @return [Types::S3BucketOwner]
     #
     # @!attribute [rw] public_access
-    #   Provides information about permissions settings that determine
+    #   Provides information about the permissions settings that determine
     #   whether an S3 bucket is publicly accessible.
     #   @return [Types::BucketPublicAccess]
     #
@@ -4019,7 +4270,8 @@ module Aws::Macie2
     # @!attribute [rw] scoping
     #   Specifies one or more property- and tag-based conditions that refine
     #   the scope of a classification job. These conditions define criteria
-    #   that determine which objects a job analyzes.
+    #   that determine which objects a job analyzes. Exclude conditions take
+    #   precedence over include conditions.
     #   @return [Types::Scoping]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/S3JobDefinition AWS API Documentation
@@ -4056,14 +4308,14 @@ module Aws::Macie2
     #
     # @!attribute [rw] server_side_encryption
     #   Provides information about the server-side encryption settings for
-    #   an S3 bucket or object.
+    #   an S3 bucket or S3 object.
     #   @return [Types::ServerSideEncryption]
     #
     # @!attribute [rw] size
     #   @return [Integer]
     #
     # @!attribute [rw] storage_class
-    #   The storage class of the S3 bucket or object. Possible values are:
+    #   The storage class of the S3 object. Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -4096,7 +4348,8 @@ module Aws::Macie2
 
     # Specifies one or more property- and tag-based conditions that refine
     # the scope of a classification job. These conditions define criteria
-    # that determine which objects a job analyzes.
+    # that determine which objects a job analyzes. Exclude conditions take
+    # precedence over include conditions.
     #
     # @note When making an API call, you may pass Scoping
     #   data as a hash:
@@ -4151,13 +4404,15 @@ module Aws::Macie2
     # @!attribute [rw] excludes
     #   Specifies one or more property- and tag-based conditions that define
     #   criteria for including or excluding objects from a classification
-    #   job.
+    #   job. If you specify more than one condition, Amazon Macie uses an
+    #   AND operator to join the conditions.
     #   @return [Types::JobScopingBlock]
     #
     # @!attribute [rw] includes
     #   Specifies one or more property- and tag-based conditions that define
     #   criteria for including or excluding objects from a classification
-    #   job.
+    #   job. If you specify more than one condition, Amazon Macie uses an
+    #   AND operator to join the conditions.
     #   @return [Types::JobScopingBlock]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/Scoping AWS API Documentation
@@ -4169,8 +4424,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about the category, type, and number of
-    # occurrences of sensitive data that produced a finding.
+    # Provides information about the category, types, and occurrences of
+    # sensitive data that produced a sensitive data finding.
     #
     # @!attribute [rw] category
     #   The category of sensitive data that was detected and produced the
@@ -4198,11 +4453,11 @@ module Aws::Macie2
     end
 
     # Provides information about the server-side encryption settings for an
-    # S3 bucket or object.
+    # S3 bucket or S3 object.
     #
     # @!attribute [rw] encryption_type
-    #   The type of server-side encryption that's used to encrypt objects
-    #   in the S3 bucket. Valid values are:
+    #   The type of server-side encryption that's used to encrypt an S3
+    #   object or objects in an S3 bucket. Valid values are:
     #   @return [String]
     #
     # @!attribute [rw] kms_master_key_id
@@ -4322,11 +4577,11 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides the numeric score and textual representation of a severity
-    # value.
+    # Provides the numerical and qualitative representations of a finding's
+    # severity.
     #
     # @!attribute [rw] description
-    #   The textual representation of the finding's severity. Possible
+    #   The qualitative representation of the finding's severity. Possible
     #   values are:
     #   @return [String]
     #
@@ -4376,8 +4631,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies criteria for sorting the results of a request for
-    # information about findings.
+    # Specifies criteria for sorting the results of a request for findings.
     #
     # @note When making an API call, you may pass SortCriteria
     #   data as a hash:
@@ -4501,7 +4755,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies a tag key and value, as a pair, to use in a tag-based
+    # Specifies a tag key or tag key and value pair to use in a tag-based
     # condition for a classification job.
     #
     # @note When making an API call, you may pass TagValuePair
@@ -4647,21 +4901,21 @@ module Aws::Macie2
     #
     class UntagResourceResponse < Aws::EmptyStructure; end
 
-    # Cancels a classification job.
+    # Changes the status of a classification job.
     #
     # @note When making an API call, you may pass UpdateClassificationJobRequest
     #   data as a hash:
     #
     #       {
     #         job_id: "__string", # required
-    #         job_status: "RUNNING", # required, accepts RUNNING, PAUSED, CANCELLED, COMPLETE, IDLE
+    #         job_status: "RUNNING", # required, accepts RUNNING, PAUSED, CANCELLED, COMPLETE, IDLE, USER_PAUSED
     #       }
     #
     # @!attribute [rw] job_id
     #   @return [String]
     #
     # @!attribute [rw] job_status
-    #   The current status of a classification job. Possible values are:
+    #   The status of a classification job. Possible values are:
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/UpdateClassificationJobRequest AWS API Documentation
@@ -5067,6 +5321,29 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Provides information about when a classification job was paused and
+    # when it will expire and be cancelled if it isn’t resumed. This object
+    # is present only if a job’s current status (jobStatus) is USER\_PAUSED.
+    #
+    # @!attribute [rw] job_expires_at
+    #   @return [Time]
+    #
+    # @!attribute [rw] job_imminent_expiration_health_event_arn
+    #   @return [String]
+    #
+    # @!attribute [rw] job_paused_at
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/UserPausedDetails AWS API Documentation
+    #
+    class UserPausedDetails < Struct.new(
+      :job_expires_at,
+      :job_imminent_expiration_health_event_arn,
+      :job_paused_at)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Provides information about an error that occurred due to a syntax
     # error in a request.
     #