aws-sdk-macie2 1.20.0 → 1.25.0

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -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')
@@ -90,6 +91,8 @@ module Aws::Macie2
     DisableMacieResponse = Shapes::StructureShape.new(name: 'DisableMacieResponse')
     DisableOrganizationAdminAccountRequest = Shapes::StructureShape.new(name: 'DisableOrganizationAdminAccountRequest')
     DisableOrganizationAdminAccountResponse = Shapes::StructureShape.new(name: 'DisableOrganizationAdminAccountResponse')
+    DisassociateFromAdministratorAccountRequest = Shapes::StructureShape.new(name: 'DisassociateFromAdministratorAccountRequest')
+    DisassociateFromAdministratorAccountResponse = Shapes::StructureShape.new(name: 'DisassociateFromAdministratorAccountResponse')
     DisassociateFromMasterAccountRequest = Shapes::StructureShape.new(name: 'DisassociateFromMasterAccountRequest')
     DisassociateFromMasterAccountResponse = Shapes::StructureShape.new(name: 'DisassociateFromMasterAccountResponse')
     DisassociateMemberRequest = Shapes::StructureShape.new(name: 'DisassociateMemberRequest')
@@ -116,6 +119,8 @@ module Aws::Macie2
     FindingType = Shapes::StringShape.new(name: 'FindingType')
     FindingsFilterAction = Shapes::StringShape.new(name: 'FindingsFilterAction')
     FindingsFilterListItem = Shapes::StructureShape.new(name: 'FindingsFilterListItem')
+    GetAdministratorAccountRequest = Shapes::StructureShape.new(name: 'GetAdministratorAccountRequest')
+    GetAdministratorAccountResponse = Shapes::StructureShape.new(name: 'GetAdministratorAccountResponse')
     GetBucketStatisticsRequest = Shapes::StructureShape.new(name: 'GetBucketStatisticsRequest')
     GetBucketStatisticsResponse = Shapes::StructureShape.new(name: 'GetBucketStatisticsResponse')
     GetClassificationExportConfigurationRequest = Shapes::StructureShape.new(name: 'GetClassificationExportConfigurationRequest')
@@ -239,6 +244,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')
@@ -298,8 +305,9 @@ module Aws::Macie2
     __timestampIso8601 = Shapes::TimestampShape.new(name: '__timestampIso8601', timestampFormat: "iso8601")
     __timestampUnix = Shapes::TimestampShape.new(name: '__timestampUnix', timestampFormat: "unixTimestamp")
 
+    AcceptInvitationRequest.add_member(:administrator_account_id, Shapes::ShapeRef.new(shape: __string, location_name: "administratorAccountId"))
     AcceptInvitationRequest.add_member(:invitation_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "invitationId"))
-    AcceptInvitationRequest.add_member(:master_account, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "masterAccount"))
+    AcceptInvitationRequest.add_member(:master_account, Shapes::ShapeRef.new(shape: __string, location_name: "masterAccount"))
     AcceptInvitationRequest.struct_class = Types::AcceptInvitationRequest
 
     AcceptInvitationResponse.struct_class = Types::AcceptInvitationResponse
@@ -410,6 +418,7 @@ module Aws::Macie2
     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"))
@@ -431,6 +440,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
@@ -644,6 +657,10 @@ module Aws::Macie2
 
     DisableOrganizationAdminAccountResponse.struct_class = Types::DisableOrganizationAdminAccountResponse
 
+    DisassociateFromAdministratorAccountRequest.struct_class = Types::DisassociateFromAdministratorAccountRequest
+
+    DisassociateFromAdministratorAccountResponse.struct_class = Types::DisassociateFromAdministratorAccountResponse
+
     DisassociateFromMasterAccountRequest.struct_class = Types::DisassociateFromMasterAccountRequest
 
     DisassociateFromMasterAccountResponse.struct_class = Types::DisassociateFromMasterAccountResponse
@@ -721,6 +738,11 @@ module Aws::Macie2
     FindingsFilterListItem.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
     FindingsFilterListItem.struct_class = Types::FindingsFilterListItem
 
+    GetAdministratorAccountRequest.struct_class = Types::GetAdministratorAccountRequest
+
+    GetAdministratorAccountResponse.add_member(:administrator, Shapes::ShapeRef.new(shape: Invitation, location_name: "administrator"))
+    GetAdministratorAccountResponse.struct_class = Types::GetAdministratorAccountResponse
+
     GetBucketStatisticsRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: __string, location_name: "accountId"))
     GetBucketStatisticsRequest.struct_class = Types::GetBucketStatisticsRequest
 
@@ -811,6 +833,7 @@ module Aws::Macie2
     GetMemberRequest.struct_class = Types::GetMemberRequest
 
     GetMemberResponse.add_member(:account_id, Shapes::ShapeRef.new(shape: __string, location_name: "accountId"))
+    GetMemberResponse.add_member(:administrator_account_id, Shapes::ShapeRef.new(shape: __string, location_name: "administratorAccountId"))
     GetMemberResponse.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     GetMemberResponse.add_member(:email, Shapes::ShapeRef.new(shape: __string, location_name: "email"))
     GetMemberResponse.add_member(:invited_at, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "invitedAt"))
@@ -824,14 +847,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
 
@@ -996,6 +1023,7 @@ module Aws::Macie2
     ListTagsForResourceResponse.struct_class = Types::ListTagsForResourceResponse
 
     Member.add_member(:account_id, Shapes::ShapeRef.new(shape: __string, location_name: "accountId"))
+    Member.add_member(:administrator_account_id, Shapes::ShapeRef.new(shape: __string, location_name: "administratorAccountId"))
     Member.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     Member.add_member(:email, Shapes::ShapeRef.new(shape: __string, location_name: "email"))
     Member.add_member(:invited_at, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "invitedAt"))
@@ -1629,6 +1657,21 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
       end)
 
+      api.add_operation(:disassociate_from_administrator_account, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DisassociateFromAdministratorAccount"
+        o.http_method = "POST"
+        o.http_request_uri = "/administrator/disassociate"
+        o.input = Shapes::ShapeRef.new(shape: DisassociateFromAdministratorAccountRequest)
+        o.output = Shapes::ShapeRef.new(shape: DisassociateFromAdministratorAccountResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: ServiceQuotaExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
+        o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+      end)
+
       api.add_operation(:disassociate_from_master_account, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DisassociateFromMasterAccount"
         o.http_method = "POST"
@@ -1689,6 +1732,21 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
       end)
 
+      api.add_operation(:get_administrator_account, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetAdministratorAccount"
+        o.http_method = "GET"
+        o.http_request_uri = "/administrator"
+        o.input = Shapes::ShapeRef.new(shape: GetAdministratorAccountRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetAdministratorAccountResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: ServiceQuotaExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
+        o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+      end)
+
       api.add_operation(:get_bucket_statistics, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketStatistics"
         o.http_method = "POST"

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,23 +3,32 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
 module Aws::Macie2
   module Types
 
-    # Specifies an Amazon Macie membership invitation to accept.
+    # Specifies an Amazon Macie membership invitation to accept. In the
+    # request, you have to specify the ID for the AWS account that sent the
+    # invitation. Otherwise, a validation error occurs. To specify this ID,
+    # we recommend that you use the administratorAccountId property instead
+    # of the masterAccount property. The masterAccount property has been
+    # deprecated and is retained only for backward compatibility.
     #
     # @note When making an API call, you may pass AcceptInvitationRequest
     #   data as a hash:
     #
     #       {
+    #         administrator_account_id: "__string",
     #         invitation_id: "__string", # required
-    #         master_account: "__string", # required
+    #         master_account: "__string",
     #       }
     #
+    # @!attribute [rw] administrator_account_id
+    #   @return [String]
+    #
     # @!attribute [rw] invitation_id
     #   @return [String]
     #
@@ -29,6 +38,7 @@ module Aws::Macie2
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/AcceptInvitationRequest AWS API Documentation
     #
     class AcceptInvitationRequest < Struct.new(
+      :administrator_account_id,
       :invitation_id,
       :master_account)
       SENSITIVE = []
@@ -72,7 +82,7 @@ module Aws::Macie2
     end
 
     # Specifies details for an account to associate with an Amazon Macie
-    # master account.
+    # administrator account.
     #
     # @note When making an API call, you may pass AccountDetail
     #   data as a hash:
@@ -97,7 +107,7 @@ 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
@@ -128,7 +138,7 @@ module Aws::Macie2
     #
     # @!attribute [rw] status
     #   The current status of an account as the delegated Amazon Macie
-    #   administrator account for an AWS organization.
+    #   administrator account for an AWS organization. Possible values are:
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/AdminAccount AWS API Documentation
@@ -365,7 +375,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]
@@ -551,6 +562,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]
     #
@@ -568,7 +591,9 @@ module Aws::Macie2
     #   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.
+    #   aggregated for all the buckets in the query results. If versioning
+    #   is enabled for a bucket, total storage size values are based on the
+    #   size of the latest version of each applicable object in the bucket.
     #   @return [Types::ObjectLevelStatistics]
     #
     # @!attribute [rw] unclassifiable_object_size_in_bytes
@@ -576,7 +601,9 @@ module Aws::Macie2
     #   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.
+    #   aggregated for all the buckets in the query results. If versioning
+    #   is enabled for a bucket, total storage size values are based on the
+    #   size of the latest version of each applicable object in the bucket.
     #   @return [Types::ObjectLevelStatistics]
     #
     # @!attribute [rw] versioning
@@ -598,6 +625,7 @@ module Aws::Macie2
       :public_access,
       :region,
       :replication_details,
+      :server_side_encryption,
       :shared_access,
       :size_in_bytes,
       :size_in_bytes_compressed,
@@ -613,8 +641,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
@@ -669,6 +697,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.
     #
@@ -1226,7 +1278,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies an account to associate with an Amazon Macie master account.
+    # Specifies an AWS account to associate with an Amazon Macie
+    # administrator account.
     #
     # @note When making an API call, you may pass CreateMemberRequest
     #   data as a hash:
@@ -1243,7 +1296,7 @@ module Aws::Macie2
     #
     # @!attribute [rw] account
     #   Specifies details for an account to associate with an Amazon Macie
-    #   master account.
+    #   administrator account.
     #   @return [Types::AccountDetail]
     #
     # @!attribute [rw] tags
@@ -1262,7 +1315,7 @@ module Aws::Macie2
     end
 
     # Provides information about a request to associate an account with an
-    # Amazon Macie master account.
+    # Amazon Macie administrator account.
     #
     # @!attribute [rw] arn
     #   @return [String]
@@ -1610,7 +1663,8 @@ module Aws::Macie2
     class DeleteMemberResponse < Aws::EmptyStructure; end
 
     # Specifies criteria for filtering, sorting, and paginating the results
-    # of a query for information about S3 buckets.
+    # of a query for statistical data and other information about S3
+    # buckets.
     #
     # @note When making an API call, you may pass DescribeBucketsRequest
     #   data as a hash:
@@ -1861,6 +1915,16 @@ module Aws::Macie2
     #
     class DisableOrganizationAdminAccountResponse < Aws::EmptyStructure; end
 
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/DisassociateFromAdministratorAccountRequest AWS API Documentation
+    #
+    class DisassociateFromAdministratorAccountRequest < Aws::EmptyStructure; end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/DisassociateFromAdministratorAccountResponse AWS API Documentation
+    #
+    class DisassociateFromAdministratorAccountResponse < Aws::EmptyStructure; end
+
     # @api private
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/DisassociateFromMasterAccountRequest AWS API Documentation
@@ -1914,8 +1978,8 @@ module Aws::Macie2
     #
     class Empty < Aws::EmptyStructure; end
 
-    # Enables Amazon Macie and specifies the configuration settings for an
-    # Amazon Macie account.
+    # Enables Amazon Macie and specifies the configuration settings for a
+    # Macie account.
     #
     # @note When making an API call, you may pass EnableMacieRequest
     #   data as a hash:
@@ -2271,6 +2335,30 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetAdministratorAccountRequest AWS API Documentation
+    #
+    class GetAdministratorAccountRequest < Aws::EmptyStructure; end
+
+    # Provides information about the Amazon Macie administrator account for
+    # an account. If the accounts are associated by a Macie membership
+    # invitation, the response also provides information about that
+    # invitation.
+    #
+    # @!attribute [rw] administrator
+    #   Provides information about an Amazon Macie membership invitation
+    #   that was received by an account.
+    #   @return [Types::Invitation]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetAdministratorAccountResponse AWS API Documentation
+    #
+    class GetAdministratorAccountResponse < Struct.new(
+      :administrator)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Specifies the account that owns the S3 buckets to retrieve aggregated
     # statistical data for.
     #
@@ -2293,7 +2381,8 @@ module Aws::Macie2
     end
 
     # Provides the results of a query that retrieved aggregated statistical
-    # data for the S3 buckets that are owned by an account.
+    # data for all the S3 buckets that Amazon Macie monitors and analyzes
+    # for an account.
     #
     # @!attribute [rw] bucket_count
     #   @return [Integer]
@@ -2306,8 +2395,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
@@ -2338,7 +2427,9 @@ module Aws::Macie2
     #   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.
+    #   aggregated for all the buckets in the query results. If versioning
+    #   is enabled for a bucket, total storage size values are based on the
+    #   size of the latest version of each applicable object in the bucket.
     #   @return [Types::ObjectLevelStatistics]
     #
     # @!attribute [rw] unclassifiable_object_size_in_bytes
@@ -2346,7 +2437,9 @@ module Aws::Macie2
     #   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.
+    #   aggregated for all the buckets in the query results. If versioning
+    #   is enabled for a bucket, total storage size values are based on the
+    #   size of the latest version of each applicable object in the bucket.
     #   @return [Types::ObjectLevelStatistics]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetBucketStatisticsResponse AWS API Documentation
@@ -2716,10 +2809,10 @@ module Aws::Macie2
     #
     class GetMasterAccountRequest < Aws::EmptyStructure; end
 
-    # Provides information about the Amazon Macie master account for an
-    # account. If the accounts are associated by a Macie membership
-    # invitation, the response also provides information about that
-    # invitation.
+    # (Deprecated) Provides information about the Amazon Macie administrator
+    # account for an account. If the accounts are associated by a Macie
+    # membership invitation, the response also provides information about
+    # that invitation.
     #
     # @!attribute [rw] master
     #   Provides information about an Amazon Macie membership invitation
@@ -2753,11 +2846,14 @@ module Aws::Macie2
     end
 
     # Provides information about an account that's associated with an
-    # Amazon Macie master account.
+    # Amazon Macie administrator account.
     #
     # @!attribute [rw] account_id
     #   @return [String]
     #
+    # @!attribute [rw] administrator_account_id
+    #   @return [String]
+    #
     # @!attribute [rw] arn
     #   @return [String]
     #
@@ -2772,8 +2868,8 @@ module Aws::Macie2
     #
     # @!attribute [rw] relationship_status
     #   The current status of the relationship between an account and an
-    #   associated Amazon Macie master account (*inviter account*). Possible
-    #   values are:
+    #   associated Amazon Macie administrator account (*inviter account*).
+    #   Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -2789,6 +2885,7 @@ module Aws::Macie2
     #
     class GetMemberResponse < Struct.new(
       :account_id,
+      :administrator_account_id,
       :arn,
       :email,
       :invited_at,
@@ -2801,8 +2898,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:
@@ -2821,6 +2918,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
@@ -2833,23 +2931,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]
@@ -2857,23 +2961,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>]
@@ -2881,6 +3008,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
@@ -2958,8 +3086,8 @@ module Aws::Macie2
     #
     # @!attribute [rw] relationship_status
     #   The current status of the relationship between an account and an
-    #   associated Amazon Macie master account (*inviter account*). Possible
-    #   values are:
+    #   associated Amazon Macie administrator account (*inviter account*).
+    #   Possible values are:
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/Invitation AWS API Documentation
@@ -3591,7 +3719,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about all the Amazon Macie membership invitations
+    # Provides information about the Amazon Macie membership invitations
     # that were received by an account.
     #
     # @!attribute [rw] invitations
@@ -3737,7 +3865,7 @@ module Aws::Macie2
     end
 
     # Provides information about the accounts that are associated with an
-    # Amazon Macie master account.
+    # Amazon Macie administrator account.
     #
     # @!attribute [rw] members
     #   @return [Array<Types::Member>]
@@ -3832,11 +3960,14 @@ module Aws::Macie2
     end
 
     # Provides information about an account that's associated with an
-    # Amazon Macie master account.
+    # Amazon Macie administrator account.
     #
     # @!attribute [rw] account_id
     #   @return [String]
     #
+    # @!attribute [rw] administrator_account_id
+    #   @return [String]
+    #
     # @!attribute [rw] arn
     #   @return [String]
     #
@@ -3851,8 +3982,8 @@ module Aws::Macie2
     #
     # @!attribute [rw] relationship_status
     #   The current status of the relationship between an account and an
-    #   associated Amazon Macie master account (*inviter account*). Possible
-    #   values are:
+    #   associated Amazon Macie administrator account (*inviter account*).
+    #   Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -3868,6 +3999,7 @@ module Aws::Macie2
     #
     class Member < Struct.new(
       :account_id,
+      :administrator_account_id,
       :arn,
       :email,
       :invited_at,
@@ -3931,7 +4063,9 @@ module Aws::Macie2
     # 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.
+    # the buckets in the query results. If versioning is enabled for a
+    # bucket, total storage size values are based on the size of the latest
+    # version of each applicable object in the bucket.
     #
     # @!attribute [rw] file_type
     #   @return [Integer]
@@ -4579,7 +4713,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]
@@ -4962,7 +5096,7 @@ module Aws::Macie2
     #   @return [String]
     #
     # @!attribute [rw] error_code
-    #   The source of an error, issue, or delay. Possible values are:
+    #   The source of an issue or delay. Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] error_message
@@ -5189,7 +5323,7 @@ module Aws::Macie2
     #
     class UpdateMemberSessionResponse < Aws::EmptyStructure; end
 
-    # Specifies whether Amazon Macie is enabled automatically for accounts
+    # Specifies whether to enable Amazon Macie automatically for accounts
     # that are added to an AWS organization.
     #
     # @note When making an API call, you may pass UpdateOrganizationConfigurationRequest
@@ -5215,23 +5349,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
@@ -5245,7 +5379,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]
@@ -5266,8 +5400,8 @@ 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 quota
+    # and usage data for one or more Amazon Macie accounts.
     #
     # @note When making an API call, you may pass UsageStatisticsFilter
     #   data as a hash:
@@ -5280,12 +5414,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
@@ -5301,8 +5436,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:
@@ -5313,8 +5448,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
@@ -5329,19 +5464,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