aws-sdk-macie2 1.17.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e23b8956f4cbe366ada629a3f9afc98724be67a7f2764c6e1de32bd096a7f05
-  data.tar.gz: e1734e0828d51bf48202f5042734b370719945666ae6cc1f79006097268e228b
+  metadata.gz: a86fdd452db57654374b53a7009d91c7b6f714c2677daa38503f2a7c8e9c39da
+  data.tar.gz: 3898f3e57324d170f322b32c20d0cd0a1bf0f42e5ea9ce03d22c02554a853e9c
 SHA512:
-  metadata.gz: 9d7b68a7aefc124c785e19ab02fc5a5eb67621eb8bcffc1e203d8929d428768c6cd67fd47ec9a900dbbb1ed0f6772d3036e1951fd5576e0424c024a2baf42727
-  data.tar.gz: 9598be78988132dc332b8d38ec83be9da0cfb730fb95e8c8031fd303404784cf4a16d4d8e68260d8f5c8cde82fa383170c7a07b95a54b307bb4e524af59390c2
+  metadata.gz: 1b5013cfb0156624d929aeaa7c0c438349c9db7cf22f5589477037daccf5551eb58887e97c1977b8d5206d6c577ad4576b782e67836dd4db2f196f1cd959f859
+  data.tar.gz: 7cda3ea6156623c2953475de1f657605a3f1324f762b95bfb6266a7d1c8c8911d326be468b56788ba54ba937d86a16fd117dca87595fdf52ed952f66ea1083ab

data/lib/aws-sdk-macie2.rb

@@ -48,6 +48,6 @@ require_relative 'aws-sdk-macie2/customizations'
 # @!group service
 module Aws::Macie2
 
-  GEM_VERSION = '1.17.0'
+  GEM_VERSION = '1.22.0'
 
 end

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

@@ -436,8 +436,8 @@ module Aws::Macie2
     #     s3_job_definition: { # required
     #       bucket_definitions: [
     #         {
-    #           account_id: "__string",
-    #           buckets: ["__string"],
+    #           account_id: "__string", # required
+    #           buckets: ["__string"], # required
     #         },
     #       ],
     #       scoping: {
@@ -445,12 +445,12 @@ module Aws::Macie2
     #           and: [
     #             {
     #               simple_scope_term: {
-    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #                 key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #                 key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #                 values: ["__string"],
     #               },
     #               tag_scope_term: {
-    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #                 key: "__string",
     #                 tag_values: [
     #                   {
@@ -467,12 +467,12 @@ module Aws::Macie2
     #           and: [
     #             {
     #               simple_scope_term: {
-    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #                 key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #                 key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #                 values: ["__string"],
     #               },
     #               tag_scope_term: {
-    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #                 key: "__string",
     #                 tag_values: [
     #                   {
@@ -872,8 +872,8 @@ module Aws::Macie2
     # or more S3 buckets that Amazon Macie monitors and analyzes.
     #
     # @option params [Hash<String,Types::BucketCriteriaAdditionalProperties>] :criteria
-    #   Specifies, as a map, one or more attribute-based conditions that
-    #   filter the results of a query for information about S3 buckets.
+    #   Specifies, as a map, one or more property-based conditions that filter
+    #   the results of a query for information about S3 buckets.
     #
     # @option params [Integer] :max_results
     #
@@ -921,6 +921,10 @@ module Aws::Macie2
     #   resp.buckets[0].bucket_name #=> String
     #   resp.buckets[0].classifiable_object_count #=> Integer
     #   resp.buckets[0].classifiable_size_in_bytes #=> Integer
+    #   resp.buckets[0].job_details.is_defined_in_job #=> String, one of "TRUE", "FALSE", "UNKNOWN"
+    #   resp.buckets[0].job_details.is_monitored_by_job #=> String, one of "TRUE", "FALSE", "UNKNOWN"
+    #   resp.buckets[0].job_details.last_job_id #=> String
+    #   resp.buckets[0].job_details.last_job_run_time #=> Time
     #   resp.buckets[0].last_updated #=> Time
     #   resp.buckets[0].object_count #=> Integer
     #   resp.buckets[0].object_count_by_encryption_type.customer_managed #=> Integer
@@ -945,6 +949,8 @@ module Aws::Macie2
     #   resp.buckets[0].replication_details.replicated_externally #=> Boolean
     #   resp.buckets[0].replication_details.replication_accounts #=> Array
     #   resp.buckets[0].replication_details.replication_accounts[0] #=> String
+    #   resp.buckets[0].server_side_encryption.kms_master_key_id #=> String
+    #   resp.buckets[0].server_side_encryption.type #=> String, one of "NONE", "AES256", "aws:kms"
     #   resp.buckets[0].shared_access #=> String, one of "EXTERNAL", "INTERNAL", "NOT_SHARED", "UNKNOWN"
     #   resp.buckets[0].size_in_bytes #=> Integer
     #   resp.buckets[0].size_in_bytes_compressed #=> Integer
@@ -1020,22 +1026,22 @@ module Aws::Macie2
     #   resp.s3_job_definition.bucket_definitions[0].buckets #=> Array
     #   resp.s3_job_definition.bucket_definitions[0].buckets[0] #=> String
     #   resp.s3_job_definition.scoping.excludes.and #=> Array
-    #   resp.s3_job_definition.scoping.excludes.and[0].simple_scope_term.comparator #=> String, one of "EQ", "GT", "GTE", "LT", "LTE", "NE", "CONTAINS"
-    #   resp.s3_job_definition.scoping.excludes.and[0].simple_scope_term.key #=> String, one of "BUCKET_CREATION_DATE", "OBJECT_EXTENSION", "OBJECT_LAST_MODIFIED_DATE", "OBJECT_SIZE", "TAG"
+    #   resp.s3_job_definition.scoping.excludes.and[0].simple_scope_term.comparator #=> String, one of "EQ", "GT", "GTE", "LT", "LTE", "NE", "CONTAINS", "STARTS_WITH"
+    #   resp.s3_job_definition.scoping.excludes.and[0].simple_scope_term.key #=> String, one of "BUCKET_CREATION_DATE", "OBJECT_EXTENSION", "OBJECT_LAST_MODIFIED_DATE", "OBJECT_SIZE", "TAG", "OBJECT_KEY"
     #   resp.s3_job_definition.scoping.excludes.and[0].simple_scope_term.values #=> Array
     #   resp.s3_job_definition.scoping.excludes.and[0].simple_scope_term.values[0] #=> String
-    #   resp.s3_job_definition.scoping.excludes.and[0].tag_scope_term.comparator #=> String, one of "EQ", "GT", "GTE", "LT", "LTE", "NE", "CONTAINS"
+    #   resp.s3_job_definition.scoping.excludes.and[0].tag_scope_term.comparator #=> String, one of "EQ", "GT", "GTE", "LT", "LTE", "NE", "CONTAINS", "STARTS_WITH"
     #   resp.s3_job_definition.scoping.excludes.and[0].tag_scope_term.key #=> String
     #   resp.s3_job_definition.scoping.excludes.and[0].tag_scope_term.tag_values #=> Array
     #   resp.s3_job_definition.scoping.excludes.and[0].tag_scope_term.tag_values[0].key #=> String
     #   resp.s3_job_definition.scoping.excludes.and[0].tag_scope_term.tag_values[0].value #=> String
     #   resp.s3_job_definition.scoping.excludes.and[0].tag_scope_term.target #=> String, one of "S3_OBJECT"
     #   resp.s3_job_definition.scoping.includes.and #=> Array
-    #   resp.s3_job_definition.scoping.includes.and[0].simple_scope_term.comparator #=> String, one of "EQ", "GT", "GTE", "LT", "LTE", "NE", "CONTAINS"
-    #   resp.s3_job_definition.scoping.includes.and[0].simple_scope_term.key #=> String, one of "BUCKET_CREATION_DATE", "OBJECT_EXTENSION", "OBJECT_LAST_MODIFIED_DATE", "OBJECT_SIZE", "TAG"
+    #   resp.s3_job_definition.scoping.includes.and[0].simple_scope_term.comparator #=> String, one of "EQ", "GT", "GTE", "LT", "LTE", "NE", "CONTAINS", "STARTS_WITH"
+    #   resp.s3_job_definition.scoping.includes.and[0].simple_scope_term.key #=> String, one of "BUCKET_CREATION_DATE", "OBJECT_EXTENSION", "OBJECT_LAST_MODIFIED_DATE", "OBJECT_SIZE", "TAG", "OBJECT_KEY"
     #   resp.s3_job_definition.scoping.includes.and[0].simple_scope_term.values #=> Array
     #   resp.s3_job_definition.scoping.includes.and[0].simple_scope_term.values[0] #=> String
-    #   resp.s3_job_definition.scoping.includes.and[0].tag_scope_term.comparator #=> String, one of "EQ", "GT", "GTE", "LT", "LTE", "NE", "CONTAINS"
+    #   resp.s3_job_definition.scoping.includes.and[0].tag_scope_term.comparator #=> String, one of "EQ", "GT", "GTE", "LT", "LTE", "NE", "CONTAINS", "STARTS_WITH"
     #   resp.s3_job_definition.scoping.includes.and[0].tag_scope_term.key #=> String
     #   resp.s3_job_definition.scoping.includes.and[0].tag_scope_term.tag_values #=> Array
     #   resp.s3_job_definition.scoping.includes.and[0].tag_scope_term.tag_values[0].key #=> String
@@ -1787,13 +1793,18 @@ module Aws::Macie2
     # @option params [String] :next_token
     #
     # @option params [Types::UsageStatisticsSortBy] :sort_by
-    #   Specifies criteria for sorting the results of a query for account
-    #   quotas and usage data.
+    #   Specifies criteria for sorting the results of a query for Amazon Macie
+    #   account quotas and usage data.
+    #
+    # @option params [String] :time_range
+    #   An inclusive time period that Amazon Macie usage data applies to.
+    #   Possible values are:
     #
     # @return [Types::GetUsageStatisticsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::GetUsageStatisticsResponse#next_token #next_token} => String
     #   * {Types::GetUsageStatisticsResponse#records #records} => Array&lt;Types::UsageRecord&gt;
+    #   * {Types::GetUsageStatisticsResponse#time_range #time_range} => String
     #
     # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
     #
@@ -1813,6 +1824,7 @@ module Aws::Macie2
     #       key: "accountId", # accepts accountId, total, serviceLimitValue, freeTrialStartDate
     #       order_by: "ASC", # accepts ASC, DESC
     #     },
+    #     time_range: "MONTH_TO_DATE", # accepts MONTH_TO_DATE, PAST_30_DAYS
     #   })
     #
     # @example Response structure
@@ -1828,6 +1840,7 @@ module Aws::Macie2
     #   resp.records[0].usage[0].service_limit.unit #=> String, one of "TERABYTES"
     #   resp.records[0].usage[0].service_limit.value #=> Integer
     #   resp.records[0].usage[0].type #=> String, one of "DATA_INVENTORY_EVALUATION", "SENSITIVE_DATA_DISCOVERY"
+    #   resp.time_range #=> String, one of "MONTH_TO_DATE", "PAST_30_DAYS"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageStatistics AWS API Documentation
     #
@@ -1840,12 +1853,22 @@ module Aws::Macie2
 
     # Retrieves (queries) aggregated usage data for an account.
     #
+    # @option params [String] :time_range
+    #
     # @return [Types::GetUsageTotalsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
+    #   * {Types::GetUsageTotalsResponse#time_range #time_range} => String
     #   * {Types::GetUsageTotalsResponse#usage_totals #usage_totals} => Array&lt;Types::UsageTotal&gt;
     #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_usage_totals({
+    #     time_range: "__string",
+    #   })
+    #
     # @example Response structure
     #
+    #   resp.time_range #=> String, one of "MONTH_TO_DATE", "PAST_30_DAYS"
     #   resp.usage_totals #=> Array
     #   resp.usage_totals[0].currency #=> String, one of "USD"
     #   resp.usage_totals[0].estimated_cost #=> String
@@ -1888,14 +1911,14 @@ module Aws::Macie2
     #     filter_criteria: {
     #       excludes: [
     #         {
-    #           comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #           comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #           key: "jobType", # accepts jobType, jobStatus, createdAt, name
     #           values: ["__string"],
     #         },
     #       ],
     #       includes: [
     #         {
-    #           comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #           comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #           key: "jobType", # accepts jobType, jobStatus, createdAt, name
     #           values: ["__string"],
     #         },
@@ -2540,7 +2563,7 @@ module Aws::Macie2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-macie2'
-      context[:gem_version] = '1.17.0'
+      context[:gem_version] = '1.22.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -39,6 +39,7 @@ module Aws::Macie2
     BucketPermissionConfiguration = Shapes::StructureShape.new(name: 'BucketPermissionConfiguration')
     BucketPolicy = Shapes::StructureShape.new(name: 'BucketPolicy')
     BucketPublicAccess = Shapes::StructureShape.new(name: 'BucketPublicAccess')
+    BucketServerSideEncryption = Shapes::StructureShape.new(name: 'BucketServerSideEncryption')
     BucketSortCriteria = Shapes::StructureShape.new(name: 'BucketSortCriteria')
     Cell = Shapes::StructureShape.new(name: 'Cell')
     Cells = Shapes::ListShape.new(name: 'Cells')
@@ -150,7 +151,10 @@ module Aws::Macie2
     IpCountry = Shapes::StructureShape.new(name: 'IpCountry')
     IpGeoLocation = Shapes::StructureShape.new(name: 'IpGeoLocation')
     IpOwner = Shapes::StructureShape.new(name: 'IpOwner')
+    IsDefinedInJob = Shapes::StringShape.new(name: 'IsDefinedInJob')
+    IsMonitoredByJob = Shapes::StringShape.new(name: 'IsMonitoredByJob')
     JobComparator = Shapes::StringShape.new(name: 'JobComparator')
+    JobDetails = Shapes::StructureShape.new(name: 'JobDetails')
     JobScheduleFrequency = Shapes::StructureShape.new(name: 'JobScheduleFrequency')
     JobScopeTerm = Shapes::StructureShape.new(name: 'JobScopeTerm')
     JobScopingBlock = Shapes::StructureShape.new(name: 'JobScopingBlock')
@@ -236,6 +240,8 @@ module Aws::Macie2
     TestCustomDataIdentifierRequest = Shapes::StructureShape.new(name: 'TestCustomDataIdentifierRequest')
     TestCustomDataIdentifierResponse = Shapes::StructureShape.new(name: 'TestCustomDataIdentifierResponse')
     ThrottlingException = Shapes::StructureShape.new(name: 'ThrottlingException')
+    TimeRange = Shapes::StringShape.new(name: 'TimeRange')
+    Type = Shapes::StringShape.new(name: 'Type')
     Unit = Shapes::StringShape.new(name: 'Unit')
     UnprocessedAccount = Shapes::StructureShape.new(name: 'UnprocessedAccount')
     UntagResourceRequest = Shapes::StructureShape.new(name: 'UntagResourceRequest')
@@ -400,12 +406,14 @@ module Aws::Macie2
     BucketMetadata.add_member(:bucket_name, Shapes::ShapeRef.new(shape: __string, location_name: "bucketName"))
     BucketMetadata.add_member(:classifiable_object_count, Shapes::ShapeRef.new(shape: __long, location_name: "classifiableObjectCount"))
     BucketMetadata.add_member(:classifiable_size_in_bytes, Shapes::ShapeRef.new(shape: __long, location_name: "classifiableSizeInBytes"))
+    BucketMetadata.add_member(:job_details, Shapes::ShapeRef.new(shape: JobDetails, location_name: "jobDetails"))
     BucketMetadata.add_member(:last_updated, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "lastUpdated"))
     BucketMetadata.add_member(:object_count, Shapes::ShapeRef.new(shape: __long, location_name: "objectCount"))
     BucketMetadata.add_member(:object_count_by_encryption_type, Shapes::ShapeRef.new(shape: ObjectCountByEncryptionType, location_name: "objectCountByEncryptionType"))
     BucketMetadata.add_member(:public_access, Shapes::ShapeRef.new(shape: BucketPublicAccess, location_name: "publicAccess"))
     BucketMetadata.add_member(:region, Shapes::ShapeRef.new(shape: __string, location_name: "region"))
     BucketMetadata.add_member(:replication_details, Shapes::ShapeRef.new(shape: ReplicationDetails, location_name: "replicationDetails"))
+    BucketMetadata.add_member(:server_side_encryption, Shapes::ShapeRef.new(shape: BucketServerSideEncryption, location_name: "serverSideEncryption"))
     BucketMetadata.add_member(:shared_access, Shapes::ShapeRef.new(shape: SharedAccess, location_name: "sharedAccess"))
     BucketMetadata.add_member(:size_in_bytes, Shapes::ShapeRef.new(shape: __long, location_name: "sizeInBytes"))
     BucketMetadata.add_member(:size_in_bytes_compressed, Shapes::ShapeRef.new(shape: __long, location_name: "sizeInBytesCompressed"))
@@ -427,6 +435,10 @@ module Aws::Macie2
     BucketPublicAccess.add_member(:permission_configuration, Shapes::ShapeRef.new(shape: BucketPermissionConfiguration, location_name: "permissionConfiguration"))
     BucketPublicAccess.struct_class = Types::BucketPublicAccess
 
+    BucketServerSideEncryption.add_member(:kms_master_key_id, Shapes::ShapeRef.new(shape: __string, location_name: "kmsMasterKeyId"))
+    BucketServerSideEncryption.add_member(:type, Shapes::ShapeRef.new(shape: Type, location_name: "type"))
+    BucketServerSideEncryption.struct_class = Types::BucketServerSideEncryption
+
     BucketSortCriteria.add_member(:attribute_name, Shapes::ShapeRef.new(shape: __string, location_name: "attributeName"))
     BucketSortCriteria.add_member(:order_by, Shapes::ShapeRef.new(shape: OrderBy, location_name: "orderBy"))
     BucketSortCriteria.struct_class = Types::BucketSortCriteria
@@ -820,14 +832,18 @@ module Aws::Macie2
     GetUsageStatisticsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: __integer, location_name: "maxResults"))
     GetUsageStatisticsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "nextToken"))
     GetUsageStatisticsRequest.add_member(:sort_by, Shapes::ShapeRef.new(shape: UsageStatisticsSortBy, location_name: "sortBy"))
+    GetUsageStatisticsRequest.add_member(:time_range, Shapes::ShapeRef.new(shape: TimeRange, location_name: "timeRange"))
     GetUsageStatisticsRequest.struct_class = Types::GetUsageStatisticsRequest
 
     GetUsageStatisticsResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "nextToken"))
     GetUsageStatisticsResponse.add_member(:records, Shapes::ShapeRef.new(shape: __listOfUsageRecord, location_name: "records"))
+    GetUsageStatisticsResponse.add_member(:time_range, Shapes::ShapeRef.new(shape: TimeRange, location_name: "timeRange"))
     GetUsageStatisticsResponse.struct_class = Types::GetUsageStatisticsResponse
 
+    GetUsageTotalsRequest.add_member(:time_range, Shapes::ShapeRef.new(shape: __string, location: "querystring", location_name: "timeRange"))
     GetUsageTotalsRequest.struct_class = Types::GetUsageTotalsRequest
 
+    GetUsageTotalsResponse.add_member(:time_range, Shapes::ShapeRef.new(shape: TimeRange, location_name: "timeRange"))
     GetUsageTotalsResponse.add_member(:usage_totals, Shapes::ShapeRef.new(shape: __listOfUsageTotal, location_name: "usageTotals"))
     GetUsageTotalsResponse.struct_class = Types::GetUsageTotalsResponse
 
@@ -874,6 +890,12 @@ module Aws::Macie2
     IpOwner.add_member(:org, Shapes::ShapeRef.new(shape: __string, location_name: "org"))
     IpOwner.struct_class = Types::IpOwner
 
+    JobDetails.add_member(:is_defined_in_job, Shapes::ShapeRef.new(shape: IsDefinedInJob, location_name: "isDefinedInJob"))
+    JobDetails.add_member(:is_monitored_by_job, Shapes::ShapeRef.new(shape: IsMonitoredByJob, location_name: "isMonitoredByJob"))
+    JobDetails.add_member(:last_job_id, Shapes::ShapeRef.new(shape: __string, location_name: "lastJobId"))
+    JobDetails.add_member(:last_job_run_time, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "lastJobRunTime"))
+    JobDetails.struct_class = Types::JobDetails
+
     JobScheduleFrequency.add_member(:daily_schedule, Shapes::ShapeRef.new(shape: DailySchedule, location_name: "dailySchedule"))
     JobScheduleFrequency.add_member(:monthly_schedule, Shapes::ShapeRef.new(shape: MonthlySchedule, location_name: "monthlySchedule"))
     JobScheduleFrequency.add_member(:weekly_schedule, Shapes::ShapeRef.new(shape: WeeklySchedule, location_name: "weeklySchedule"))
@@ -1067,8 +1089,8 @@ module Aws::Macie2
     S3Bucket.add_member(:tags, Shapes::ShapeRef.new(shape: KeyValuePairList, location_name: "tags"))
     S3Bucket.struct_class = Types::S3Bucket
 
-    S3BucketDefinitionForJob.add_member(:account_id, Shapes::ShapeRef.new(shape: __string, location_name: "accountId"))
-    S3BucketDefinitionForJob.add_member(:buckets, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "buckets"))
+    S3BucketDefinitionForJob.add_member(:account_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "accountId"))
+    S3BucketDefinitionForJob.add_member(:buckets, Shapes::ShapeRef.new(shape: __listOf__string, required: true, location_name: "buckets"))
     S3BucketDefinitionForJob.struct_class = Types::S3BucketDefinitionForJob
 
     S3BucketOwner.add_member(:display_name, Shapes::ShapeRef.new(shape: __string, location_name: "displayName"))

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

@@ -97,19 +97,19 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about account-level permissions settings that
+    # Provides information about the account-level permissions settings that
     # apply to an S3 bucket.
     #
     # @!attribute [rw] block_public_access
     #   Provides information about the block public access settings for an
     #   S3 bucket. These settings can apply to a bucket at the account level
     #   or bucket level. For detailed information about each setting, see
-    #   [Using Amazon S3 block public access][1] in the *Amazon Simple
-    #   Storage Service Developer Guide*.
+    #   [Blocking public access to your Amazon S3 storage][1] in the *Amazon
+    #   Simple Storage Service User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-control-block-public-access.html
     #   @return [Types::BlockPublicAccess]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/AccountLevelPermissions AWS API Documentation
@@ -306,13 +306,13 @@ module Aws::Macie2
 
     # Provides information about the block public access settings for an S3
     # bucket. These settings can apply to a bucket at the account level or
-    # bucket level. For detailed information about each setting, see [Using
-    # Amazon S3 block public access][1] in the *Amazon Simple Storage
-    # Service Developer Guide*.
+    # bucket level. For detailed information about each setting, see
+    # [Blocking public access to your Amazon S3 storage][1] in the *Amazon
+    # Simple Storage Service User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-control-block-public-access.html
     #
     # @!attribute [rw] block_public_acls
     #   @return [Boolean]
@@ -365,7 +365,8 @@ module Aws::Macie2
     end
 
     # Provides information about the number of S3 buckets that use certain
-    # types of server-side encryption or don't encrypt objects by default.
+    # types of server-side encryption by default or don't encrypt new
+    # objects by default.
     #
     # @!attribute [rw] kms_managed
     #   @return [Integer]
@@ -412,7 +413,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies the operator to use in an attribute-based condition that
+    # Specifies the operator to use in a property-based condition that
     # filters the results of a query for information about S3 buckets.
     #
     # @note When making an API call, you may pass BucketCriteriaAdditionalProperties
@@ -475,12 +476,12 @@ module Aws::Macie2
     #   Provides information about the block public access settings for an
     #   S3 bucket. These settings can apply to a bucket at the account level
     #   or bucket level. For detailed information about each setting, see
-    #   [Using Amazon S3 block public access][1] in the *Amazon Simple
-    #   Storage Service Developer Guide*.
+    #   [Blocking public access to your Amazon S3 storage][1] in the *Amazon
+    #   Simple Storage Service User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-control-block-public-access.html
     #   @return [Types::BlockPublicAccess]
     #
     # @!attribute [rw] bucket_policy
@@ -519,6 +520,12 @@ module Aws::Macie2
     # @!attribute [rw] classifiable_size_in_bytes
     #   @return [Integer]
     #
+    # @!attribute [rw] job_details
+    #   Specifies whether any one-time or recurring classification jobs are
+    #   configured to analyze data in an S3 bucket, and, if so, the details
+    #   of the job that ran most recently.
+    #   @return [Types::JobDetails]
+    #
     # @!attribute [rw] last_updated
     #   @return [Time]
     #
@@ -545,6 +552,18 @@ module Aws::Macie2
     #   accounts and, if so, which accounts.
     #   @return [Types::ReplicationDetails]
     #
+    # @!attribute [rw] server_side_encryption
+    #   Provides information about the default server-side encryption
+    #   settings for an S3 bucket. For detailed information about these
+    #   settings, see [Setting default server-side encryption behavior for
+    #   Amazon S3 buckets][1] in the *Amazon Simple Storage Service User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-encryption.html
+    #   @return [Types::BucketServerSideEncryption]
+    #
     # @!attribute [rw] shared_access
     #   @return [String]
     #
@@ -585,12 +604,14 @@ module Aws::Macie2
       :bucket_name,
       :classifiable_object_count,
       :classifiable_size_in_bytes,
+      :job_details,
       :last_updated,
       :object_count,
       :object_count_by_encryption_type,
       :public_access,
       :region,
       :replication_details,
+      :server_side_encryption,
       :shared_access,
       :size_in_bytes,
       :size_in_bytes_compressed,
@@ -606,8 +627,8 @@ module Aws::Macie2
     # permissions settings for an S3 bucket.
     #
     # @!attribute [rw] account_level_permissions
-    #   Provides information about account-level permissions settings that
-    #   apply to an S3 bucket.
+    #   Provides information about the account-level permissions settings
+    #   that apply to an S3 bucket.
     #   @return [Types::AccountLevelPermissions]
     #
     # @!attribute [rw] bucket_level_permissions
@@ -662,6 +683,30 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Provides information about the default server-side encryption settings
+    # for an S3 bucket. For detailed information about these settings, see
+    # [Setting default server-side encryption behavior for Amazon S3
+    # buckets][1] in the *Amazon Simple Storage Service User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-encryption.html
+    #
+    # @!attribute [rw] kms_master_key_id
+    #   @return [String]
+    #
+    # @!attribute [rw] type
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/BucketServerSideEncryption AWS API Documentation
+    #
+    class BucketServerSideEncryption < Struct.new(
+      :kms_master_key_id,
+      :type)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Specifies criteria for sorting the results of a query for information
     # about S3 buckets.
     #
@@ -862,8 +907,8 @@ module Aws::Macie2
     #         s3_job_definition: { # required
     #           bucket_definitions: [
     #             {
-    #               account_id: "__string",
-    #               buckets: ["__string"],
+    #               account_id: "__string", # required
+    #               buckets: ["__string"], # required
     #             },
     #           ],
     #           scoping: {
@@ -871,12 +916,12 @@ module Aws::Macie2
     #               and: [
     #                 {
     #                   simple_scope_term: {
-    #                     comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #                     key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #                     comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #                     key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #                     values: ["__string"],
     #                   },
     #                   tag_scope_term: {
-    #                     comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #                     comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #                     key: "__string",
     #                     tag_values: [
     #                       {
@@ -893,12 +938,12 @@ module Aws::Macie2
     #               and: [
     #                 {
     #                   simple_scope_term: {
-    #                     comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #                     key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #                     comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #                     key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #                     values: ["__string"],
     #                   },
     #                   tag_scope_term: {
-    #                     comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #                     comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #                     key: "__string",
     #                     tag_values: [
     #                       {
@@ -1294,7 +1339,13 @@ module Aws::Macie2
     class CreateSampleFindingsResponse < Aws::EmptyStructure; end
 
     # Specifies the operator to use in a property-based condition that
-    # filters the results of a query for findings.
+    # filters the results of a query for findings. For detailed information
+    # and examples of each operator, see [Fundamentals of filtering
+    # findings][1] in the *Amazon Macie User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/macie/latest/user/findings-filter-basics.html
     #
     # @note When making an API call, you may pass CriterionAdditionalProperties
     #   data as a hash:
@@ -1623,7 +1674,7 @@ module Aws::Macie2
     #       }
     #
     # @!attribute [rw] criteria
-    #   Specifies, as a map, one or more attribute-based conditions that
+    #   Specifies, as a map, one or more property-based conditions that
     #   filter the results of a query for information about S3 buckets.
     #   @return [Hash<String,Types::BucketCriteriaAdditionalProperties>]
     #
@@ -1757,10 +1808,14 @@ module Aws::Macie2
     #   @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.
+    #   Provides information about when a classification job was paused. For
+    #   a one-time job, this object also specifies when the job will expire
+    #   and be cancelled if it isn't resumed. For a recurring job, this
+    #   object also specifies when the paused job run 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. The information
+    #   in this object applies only to a job that was paused while it had a
+    #   status of RUNNING.
     #   @return [Types::UserPausedDetails]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/DescribeClassificationJobResponse AWS API Documentation
@@ -2172,8 +2227,16 @@ module Aws::Macie2
     #       }
     #
     # @!attribute [rw] criterion
-    #   Specifies a condition that defines a property, operator, and value
-    #   to use to filter the results of a query for findings.
+    #   Specifies a condition that defines a property, operator, and one or
+    #   more values to filter the results of a query for findings. The
+    #   number of values depends on the property and operator specified by
+    #   the condition. For information about defining filter conditions, see
+    #   [Fundamentals of filtering findings][1] in the *Amazon Macie User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/macie/latest/user/findings-filter-basics.html
     #   @return [Hash<String,Types::CriterionAdditionalProperties>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/FindingCriteria AWS API Documentation
@@ -2281,8 +2344,8 @@ module Aws::Macie2
     #
     # @!attribute [rw] bucket_count_by_encryption_type
     #   Provides information about the number of S3 buckets that use certain
-    #   types of server-side encryption or don't encrypt objects by
-    #   default.
+    #   types of server-side encryption by default or don't encrypt new
+    #   objects by default.
     #   @return [Types::BucketCountByEncryptionType]
     #
     # @!attribute [rw] bucket_count_by_shared_access_type
@@ -2776,8 +2839,8 @@ module Aws::Macie2
     end
 
     # Specifies criteria for filtering, sorting, and paginating the results
-    # of a query for quotas and aggregated usage data for one or more
-    # accounts.
+    # of a query for quotas and aggregated usage data for one or more Amazon
+    # Macie accounts.
     #
     # @note When making an API call, you may pass GetUsageStatisticsRequest
     #   data as a hash:
@@ -2796,6 +2859,7 @@ module Aws::Macie2
     #           key: "accountId", # accepts accountId, total, serviceLimitValue, freeTrialStartDate
     #           order_by: "ASC", # accepts ASC, DESC
     #         },
+    #         time_range: "MONTH_TO_DATE", # accepts MONTH_TO_DATE, PAST_30_DAYS
     #       }
     #
     # @!attribute [rw] filter_by
@@ -2808,23 +2872,29 @@ module Aws::Macie2
     #   @return [String]
     #
     # @!attribute [rw] sort_by
-    #   Specifies criteria for sorting the results of a query for account
-    #   quotas and usage data.
+    #   Specifies criteria for sorting the results of a query for Amazon
+    #   Macie account quotas and usage data.
     #   @return [Types::UsageStatisticsSortBy]
     #
+    # @!attribute [rw] time_range
+    #   An inclusive time period that Amazon Macie usage data applies to.
+    #   Possible values are:
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageStatisticsRequest AWS API Documentation
     #
     class GetUsageStatisticsRequest < Struct.new(
       :filter_by,
       :max_results,
       :next_token,
-      :sort_by)
+      :sort_by,
+      :time_range)
       SENSITIVE = []
       include Aws::Structure
     end
 
     # Provides the results of a query that retrieved quotas and aggregated
-    # usage data for one or more accounts.
+    # usage data for one or more Amazon Macie accounts.
     #
     # @!attribute [rw] next_token
     #   @return [String]
@@ -2832,23 +2902,46 @@ module Aws::Macie2
     # @!attribute [rw] records
     #   @return [Array<Types::UsageRecord>]
     #
+    # @!attribute [rw] time_range
+    #   An inclusive time period that Amazon Macie usage data applies to.
+    #   Possible values are:
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageStatisticsResponse AWS API Documentation
     #
     class GetUsageStatisticsResponse < Struct.new(
       :next_token,
-      :records)
+      :records,
+      :time_range)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @api private
+    # @note When making an API call, you may pass GetUsageTotalsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         time_range: "__string",
+    #       }
+    #
+    # @!attribute [rw] time_range
+    #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageTotalsRequest AWS API Documentation
     #
-    class GetUsageTotalsRequest < Aws::EmptyStructure; end
+    class GetUsageTotalsRequest < Struct.new(
+      :time_range)
+      SENSITIVE = []
+      include Aws::Structure
+    end
 
     # Provides the results of a query that retrieved aggregated usage data
-    # for an account during the past 30 days.
+    # for an Amazon Macie account.
+    #
+    # @!attribute [rw] time_range
+    #   An inclusive time period that Amazon Macie usage data applies to.
+    #   Possible values are:
+    #   @return [String]
     #
     # @!attribute [rw] usage_totals
     #   @return [Array<Types::UsageTotal>]
@@ -2856,6 +2949,7 @@ module Aws::Macie2
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageTotalsResponse AWS API Documentation
     #
     class GetUsageTotalsResponse < Struct.new(
+      :time_range,
       :usage_totals)
       SENSITIVE = []
       include Aws::Structure
@@ -3060,6 +3154,33 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Specifies whether any one-time or recurring classification jobs are
+    # configured to analyze data in an S3 bucket, and, if so, the details of
+    # the job that ran most recently.
+    #
+    # @!attribute [rw] is_defined_in_job
+    #   @return [String]
+    #
+    # @!attribute [rw] is_monitored_by_job
+    #   @return [String]
+    #
+    # @!attribute [rw] last_job_id
+    #   @return [String]
+    #
+    # @!attribute [rw] last_job_run_time
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/JobDetails AWS API Documentation
+    #
+    class JobDetails < Struct.new(
+      :is_defined_in_job,
+      :is_monitored_by_job,
+      :last_job_id,
+      :last_job_run_time)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Specifies the recurrence pattern for running a classification job.
     #
     # @note When making an API call, you may pass JobScheduleFrequency
@@ -3109,12 +3230,12 @@ module Aws::Macie2
     #
     #       {
     #         simple_scope_term: {
-    #           comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #           key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #           comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #           key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #           values: ["__string"],
     #         },
     #         tag_scope_term: {
-    #           comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #           comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #           key: "__string",
     #           tag_values: [
     #             {
@@ -3157,12 +3278,12 @@ module Aws::Macie2
     #         and: [
     #           {
     #             simple_scope_term: {
-    #               comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #               key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #               comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #               key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #               values: ["__string"],
     #             },
     #             tag_scope_term: {
-    #               comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #               comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #               key: "__string",
     #               tag_values: [
     #                 {
@@ -3219,10 +3340,14 @@ module Aws::Macie2
     #   @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.
+    #   Provides information about when a classification job was paused. For
+    #   a one-time job, this object also specifies when the job will expire
+    #   and be cancelled if it isn't resumed. For a recurring job, this
+    #   object also specifies when the paused job run 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. The information
+    #   in this object applies only to a job that was paused while it had a
+    #   status of RUNNING.
     #   @return [Types::UserPausedDetails]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/JobSummary AWS API Documentation
@@ -3289,14 +3414,14 @@ module Aws::Macie2
     #         filter_criteria: {
     #           excludes: [
     #             {
-    #               comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #               comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #               key: "jobType", # accepts jobType, jobStatus, createdAt, name
     #               values: ["__string"],
     #             },
     #           ],
     #           includes: [
     #             {
-    #               comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #               comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #               key: "jobType", # accepts jobType, jobStatus, createdAt, name
     #               values: ["__string"],
     #             },
@@ -3562,14 +3687,14 @@ module Aws::Macie2
     #       {
     #         excludes: [
     #           {
-    #             comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #             comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #             key: "jobType", # accepts jobType, jobStatus, createdAt, name
     #             values: ["__string"],
     #           },
     #         ],
     #         includes: [
     #           {
-    #             comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #             comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #             key: "jobType", # accepts jobType, jobStatus, createdAt, name
     #             values: ["__string"],
     #           },
@@ -3599,7 +3724,7 @@ module Aws::Macie2
     #   data as a hash:
     #
     #       {
-    #         comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #         comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #         key: "jobType", # accepts jobType, jobStatus, createdAt, name
     #         values: ["__string"],
     #       }
@@ -4180,15 +4305,15 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies which S3 buckets contain the objects that a classification
-    # job analyzes.
+    # Specifies which AWS account owns the S3 buckets that a classification
+    # job analyzes, and the buckets to analyze for the account.
     #
     # @note When making an API call, you may pass S3BucketDefinitionForJob
     #   data as a hash:
     #
     #       {
-    #         account_id: "__string",
-    #         buckets: ["__string"],
+    #         account_id: "__string", # required
+    #         buckets: ["__string"], # required
     #       }
     #
     # @!attribute [rw] account_id
@@ -4263,8 +4388,8 @@ module Aws::Macie2
     #       {
     #         bucket_definitions: [
     #           {
-    #             account_id: "__string",
-    #             buckets: ["__string"],
+    #             account_id: "__string", # required
+    #             buckets: ["__string"], # required
     #           },
     #         ],
     #         scoping: {
@@ -4272,12 +4397,12 @@ module Aws::Macie2
     #             and: [
     #               {
     #                 simple_scope_term: {
-    #                   comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #                   key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #                   comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #                   key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #                   values: ["__string"],
     #                 },
     #                 tag_scope_term: {
-    #                   comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #                   comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #                   key: "__string",
     #                   tag_values: [
     #                     {
@@ -4294,12 +4419,12 @@ module Aws::Macie2
     #             and: [
     #               {
     #                 simple_scope_term: {
-    #                   comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #                   key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #                   comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #                   key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #                   values: ["__string"],
     #                 },
     #                 tag_scope_term: {
-    #                   comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #                   comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #                   key: "__string",
     #                   tag_values: [
     #                     {
@@ -4410,12 +4535,12 @@ module Aws::Macie2
     #           and: [
     #             {
     #               simple_scope_term: {
-    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #                 key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #                 key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #                 values: ["__string"],
     #               },
     #               tag_scope_term: {
-    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #                 key: "__string",
     #                 tag_values: [
     #                   {
@@ -4432,12 +4557,12 @@ module Aws::Macie2
     #           and: [
     #             {
     #               simple_scope_term: {
-    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #                 key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #                 key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #                 values: ["__string"],
     #               },
     #               tag_scope_term: {
-    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #                 comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #                 key: "__string",
     #                 tag_values: [
     #                   {
@@ -4523,7 +4648,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies a current quota for an account.
+    # Specifies a current quota for an Amazon Macie account.
     #
     # @!attribute [rw] is_service_limited
     #   @return [Boolean]
@@ -4655,8 +4780,8 @@ module Aws::Macie2
     #   data as a hash:
     #
     #       {
-    #         comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
-    #         key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG
+    #         comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
+    #         key: "BUCKET_CREATION_DATE", # accepts BUCKET_CREATION_DATE, OBJECT_EXTENSION, OBJECT_LAST_MODIFIED_DATE, OBJECT_SIZE, TAG, OBJECT_KEY
     #         values: ["__string"],
     #       }
     #
@@ -4769,7 +4894,7 @@ module Aws::Macie2
     #   data as a hash:
     #
     #       {
-    #         comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS
+    #         comparator: "EQ", # accepts EQ, GT, GTE, LT, LTE, NE, CONTAINS, STARTS_WITH
     #         key: "__string",
     #         tag_values: [
     #           {
@@ -4952,7 +5077,13 @@ module Aws::Macie2
     #
     class UntagResourceResponse < Aws::EmptyStructure; end
 
-    # Changes the status of a classification job.
+    # Changes the status of a classification job. For more information about
+    # pausing, resuming, or cancelling jobs, see [Managing and monitoring
+    # sensitive data discovery jobs][1] in the *Amazon Macie User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/macie/latest/user/discovery-jobs-manage.html
     #
     # @note When making an API call, you may pass UpdateClassificationJobRequest
     #   data as a hash:
@@ -5153,23 +5284,23 @@ module Aws::Macie2
     class UpdateOrganizationConfigurationResponse < Aws::EmptyStructure; end
 
     # Provides data for a specific usage metric and the corresponding quota
-    # for an account. The value for the metric is an aggregated value that
-    # reports usage during the past 30 days.
+    # for an Amazon Macie account.
     #
     # @!attribute [rw] currency
-    #   The type of currency that data for a usage metric is reported in.
-    #   Possible values are:
+    #   The type of currency that the data for an Amazon Macie usage metric
+    #   is reported in. Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] estimated_cost
     #   @return [String]
     #
     # @!attribute [rw] service_limit
-    #   Specifies a current quota for an account.
+    #   Specifies a current quota for an Amazon Macie account.
     #   @return [Types::ServiceLimit]
     #
     # @!attribute [rw] type
-    #   The name of a usage metric for an account. Possible values are:
+    #   The name of an Amazon Macie usage metric for an account. Possible
+    #   values are:
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/UsageByAccount AWS API Documentation
@@ -5183,7 +5314,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides quota and aggregated usage data for an account.
+    # Provides quota and aggregated usage data for an Amazon Macie account.
     #
     # @!attribute [rw] account_id
     #   @return [String]
@@ -5204,8 +5335,9 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies a condition for filtering the results of a query for account
-    # quotas and usage data.
+    # Specifies a condition for filtering the results of a query for the
+    # quotas and usage data that applies to one or more Amazon Macie
+    # accounts.
     #
     # @note When making an API call, you may pass UsageStatisticsFilter
     #   data as a hash:
@@ -5218,12 +5350,13 @@ module Aws::Macie2
     #
     # @!attribute [rw] comparator
     #   The operator to use in a condition that filters the results of a
-    #   query for account quotas and usage data. Valid values are:
+    #   query for Amazon Macie account quotas and usage data. Valid values
+    #   are:
     #   @return [String]
     #
     # @!attribute [rw] key
     #   The field to use in a condition that filters the results of a query
-    #   for account quotas and usage data. Valid values are:
+    #   for Amazon Macie account quotas and usage data. Valid values are:
     #   @return [String]
     #
     # @!attribute [rw] values
@@ -5239,8 +5372,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies criteria for sorting the results of a query for account
-    # quotas and usage data.
+    # Specifies criteria for sorting the results of a query for Amazon Macie
+    # account quotas and usage data.
     #
     # @note When making an API call, you may pass UsageStatisticsSortBy
     #   data as a hash:
@@ -5251,8 +5384,8 @@ module Aws::Macie2
     #       }
     #
     # @!attribute [rw] key
-    #   The field to use to sort the results of a query for account quotas
-    #   and usage data. Valid values are:
+    #   The field to use to sort the results of a query for Amazon Macie
+    #   account quotas and usage data. Valid values are:
     #   @return [String]
     #
     # @!attribute [rw] order_by
@@ -5267,19 +5400,22 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides aggregated data for a usage metric. The value for the metric
-    # reports usage data for an account during the past 30 days.
+    # Provides aggregated data for an Amazon Macie usage metric. The value
+    # for the metric reports estimated usage data for an account for the
+    # preceding 30 days or the current calendar month to date, depending on
+    # the time period (timeRange) specified in the request.
     #
     # @!attribute [rw] currency
-    #   The type of currency that data for a usage metric is reported in.
-    #   Possible values are:
+    #   The type of currency that the data for an Amazon Macie usage metric
+    #   is reported in. Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] estimated_cost
     #   @return [String]
     #
     # @!attribute [rw] type
-    #   The name of a usage metric for an account. Possible values are:
+    #   The name of an Amazon Macie usage metric for an account. Possible
+    #   values are:
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/UsageTotal AWS API Documentation
@@ -5373,10 +5509,14 @@ 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.
+    # Provides information about when a classification job was paused. For a
+    # one-time job, this object also specifies when the job will expire and
+    # be cancelled if it isn't resumed. For a recurring job, this object
+    # also specifies when the paused job run 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. The information in this object
+    # applies only to a job that was paused while it had a status of
+    # RUNNING.
     #
     # @!attribute [rw] job_expires_at
     #   @return [Time]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-macie2
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2021-02-08 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.109.0
+        version: 3.112.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.109.0
+        version: 3.112.0
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement