aws-sdk-macie2 1.22.0 → 1.27.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
 
@@ -21,6 +21,7 @@ module Aws::Macie2
     AccountLevelPermissions = Shapes::StructureShape.new(name: 'AccountLevelPermissions')
     AdminAccount = Shapes::StructureShape.new(name: 'AdminAccount')
     AdminStatus = Shapes::StringShape.new(name: 'AdminStatus')
+    AllowsUnencryptedObjectUploads = Shapes::StringShape.new(name: 'AllowsUnencryptedObjectUploads')
     ApiCallDetails = Shapes::StructureShape.new(name: 'ApiCallDetails')
     AssumedRole = Shapes::StructureShape.new(name: 'AssumedRole')
     AwsAccount = Shapes::StructureShape.new(name: 'AwsAccount')
@@ -32,6 +33,7 @@ module Aws::Macie2
     BucketCountByEffectivePermission = Shapes::StructureShape.new(name: 'BucketCountByEffectivePermission')
     BucketCountByEncryptionType = Shapes::StructureShape.new(name: 'BucketCountByEncryptionType')
     BucketCountBySharedAccessType = Shapes::StructureShape.new(name: 'BucketCountBySharedAccessType')
+    BucketCountPolicyAllowsUnencryptedObjectUploads = Shapes::StructureShape.new(name: 'BucketCountPolicyAllowsUnencryptedObjectUploads')
     BucketCriteria = Shapes::MapShape.new(name: 'BucketCriteria')
     BucketCriteriaAdditionalProperties = Shapes::StructureShape.new(name: 'BucketCriteriaAdditionalProperties')
     BucketLevelPermissions = Shapes::StructureShape.new(name: 'BucketLevelPermissions')
@@ -91,6 +93,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')
@@ -117,6 +121,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')
@@ -127,6 +133,8 @@ module Aws::Macie2
     GetFindingStatisticsResponse = Shapes::StructureShape.new(name: 'GetFindingStatisticsResponse')
     GetFindingsFilterRequest = Shapes::StructureShape.new(name: 'GetFindingsFilterRequest')
     GetFindingsFilterResponse = Shapes::StructureShape.new(name: 'GetFindingsFilterResponse')
+    GetFindingsPublicationConfigurationRequest = Shapes::StructureShape.new(name: 'GetFindingsPublicationConfigurationRequest')
+    GetFindingsPublicationConfigurationResponse = Shapes::StructureShape.new(name: 'GetFindingsPublicationConfigurationResponse')
     GetFindingsRequest = Shapes::StructureShape.new(name: 'GetFindingsRequest')
     GetFindingsResponse = Shapes::StructureShape.new(name: 'GetFindingsResponse')
     GetInvitationsCountRequest = Shapes::StructureShape.new(name: 'GetInvitationsCountRequest')
@@ -199,6 +207,8 @@ module Aws::Macie2
     PolicyDetails = Shapes::StructureShape.new(name: 'PolicyDetails')
     PutClassificationExportConfigurationRequest = Shapes::StructureShape.new(name: 'PutClassificationExportConfigurationRequest')
     PutClassificationExportConfigurationResponse = Shapes::StructureShape.new(name: 'PutClassificationExportConfigurationResponse')
+    PutFindingsPublicationConfigurationRequest = Shapes::StructureShape.new(name: 'PutFindingsPublicationConfigurationRequest')
+    PutFindingsPublicationConfigurationResponse = Shapes::StructureShape.new(name: 'PutFindingsPublicationConfigurationResponse')
     Range = Shapes::StructureShape.new(name: 'Range')
     Ranges = Shapes::ListShape.new(name: 'Ranges')
     Record = Shapes::StructureShape.new(name: 'Record')
@@ -215,6 +225,7 @@ module Aws::Macie2
     S3Object = Shapes::StructureShape.new(name: 'S3Object')
     ScopeFilterKey = Shapes::StringShape.new(name: 'ScopeFilterKey')
     Scoping = Shapes::StructureShape.new(name: 'Scoping')
+    SecurityHubConfiguration = Shapes::StructureShape.new(name: 'SecurityHubConfiguration')
     SensitiveData = Shapes::ListShape.new(name: 'SensitiveData')
     SensitiveDataItem = Shapes::StructureShape.new(name: 'SensitiveDataItem')
     SensitiveDataItemCategory = Shapes::StringShape.new(name: 'SensitiveDataItemCategory')
@@ -301,8 +312,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
@@ -375,6 +387,7 @@ module Aws::Macie2
     BucketCountByEncryptionType.add_member(:kms_managed, Shapes::ShapeRef.new(shape: __long, location_name: "kmsManaged"))
     BucketCountByEncryptionType.add_member(:s3_managed, Shapes::ShapeRef.new(shape: __long, location_name: "s3Managed"))
     BucketCountByEncryptionType.add_member(:unencrypted, Shapes::ShapeRef.new(shape: __long, location_name: "unencrypted"))
+    BucketCountByEncryptionType.add_member(:unknown, Shapes::ShapeRef.new(shape: __long, location_name: "unknown"))
     BucketCountByEncryptionType.struct_class = Types::BucketCountByEncryptionType
 
     BucketCountBySharedAccessType.add_member(:external, Shapes::ShapeRef.new(shape: __long, location_name: "external"))
@@ -383,6 +396,11 @@ module Aws::Macie2
     BucketCountBySharedAccessType.add_member(:unknown, Shapes::ShapeRef.new(shape: __long, location_name: "unknown"))
     BucketCountBySharedAccessType.struct_class = Types::BucketCountBySharedAccessType
 
+    BucketCountPolicyAllowsUnencryptedObjectUploads.add_member(:allows_unencrypted_object_uploads, Shapes::ShapeRef.new(shape: __long, location_name: "allowsUnencryptedObjectUploads"))
+    BucketCountPolicyAllowsUnencryptedObjectUploads.add_member(:denies_unencrypted_object_uploads, Shapes::ShapeRef.new(shape: __long, location_name: "deniesUnencryptedObjectUploads"))
+    BucketCountPolicyAllowsUnencryptedObjectUploads.add_member(:unknown, Shapes::ShapeRef.new(shape: __long, location_name: "unknown"))
+    BucketCountPolicyAllowsUnencryptedObjectUploads.struct_class = Types::BucketCountPolicyAllowsUnencryptedObjectUploads
+
     BucketCriteria.key = Shapes::ShapeRef.new(shape: __string)
     BucketCriteria.value = Shapes::ShapeRef.new(shape: BucketCriteriaAdditionalProperties)
 
@@ -401,6 +419,7 @@ module Aws::Macie2
     BucketLevelPermissions.struct_class = Types::BucketLevelPermissions
 
     BucketMetadata.add_member(:account_id, Shapes::ShapeRef.new(shape: __string, location_name: "accountId"))
+    BucketMetadata.add_member(:allows_unencrypted_object_uploads, Shapes::ShapeRef.new(shape: AllowsUnencryptedObjectUploads, location_name: "allowsUnencryptedObjectUploads"))
     BucketMetadata.add_member(:bucket_arn, Shapes::ShapeRef.new(shape: __string, location_name: "bucketArn"))
     BucketMetadata.add_member(:bucket_created_at, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "bucketCreatedAt"))
     BucketMetadata.add_member(:bucket_name, Shapes::ShapeRef.new(shape: __string, location_name: "bucketName"))
@@ -652,6 +671,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
@@ -729,12 +752,18 @@ 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
 
     GetBucketStatisticsResponse.add_member(:bucket_count, Shapes::ShapeRef.new(shape: __long, location_name: "bucketCount"))
     GetBucketStatisticsResponse.add_member(:bucket_count_by_effective_permission, Shapes::ShapeRef.new(shape: BucketCountByEffectivePermission, location_name: "bucketCountByEffectivePermission"))
     GetBucketStatisticsResponse.add_member(:bucket_count_by_encryption_type, Shapes::ShapeRef.new(shape: BucketCountByEncryptionType, location_name: "bucketCountByEncryptionType"))
+    GetBucketStatisticsResponse.add_member(:bucket_count_by_object_encryption_requirement, Shapes::ShapeRef.new(shape: BucketCountPolicyAllowsUnencryptedObjectUploads, location_name: "bucketCountByObjectEncryptionRequirement"))
     GetBucketStatisticsResponse.add_member(:bucket_count_by_shared_access_type, Shapes::ShapeRef.new(shape: BucketCountBySharedAccessType, location_name: "bucketCountBySharedAccessType"))
     GetBucketStatisticsResponse.add_member(:classifiable_object_count, Shapes::ShapeRef.new(shape: __long, location_name: "classifiableObjectCount"))
     GetBucketStatisticsResponse.add_member(:classifiable_size_in_bytes, Shapes::ShapeRef.new(shape: __long, location_name: "classifiableSizeInBytes"))
@@ -789,6 +818,11 @@ module Aws::Macie2
     GetFindingsFilterResponse.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
     GetFindingsFilterResponse.struct_class = Types::GetFindingsFilterResponse
 
+    GetFindingsPublicationConfigurationRequest.struct_class = Types::GetFindingsPublicationConfigurationRequest
+
+    GetFindingsPublicationConfigurationResponse.add_member(:security_hub_configuration, Shapes::ShapeRef.new(shape: SecurityHubConfiguration, location_name: "securityHubConfiguration"))
+    GetFindingsPublicationConfigurationResponse.struct_class = Types::GetFindingsPublicationConfigurationResponse
+
     GetFindingsRequest.add_member(:finding_ids, Shapes::ShapeRef.new(shape: __listOf__string, required: true, location_name: "findingIds"))
     GetFindingsRequest.add_member(:sort_criteria, Shapes::ShapeRef.new(shape: SortCriteria, location_name: "sortCriteria"))
     GetFindingsRequest.struct_class = Types::GetFindingsRequest
@@ -819,6 +853,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"))
@@ -1008,6 +1043,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"))
@@ -1024,6 +1060,7 @@ module Aws::Macie2
     ObjectCountByEncryptionType.add_member(:kms_managed, Shapes::ShapeRef.new(shape: __long, location_name: "kmsManaged"))
     ObjectCountByEncryptionType.add_member(:s3_managed, Shapes::ShapeRef.new(shape: __long, location_name: "s3Managed"))
     ObjectCountByEncryptionType.add_member(:unencrypted, Shapes::ShapeRef.new(shape: __long, location_name: "unencrypted"))
+    ObjectCountByEncryptionType.add_member(:unknown, Shapes::ShapeRef.new(shape: __long, location_name: "unknown"))
     ObjectCountByEncryptionType.struct_class = Types::ObjectCountByEncryptionType
 
     ObjectLevelStatistics.add_member(:file_type, Shapes::ShapeRef.new(shape: __long, location_name: "fileType"))
@@ -1055,6 +1092,12 @@ module Aws::Macie2
     PutClassificationExportConfigurationResponse.add_member(:configuration, Shapes::ShapeRef.new(shape: ClassificationExportConfiguration, location_name: "configuration"))
     PutClassificationExportConfigurationResponse.struct_class = Types::PutClassificationExportConfigurationResponse
 
+    PutFindingsPublicationConfigurationRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: __string, location_name: "clientToken", metadata: {"idempotencyToken"=>true}))
+    PutFindingsPublicationConfigurationRequest.add_member(:security_hub_configuration, Shapes::ShapeRef.new(shape: SecurityHubConfiguration, location_name: "securityHubConfiguration"))
+    PutFindingsPublicationConfigurationRequest.struct_class = Types::PutFindingsPublicationConfigurationRequest
+
+    PutFindingsPublicationConfigurationResponse.struct_class = Types::PutFindingsPublicationConfigurationResponse
+
     Range.add_member(:end, Shapes::ShapeRef.new(shape: __long, location_name: "end"))
     Range.add_member(:start, Shapes::ShapeRef.new(shape: __long, location_name: "start"))
     Range.add_member(:start_column, Shapes::ShapeRef.new(shape: __long, location_name: "startColumn"))
@@ -1080,6 +1123,7 @@ module Aws::Macie2
     ResourcesAffected.add_member(:s3_object, Shapes::ShapeRef.new(shape: S3Object, location_name: "s3Object"))
     ResourcesAffected.struct_class = Types::ResourcesAffected
 
+    S3Bucket.add_member(:allows_unencrypted_object_uploads, Shapes::ShapeRef.new(shape: AllowsUnencryptedObjectUploads, location_name: "allowsUnencryptedObjectUploads"))
     S3Bucket.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     S3Bucket.add_member(:created_at, Shapes::ShapeRef.new(shape: __timestampIso8601, location_name: "createdAt"))
     S3Bucket.add_member(:default_server_side_encryption, Shapes::ShapeRef.new(shape: ServerSideEncryption, location_name: "defaultServerSideEncryption"))
@@ -1124,6 +1168,10 @@ module Aws::Macie2
     Scoping.add_member(:includes, Shapes::ShapeRef.new(shape: JobScopingBlock, location_name: "includes"))
     Scoping.struct_class = Types::Scoping
 
+    SecurityHubConfiguration.add_member(:publish_classification_findings, Shapes::ShapeRef.new(shape: __boolean, required: true, location_name: "publishClassificationFindings"))
+    SecurityHubConfiguration.add_member(:publish_policy_findings, Shapes::ShapeRef.new(shape: __boolean, required: true, location_name: "publishPolicyFindings"))
+    SecurityHubConfiguration.struct_class = Types::SecurityHubConfiguration
+
     SensitiveData.member = Shapes::ShapeRef.new(shape: SensitiveDataItem)
 
     SensitiveDataItem.add_member(:category, Shapes::ShapeRef.new(shape: SensitiveDataItemCategory, location_name: "category"))
@@ -1641,6 +1689,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"
@@ -1701,6 +1764,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"
@@ -1791,6 +1869,21 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
       end)
 
+      api.add_operation(:get_findings_publication_configuration, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetFindingsPublicationConfiguration"
+        o.http_method = "GET"
+        o.http_request_uri = "/findings-publication-configuration"
+        o.input = Shapes::ShapeRef.new(shape: GetFindingsPublicationConfigurationRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetFindingsPublicationConfigurationResponse)
+        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_invitations_count, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetInvitationsCount"
         o.http_method = "GET"
@@ -2057,6 +2150,21 @@ module Aws::Macie2
         o.errors << Shapes::ShapeRef.new(shape: ConflictException)
       end)
 
+      api.add_operation(:put_findings_publication_configuration, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "PutFindingsPublicationConfiguration"
+        o.http_method = "PUT"
+        o.http_request_uri = "/findings-publication-configuration"
+        o.input = Shapes::ShapeRef.new(shape: PutFindingsPublicationConfigurationRequest)
+        o.output = Shapes::ShapeRef.new(shape: PutFindingsPublicationConfigurationResponse)
+        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(:tag_resource, Seahorse::Model::Operation.new.tap do |o|
         o.name = "TagResource"
         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:
@@ -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
@@ -366,7 +376,13 @@ module Aws::Macie2
 
     # Provides information about the number of S3 buckets that use certain
     # types of server-side encryption by default or don't encrypt new
-    # objects by default.
+    # objects by default. 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_managed
     #   @return [Integer]
@@ -377,18 +393,22 @@ module Aws::Macie2
     # @!attribute [rw] unencrypted
     #   @return [Integer]
     #
+    # @!attribute [rw] unknown
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/BucketCountByEncryptionType AWS API Documentation
     #
     class BucketCountByEncryptionType < Struct.new(
       :kms_managed,
       :s3_managed,
-      :unencrypted)
+      :unencrypted,
+      :unknown)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # Provides information about the number of S3 buckets that are shared
-    # with other AWS accounts.
+    # Provides information about the number of S3 buckets that are and
+    # aren't shared with other AWS accounts.
     #
     # @!attribute [rw] external
     #   @return [Integer]
@@ -413,6 +433,29 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Provides information about the number of S3 buckets whose bucket
+    # policies do and don't require server-side encryption of objects when
+    # objects are uploaded to the buckets.
+    #
+    # @!attribute [rw] allows_unencrypted_object_uploads
+    #   @return [Integer]
+    #
+    # @!attribute [rw] denies_unencrypted_object_uploads
+    #   @return [Integer]
+    #
+    # @!attribute [rw] unknown
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/BucketCountPolicyAllowsUnencryptedObjectUploads AWS API Documentation
+    #
+    class BucketCountPolicyAllowsUnencryptedObjectUploads < Struct.new(
+      :allows_unencrypted_object_uploads,
+      :denies_unencrypted_object_uploads,
+      :unknown)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Specifies the operator to use in a property-based condition that
     # filters the results of a query for information about S3 buckets.
     #
@@ -485,7 +528,7 @@ module Aws::Macie2
     #   @return [Types::BlockPublicAccess]
     #
     # @!attribute [rw] bucket_policy
-    #   Provides information about the permissions settings of a bucket
+    #   Provides information about the permissions settings of the bucket
     #   policy for an S3 bucket.
     #   @return [Types::BucketPolicy]
     #
@@ -505,6 +548,9 @@ module Aws::Macie2
     # @!attribute [rw] account_id
     #   @return [String]
     #
+    # @!attribute [rw] allows_unencrypted_object_uploads
+    #   @return [String]
+    #
     # @!attribute [rw] bucket_arn
     #   @return [String]
     #
@@ -581,7 +627,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
@@ -589,7 +637,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
@@ -599,6 +649,7 @@ module Aws::Macie2
     #
     class BucketMetadata < Struct.new(
       :account_id,
+      :allows_unencrypted_object_uploads,
       :bucket_arn,
       :bucket_created_at,
       :bucket_name,
@@ -645,8 +696,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about the permissions settings of a bucket policy
-    # for an S3 bucket.
+    # Provides information about the permissions settings of the bucket
+    # policy for an S3 bucket.
     #
     # @!attribute [rw] allows_public_read_access
     #   @return [Boolean]
@@ -1264,7 +1315,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:
@@ -1281,7 +1333,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
@@ -1300,7 +1352,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]
@@ -1648,7 +1700,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:
@@ -1899,6 +1952,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
@@ -1952,8 +2015,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:
@@ -1973,7 +2036,13 @@ module Aws::Macie2
     #   The frequency with which Amazon Macie publishes updates to policy
     #   findings for an account. This includes publishing updates to AWS
     #   Security Hub and Amazon EventBridge (formerly called Amazon
-    #   CloudWatch Events). Valid values are:
+    #   CloudWatch Events). For more information, see [Monitoring and
+    #   processing findings][1] in the *Amazon Macie User Guide*. Valid
+    #   values are:
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/macie/latest/user/findings-monitor.html
     #   @return [String]
     #
     # @!attribute [rw] status
@@ -2309,6 +2378,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.
     #
@@ -2331,7 +2424,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]
@@ -2345,12 +2439,24 @@ 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 by default or don't encrypt new
-    #   objects by default.
+    #   objects by default. 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::BucketCountByEncryptionType]
     #
+    # @!attribute [rw] bucket_count_by_object_encryption_requirement
+    #   Provides information about the number of S3 buckets whose bucket
+    #   policies do and don't require server-side encryption of objects
+    #   when objects are uploaded to the buckets.
+    #   @return [Types::BucketCountPolicyAllowsUnencryptedObjectUploads]
+    #
     # @!attribute [rw] bucket_count_by_shared_access_type
-    #   Provides information about the number of S3 buckets that are shared
-    #   with other AWS accounts.
+    #   Provides information about the number of S3 buckets that are and
+    #   aren't shared with other AWS accounts.
     #   @return [Types::BucketCountBySharedAccessType]
     #
     # @!attribute [rw] classifiable_object_count
@@ -2376,7 +2482,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
@@ -2384,7 +2492,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
@@ -2393,6 +2503,7 @@ module Aws::Macie2
       :bucket_count,
       :bucket_count_by_effective_permission,
       :bucket_count_by_encryption_type,
+      :bucket_count_by_object_encryption_requirement,
       :bucket_count_by_shared_access_type,
       :classifiable_object_count,
       :classifiable_size_in_bytes,
@@ -2643,6 +2754,34 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetFindingsPublicationConfigurationRequest AWS API Documentation
+    #
+    class GetFindingsPublicationConfigurationRequest < Aws::EmptyStructure; end
+
+    # Provides information about the current configuration settings for
+    # publishing findings to AWS Security Hub automatically.
+    #
+    # @!attribute [rw] security_hub_configuration
+    #   Specifies configuration settings that determine which findings are
+    #   published to AWS Security Hub automatically. For information about
+    #   how Macie publishes findings to Security Hub, see [Amazon Macie
+    #   integration with Security Hub][1] in the *Amazon Macie User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/macie/latest/user/securityhub-integration.html
+    #   @return [Types::SecurityHubConfiguration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetFindingsPublicationConfigurationResponse AWS API Documentation
+    #
+    class GetFindingsPublicationConfigurationResponse < Struct.new(
+      :security_hub_configuration)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Specifies one or more findings to retrieve.
     #
     # @note When making an API call, you may pass GetFindingsRequest
@@ -2723,7 +2862,13 @@ module Aws::Macie2
     #   The frequency with which Amazon Macie publishes updates to policy
     #   findings for an account. This includes publishing updates to AWS
     #   Security Hub and Amazon EventBridge (formerly called Amazon
-    #   CloudWatch Events). Valid values are:
+    #   CloudWatch Events). For more information, see [Monitoring and
+    #   processing findings][1] in the *Amazon Macie User Guide*. Valid
+    #   values are:
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/macie/latest/user/findings-monitor.html
     #   @return [String]
     #
     # @!attribute [rw] service_role
@@ -2754,10 +2899,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
@@ -2791,11 +2936,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]
     #
@@ -2810,8 +2958,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
@@ -2827,6 +2975,7 @@ module Aws::Macie2
     #
     class GetMemberResponse < Struct.new(
       :account_id,
+      :administrator_account_id,
       :arn,
       :email,
       :invited_at,
@@ -3027,8 +3176,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
@@ -3660,7 +3809,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
@@ -3806,7 +3955,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>]
@@ -3901,11 +4050,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]
     #
@@ -3920,8 +4072,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
@@ -3937,6 +4089,7 @@ module Aws::Macie2
     #
     class Member < Struct.new(
       :account_id,
+      :administrator_account_id,
       :arn,
       :email,
       :invited_at,
@@ -3985,13 +4138,17 @@ module Aws::Macie2
     # @!attribute [rw] unencrypted
     #   @return [Integer]
     #
+    # @!attribute [rw] unknown
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/ObjectCountByEncryptionType AWS API Documentation
     #
     class ObjectCountByEncryptionType < Struct.new(
       :customer_managed,
       :kms_managed,
       :s3_managed,
-      :unencrypted)
+      :unencrypted,
+      :unknown)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4000,7 +4157,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]
@@ -4163,6 +4322,49 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Specifies configuration settings for publishing findings to AWS
+    # Security Hub automatically.
+    #
+    # @note When making an API call, you may pass PutFindingsPublicationConfigurationRequest
+    #   data as a hash:
+    #
+    #       {
+    #         client_token: "__string",
+    #         security_hub_configuration: {
+    #           publish_classification_findings: false, # required
+    #           publish_policy_findings: false, # required
+    #         },
+    #       }
+    #
+    # @!attribute [rw] client_token
+    #   **A suitable default value is auto-generated.** You should normally
+    #   not need to pass this option.
+    #   @return [String]
+    #
+    # @!attribute [rw] security_hub_configuration
+    #   Specifies configuration settings that determine which findings are
+    #   published to AWS Security Hub automatically. For information about
+    #   how Macie publishes findings to Security Hub, see [Amazon Macie
+    #   integration with Security Hub][1] in the *Amazon Macie User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/macie/latest/user/securityhub-integration.html
+    #   @return [Types::SecurityHubConfiguration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/PutFindingsPublicationConfigurationRequest AWS API Documentation
+    #
+    class PutFindingsPublicationConfigurationRequest < Struct.new(
+      :client_token,
+      :security_hub_configuration)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/PutFindingsPublicationConfigurationResponse AWS API Documentation
+    #
+    class PutFindingsPublicationConfigurationResponse < Aws::EmptyStructure; end
+
     # Provides details about the location of an occurrence of sensitive data
     # in an Adobe Portable Document Format file, Microsoft Word document, or
     # non-binary text file.
@@ -4262,6 +4464,9 @@ module Aws::Macie2
 
     # Provides information about an S3 bucket that a finding applies to.
     #
+    # @!attribute [rw] allows_unencrypted_object_uploads
+    #   @return [String]
+    #
     # @!attribute [rw] arn
     #   @return [String]
     #
@@ -4294,6 +4499,7 @@ module Aws::Macie2
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/S3Bucket AWS API Documentation
     #
     class S3Bucket < Struct.new(
+      :allows_unencrypted_object_uploads,
       :arn,
       :created_at,
       :default_server_side_encryption,
@@ -4600,6 +4806,38 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Specifies configuration settings that determine which findings are
+    # published to AWS Security Hub automatically. For information about how
+    # Macie publishes findings to Security Hub, see [Amazon Macie
+    # integration with Security Hub][1] in the *Amazon Macie User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/macie/latest/user/securityhub-integration.html
+    #
+    # @note When making an API call, you may pass SecurityHubConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         publish_classification_findings: false, # required
+    #         publish_policy_findings: false, # required
+    #       }
+    #
+    # @!attribute [rw] publish_classification_findings
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] publish_policy_findings
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/SecurityHubConfiguration AWS API Documentation
+    #
+    class SecurityHubConfiguration < Struct.new(
+      :publish_classification_findings,
+      :publish_policy_findings)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Provides information about the category, types, and occurrences of
     # sensitive data that produced a sensitive data finding.
     #
@@ -5031,7 +5269,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
@@ -5208,7 +5446,13 @@ module Aws::Macie2
     #   The frequency with which Amazon Macie publishes updates to policy
     #   findings for an account. This includes publishing updates to AWS
     #   Security Hub and Amazon EventBridge (formerly called Amazon
-    #   CloudWatch Events). Valid values are:
+    #   CloudWatch Events). For more information, see [Monitoring and
+    #   processing findings][1] in the *Amazon Macie User Guide*. Valid
+    #   values are:
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/macie/latest/user/findings-monitor.html
     #   @return [String]
     #
     # @!attribute [rw] status
@@ -5258,7 +5502,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
@@ -5335,9 +5579,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # 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.
+    # 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: