From 75e0a408283d4c3670ee9c81398831d2c5180bb1 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Fri, 17 Nov 2023 10:02:18 -0800 Subject: [PATCH] Remove macie client following the service deprecation (#3066) * Remove macie client following the service deprecation --- .../next-release/api-change-macie-6153.json | 5 + botocore/data/endpoints.json | 32 +- .../macie/2017-12-19/endpoint-rule-set-1.json | 314 ----------- .../data/macie/2017-12-19/examples-1.json | 5 - .../data/macie/2017-12-19/paginators-1.json | 16 - botocore/data/macie/2017-12-19/service-2.json | 495 ------------------ .../macie/endpoint-tests-1.json | 340 ------------ tests/functional/test_event_alias.py | 1 - 8 files changed, 6 insertions(+), 1202 deletions(-) create mode 100644 .changes/next-release/api-change-macie-6153.json delete mode 100644 botocore/data/macie/2017-12-19/endpoint-rule-set-1.json delete mode 100644 botocore/data/macie/2017-12-19/examples-1.json delete mode 100644 botocore/data/macie/2017-12-19/paginators-1.json delete mode 100644 botocore/data/macie/2017-12-19/service-2.json delete mode 100644 tests/functional/endpoint-rules/macie/endpoint-tests-1.json diff --git a/.changes/next-release/api-change-macie-6153.json b/.changes/next-release/api-change-macie-6153.json new file mode 100644 index 0000000000..30c72c5636 --- /dev/null +++ b/.changes/next-release/api-change-macie-6153.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``macie``", + "description": "The macie client has been removed following the deprecation of the service." +} diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json index 22fb61dd03..905d7b14a6 100644 --- a/botocore/data/endpoints.json +++ b/botocore/data/endpoints.json @@ -10951,36 +10951,6 @@ "us-east-1" : { } } }, - "macie" : { - "endpoints" : { - "fips-us-east-1" : { - "credentialScope" : { - "region" : "us-east-1" - }, - "deprecated" : true, - "hostname" : "macie-fips.us-east-1.amazonaws.com" - }, - "fips-us-west-2" : { - "credentialScope" : { - "region" : "us-west-2" - }, - "deprecated" : true, - "hostname" : "macie-fips.us-west-2.amazonaws.com" - }, - "us-east-1" : { - "variants" : [ { - "hostname" : "macie-fips.us-east-1.amazonaws.com", - "tags" : [ "fips" ] - } ] - }, - "us-west-2" : { - "variants" : [ { - "hostname" : "macie-fips.us-west-2.amazonaws.com", - "tags" : [ "fips" ] - } ] - } - } - }, "macie2" : { "endpoints" : { "af-south-1" : { }, @@ -26128,4 +26098,4 @@ "services" : { } } ], "version" : 3 -} \ No newline at end of file +} diff --git a/botocore/data/macie/2017-12-19/endpoint-rule-set-1.json b/botocore/data/macie/2017-12-19/endpoint-rule-set-1.json deleted file mode 100644 index 94856ff2f2..0000000000 --- a/botocore/data/macie/2017-12-19/endpoint-rule-set-1.json +++ /dev/null @@ -1,314 +0,0 @@ -{ - "version": "1.0", - "parameters": { - "Region": { - "builtIn": "AWS::Region", - "required": false, - "documentation": "The AWS region used to dispatch the request.", - "type": "String" - }, - "UseDualStack": { - "builtIn": "AWS::UseDualStack", - "required": true, - "default": false, - "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", - "type": "Boolean" - }, - "UseFIPS": { - "builtIn": "AWS::UseFIPS", - "required": true, - "default": false, - "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", - "type": "Boolean" - }, - "Endpoint": { - "builtIn": "SDK::Endpoint", - "required": false, - "documentation": "Override the endpoint used to send this request", - "type": "String" - } - }, - "rules": [ - { - "conditions": [ - { - "fn": "isSet", - "argv": [ - { - "ref": "Endpoint" - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [ - { - "fn": "isSet", - "argv": [ - { - "ref": "Region" - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "aws.partition", - "argv": [ - { - "ref": "Region" - } - ], - "assign": "PartitionResult" - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://macie-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://macie-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://macie.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" - } - ] - }, - { - "conditions": [], - "endpoint": { - "url": "https://macie.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - } - ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" - } - ] -} \ No newline at end of file diff --git a/botocore/data/macie/2017-12-19/examples-1.json b/botocore/data/macie/2017-12-19/examples-1.json deleted file mode 100644 index 0ea7e3b0bb..0000000000 --- a/botocore/data/macie/2017-12-19/examples-1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "1.0", - "examples": { - } -} diff --git a/botocore/data/macie/2017-12-19/paginators-1.json b/botocore/data/macie/2017-12-19/paginators-1.json deleted file mode 100644 index f7b6a2c2a0..0000000000 --- a/botocore/data/macie/2017-12-19/paginators-1.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "pagination": { - "ListMemberAccounts": { - "input_token": "nextToken", - "limit_key": "maxResults", - "output_token": "nextToken", - "result_key": "memberAccounts" - }, - "ListS3Resources": { - "input_token": "nextToken", - "limit_key": "maxResults", - "output_token": "nextToken", - "result_key": "s3Resources" - } - } -} diff --git a/botocore/data/macie/2017-12-19/service-2.json b/botocore/data/macie/2017-12-19/service-2.json deleted file mode 100644 index 08d5be4182..0000000000 --- a/botocore/data/macie/2017-12-19/service-2.json +++ /dev/null @@ -1,495 +0,0 @@ -{ - "version":"2.0", - "metadata":{ - "apiVersion":"2017-12-19", - "endpointPrefix":"macie", - "jsonVersion":"1.1", - "protocol":"json", - "serviceFullName":"Amazon Macie", - "serviceId":"Macie", - "signatureVersion":"v4", - "targetPrefix":"MacieService", - "uid":"macie-2017-12-19" - }, - "operations":{ - "AssociateMemberAccount":{ - "name":"AssociateMemberAccount", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AssociateMemberAccountRequest"}, - "errors":[ - {"shape":"InvalidInputException"}, - {"shape":"LimitExceededException"}, - {"shape":"InternalException"} - ], - "documentation":"

(Discontinued) Associates a specified Amazon Web Services account with Amazon Macie Classic as a member account.

" - }, - "AssociateS3Resources":{ - "name":"AssociateS3Resources", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"AssociateS3ResourcesRequest"}, - "output":{"shape":"AssociateS3ResourcesResult"}, - "errors":[ - {"shape":"InvalidInputException"}, - {"shape":"AccessDeniedException"}, - {"shape":"LimitExceededException"}, - {"shape":"InternalException"} - ], - "documentation":"

(Discontinued) Associates specified S3 resources with Amazon Macie Classic for monitoring and data classification. If memberAccountId isn't specified, the action associates specified S3 resources with Macie Classic for the current Macie Classic administrator account. If memberAccountId is specified, the action associates specified S3 resources with Macie Classic for the specified member account.

" - }, - "DisassociateMemberAccount":{ - "name":"DisassociateMemberAccount", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DisassociateMemberAccountRequest"}, - "errors":[ - {"shape":"InvalidInputException"}, - {"shape":"InternalException"} - ], - "documentation":"

(Discontinued) Removes the specified member account from Amazon Macie Classic.

" - }, - "DisassociateS3Resources":{ - "name":"DisassociateS3Resources", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"DisassociateS3ResourcesRequest"}, - "output":{"shape":"DisassociateS3ResourcesResult"}, - "errors":[ - {"shape":"InvalidInputException"}, - {"shape":"AccessDeniedException"}, - {"shape":"InternalException"} - ], - "documentation":"

(Discontinued) Removes specified S3 resources from being monitored by Amazon Macie Classic. If memberAccountId isn't specified, the action removes specified S3 resources from Macie Classic for the current Macie Classic administrator account. If memberAccountId is specified, the action removes specified S3 resources from Macie Classic for the specified member account.

" - }, - "ListMemberAccounts":{ - "name":"ListMemberAccounts", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ListMemberAccountsRequest"}, - "output":{"shape":"ListMemberAccountsResult"}, - "errors":[ - {"shape":"InternalException"}, - {"shape":"InvalidInputException"} - ], - "documentation":"

(Discontinued) Lists all Amazon Macie Classic member accounts for the current Macie Classic administrator account.

" - }, - "ListS3Resources":{ - "name":"ListS3Resources", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"ListS3ResourcesRequest"}, - "output":{"shape":"ListS3ResourcesResult"}, - "errors":[ - {"shape":"InvalidInputException"}, - {"shape":"AccessDeniedException"}, - {"shape":"InternalException"} - ], - "documentation":"

(Discontinued) Lists all the S3 resources associated with Amazon Macie Classic. If memberAccountId isn't specified, the action lists the S3 resources associated with Macie Classic for the current Macie Classic administrator account. If memberAccountId is specified, the action lists the S3 resources associated with Macie Classic for the specified member account.

" - }, - "UpdateS3Resources":{ - "name":"UpdateS3Resources", - "http":{ - "method":"POST", - "requestUri":"/" - }, - "input":{"shape":"UpdateS3ResourcesRequest"}, - "output":{"shape":"UpdateS3ResourcesResult"}, - "errors":[ - {"shape":"InvalidInputException"}, - {"shape":"AccessDeniedException"}, - {"shape":"InternalException"} - ], - "documentation":"

(Discontinued) Updates the classification types for the specified S3 resources. If memberAccountId isn't specified, the action updates the classification types of the S3 resources associated with Amazon Macie Classic for the current Macie Classic administrator account. If memberAccountId is specified, the action updates the classification types of the S3 resources associated with Macie Classic for the specified member account.

" - } - }, - "shapes":{ - "AWSAccountId":{ - "type":"string", - "pattern":"[0-9]{12}" - }, - "AccessDeniedException":{ - "type":"structure", - "members":{ - "message":{"shape":"ExceptionMessage"}, - "resourceType":{"shape":"ResourceType"} - }, - "documentation":"

(Discontinued) You do not have required permissions to access the requested resource.

", - "exception":true - }, - "AssociateMemberAccountRequest":{ - "type":"structure", - "required":["memberAccountId"], - "members":{ - "memberAccountId":{ - "shape":"AWSAccountId", - "documentation":"

(Discontinued) The ID of the Amazon Web Services account that you want to associate with Amazon Macie Classic as a member account.

" - } - } - }, - "AssociateS3ResourcesRequest":{ - "type":"structure", - "required":["s3Resources"], - "members":{ - "memberAccountId":{ - "shape":"AWSAccountId", - "documentation":"

(Discontinued) The ID of the Amazon Macie Classic member account whose resources you want to associate with Macie Classic.

" - }, - "s3Resources":{ - "shape":"S3ResourcesClassification", - "documentation":"

(Discontinued) The S3 resources that you want to associate with Amazon Macie Classic for monitoring and data classification.

" - } - } - }, - "AssociateS3ResourcesResult":{ - "type":"structure", - "members":{ - "failedS3Resources":{ - "shape":"FailedS3Resources", - "documentation":"

(Discontinued) S3 resources that couldn't be associated with Amazon Macie Classic. An error code and an error message are provided for each failed item.

" - } - } - }, - "BucketName":{ - "type":"string", - "max":500 - }, - "ClassificationType":{ - "type":"structure", - "required":[ - "oneTime", - "continuous" - ], - "members":{ - "oneTime":{ - "shape":"S3OneTimeClassificationType", - "documentation":"

(Discontinued) A one-time classification of all of the existing objects in a specified S3 bucket.

" - }, - "continuous":{ - "shape":"S3ContinuousClassificationType", - "documentation":"

(Discontinued) A continuous classification of the objects that are added to a specified S3 bucket. Amazon Macie Classic begins performing continuous classification after a bucket is successfully associated with Macie Classic.

" - } - }, - "documentation":"

(Discontinued) The classification type that Amazon Macie Classic applies to the associated S3 resources.

" - }, - "ClassificationTypeUpdate":{ - "type":"structure", - "members":{ - "oneTime":{ - "shape":"S3OneTimeClassificationType", - "documentation":"

(Discontinued) A one-time classification of all of the existing objects in a specified S3 bucket.

" - }, - "continuous":{ - "shape":"S3ContinuousClassificationType", - "documentation":"

(Discontinued) A continuous classification of the objects that are added to a specified S3 bucket. Amazon Macie Classic begins performing continuous classification after a bucket is successfully associated with Macie Classic.

" - } - }, - "documentation":"

(Discontinued) The classification type that Amazon Macie Classic applies to the associated S3 resources. At least one of the classification types (oneTime or continuous) must be specified.

" - }, - "DisassociateMemberAccountRequest":{ - "type":"structure", - "required":["memberAccountId"], - "members":{ - "memberAccountId":{ - "shape":"AWSAccountId", - "documentation":"

(Discontinued) The ID of the member account that you want to remove from Amazon Macie Classic.

" - } - } - }, - "DisassociateS3ResourcesRequest":{ - "type":"structure", - "required":["associatedS3Resources"], - "members":{ - "memberAccountId":{ - "shape":"AWSAccountId", - "documentation":"

(Discontinued) The ID of the Amazon Macie Classic member account whose resources you want to remove from being monitored by Macie Classic.

" - }, - "associatedS3Resources":{ - "shape":"S3Resources", - "documentation":"

(Discontinued) The S3 resources (buckets or prefixes) that you want to remove from being monitored and classified by Amazon Macie Classic.

" - } - } - }, - "DisassociateS3ResourcesResult":{ - "type":"structure", - "members":{ - "failedS3Resources":{ - "shape":"FailedS3Resources", - "documentation":"

(Discontinued) S3 resources that couldn't be removed from being monitored and classified by Amazon Macie Classic. An error code and an error message are provided for each failed item.

" - } - } - }, - "ErrorCode":{ - "type":"string", - "documentation":"Error code for the exception", - "max":10 - }, - "ExceptionMessage":{ - "type":"string", - "max":10000 - }, - "FailedS3Resource":{ - "type":"structure", - "members":{ - "failedItem":{ - "shape":"S3Resource", - "documentation":"

(Discontinued) The failed S3 resources.

" - }, - "errorCode":{ - "shape":"ErrorCode", - "documentation":"

(Discontinued) The status code of a failed item.

" - }, - "errorMessage":{ - "shape":"ExceptionMessage", - "documentation":"

(Discontinued) The error message of a failed item.

" - } - }, - "documentation":"

(Discontinued) Includes details about the failed S3 resources.

" - }, - "FailedS3Resources":{ - "type":"list", - "member":{"shape":"FailedS3Resource"} - }, - "FieldName":{ - "type":"string", - "documentation":"Field that has invalid input", - "max":1000 - }, - "InternalException":{ - "type":"structure", - "members":{ - "errorCode":{"shape":"ErrorCode"}, - "message":{"shape":"ExceptionMessage"} - }, - "documentation":"

(Discontinued) Internal server error.

", - "exception":true, - "fault":true - }, - "InvalidInputException":{ - "type":"structure", - "members":{ - "errorCode":{"shape":"ErrorCode"}, - "message":{"shape":"ExceptionMessage"}, - "fieldName":{"shape":"FieldName"} - }, - "documentation":"

(Discontinued) The request was rejected because an invalid or out-of-range value was supplied for an input parameter.

", - "exception":true - }, - "LimitExceededException":{ - "type":"structure", - "members":{ - "errorCode":{"shape":"ErrorCode"}, - "message":{"shape":"ExceptionMessage"}, - "resourceType":{"shape":"ResourceType"} - }, - "documentation":"

(Discontinued) The request was rejected because it attempted to create resources beyond the current Amazon Web Services account quotas. The error code describes the quota exceeded.

", - "exception":true - }, - "ListMemberAccountsRequest":{ - "type":"structure", - "members":{ - "nextToken":{ - "shape":"NextToken", - "documentation":"

(Discontinued) Use this parameter when paginating results. Set the value of this parameter to null on your first call to the ListMemberAccounts action. Subsequent calls to the action fill nextToken in the request with the value of nextToken from the previous response to continue listing data.

" - }, - "maxResults":{ - "shape":"MaxResults", - "documentation":"

(Discontinued) Use this parameter to indicate the maximum number of items that you want in the response. The default value is 250.

" - } - } - }, - "ListMemberAccountsResult":{ - "type":"structure", - "members":{ - "memberAccounts":{ - "shape":"MemberAccounts", - "documentation":"

(Discontinued) A list of the Amazon Macie Classic member accounts returned by the action. The current Macie Classic administrator account is also included in this list.

" - }, - "nextToken":{ - "shape":"NextToken", - "documentation":"

(Discontinued) When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the nextToken parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.

" - } - } - }, - "ListS3ResourcesRequest":{ - "type":"structure", - "members":{ - "memberAccountId":{ - "shape":"AWSAccountId", - "documentation":"

(Discontinued) The Amazon Macie Classic member account ID whose associated S3 resources you want to list.

" - }, - "nextToken":{ - "shape":"NextToken", - "documentation":"

(Discontinued) Use this parameter when paginating results. Set its value to null on your first call to the ListS3Resources action. Subsequent calls to the action fill nextToken in the request with the value of nextToken from the previous response to continue listing data.

" - }, - "maxResults":{ - "shape":"MaxResults", - "documentation":"

(Discontinued) Use this parameter to indicate the maximum number of items that you want in the response. The default value is 250.

" - } - } - }, - "ListS3ResourcesResult":{ - "type":"structure", - "members":{ - "s3Resources":{ - "shape":"S3ResourcesClassification", - "documentation":"

(Discontinued) A list of the associated S3 resources returned by the action.

" - }, - "nextToken":{ - "shape":"NextToken", - "documentation":"

(Discontinued) When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the nextToken parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.

" - } - } - }, - "MaxResults":{ - "type":"integer", - "box":true, - "max":250 - }, - "MemberAccount":{ - "type":"structure", - "members":{ - "accountId":{ - "shape":"AWSAccountId", - "documentation":"

(Discontinued) The Amazon Web Services account ID of the Amazon Macie Classic member account.

" - } - }, - "documentation":"

(Discontinued) Contains information about the Amazon Macie Classic member account.

" - }, - "MemberAccounts":{ - "type":"list", - "member":{"shape":"MemberAccount"} - }, - "NextToken":{ - "type":"string", - "max":500 - }, - "Prefix":{ - "type":"string", - "max":10000 - }, - "ResourceType":{ - "type":"string", - "documentation":"Resource type that caused the exception", - "max":1000 - }, - "S3ContinuousClassificationType":{ - "type":"string", - "enum":["FULL"] - }, - "S3OneTimeClassificationType":{ - "type":"string", - "enum":[ - "FULL", - "NONE" - ] - }, - "S3Resource":{ - "type":"structure", - "required":["bucketName"], - "members":{ - "bucketName":{ - "shape":"BucketName", - "documentation":"

(Discontinued) The name of the S3 bucket.

" - }, - "prefix":{ - "shape":"Prefix", - "documentation":"

(Discontinued) The prefix of the S3 bucket.

" - } - }, - "documentation":"

(Discontinued) Contains information about the S3 resource. This data type is used as a request parameter in the DisassociateS3Resources action and can be used as a response parameter in the AssociateS3Resources and UpdateS3Resources actions.

" - }, - "S3ResourceClassification":{ - "type":"structure", - "required":[ - "bucketName", - "classificationType" - ], - "members":{ - "bucketName":{ - "shape":"BucketName", - "documentation":"

(Discontinued) The name of the S3 bucket that you want to associate with Amazon Macie Classic.

" - }, - "prefix":{ - "shape":"Prefix", - "documentation":"

(Discontinued) The prefix of the S3 bucket that you want to associate with Amazon Macie Classic.

" - }, - "classificationType":{ - "shape":"ClassificationType", - "documentation":"

(Discontinued) The classification type that you want to specify for the resource associated with Amazon Macie Classic.

" - } - }, - "documentation":"

(Discontinued) The S3 resources that you want to associate with Amazon Macie Classic for monitoring and data classification. This data type is used as a request parameter in the AssociateS3Resources action and a response parameter in the ListS3Resources action.

" - }, - "S3ResourceClassificationUpdate":{ - "type":"structure", - "required":[ - "bucketName", - "classificationTypeUpdate" - ], - "members":{ - "bucketName":{ - "shape":"BucketName", - "documentation":"

(Discontinued) The name of the S3 bucket whose classification types you want to update.

" - }, - "prefix":{ - "shape":"Prefix", - "documentation":"

(Discontinued) The prefix of the S3 bucket whose classification types you want to update.

" - }, - "classificationTypeUpdate":{ - "shape":"ClassificationTypeUpdate", - "documentation":"

(Discontinued) The classification type that you want to update for the resource associated with Amazon Macie Classic.

" - } - }, - "documentation":"

(Discontinued) The S3 resources whose classification types you want to update. This data type is used as a request parameter in the UpdateS3Resources action.

" - }, - "S3Resources":{ - "type":"list", - "member":{"shape":"S3Resource"} - }, - "S3ResourcesClassification":{ - "type":"list", - "member":{"shape":"S3ResourceClassification"} - }, - "S3ResourcesClassificationUpdate":{ - "type":"list", - "member":{"shape":"S3ResourceClassificationUpdate"} - }, - "UpdateS3ResourcesRequest":{ - "type":"structure", - "required":["s3ResourcesUpdate"], - "members":{ - "memberAccountId":{ - "shape":"AWSAccountId", - "documentation":"

(Discontinued) The Amazon Web Services account ID of the Amazon Macie Classic member account whose S3 resources' classification types you want to update.

" - }, - "s3ResourcesUpdate":{ - "shape":"S3ResourcesClassificationUpdate", - "documentation":"

(Discontinued) The S3 resources whose classification types you want to update.

" - } - } - }, - "UpdateS3ResourcesResult":{ - "type":"structure", - "members":{ - "failedS3Resources":{ - "shape":"FailedS3Resources", - "documentation":"

(Discontinued) The S3 resources whose classification types can't be updated. An error code and an error message are provided for each failed item.

" - } - } - } - }, - "documentation":"Amazon Macie Classic

Amazon Macie Classic has been discontinued and is no longer available.

A new Amazon Macie is now available with significant design improvements and additional features, at a lower price and in most Amazon Web Services Regions. We encourage you to take advantage of the new and improved features, and benefit from the reduced cost. To learn about features and pricing for the new Macie, see Amazon Macie. To learn how to use the new Macie, see the Amazon Macie User Guide.

" -} diff --git a/tests/functional/endpoint-rules/macie/endpoint-tests-1.json b/tests/functional/endpoint-rules/macie/endpoint-tests-1.json deleted file mode 100644 index 886dd05c62..0000000000 --- a/tests/functional/endpoint-rules/macie/endpoint-tests-1.json +++ /dev/null @@ -1,340 +0,0 @@ -{ - "testCases": [ - { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie.us-east-1.amazonaws.com" - } - }, - "params": { - "Region": "us-east-1", - "UseFIPS": false, - "UseDualStack": false - } - }, - { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.us-east-1.amazonaws.com" - } - }, - "params": { - "Region": "us-east-1", - "UseFIPS": true, - "UseDualStack": false - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie.us-west-2.amazonaws.com" - } - }, - "params": { - "Region": "us-west-2", - "UseFIPS": false, - "UseDualStack": false - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.us-west-2.amazonaws.com" - } - }, - "params": { - "Region": "us-west-2", - "UseFIPS": true, - "UseDualStack": false - } - }, - { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.us-east-1.api.aws" - } - }, - "params": { - "Region": "us-east-1", - "UseFIPS": true, - "UseDualStack": true - } - }, - { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://macie.us-east-1.api.aws" - } - }, - "params": { - "Region": "us-east-1", - "UseFIPS": false, - "UseDualStack": true - } - }, - { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.cn-north-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseFIPS": true, - "UseDualStack": true - } - }, - { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.cn-north-1.amazonaws.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseFIPS": true, - "UseDualStack": false - } - }, - { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://macie.cn-north-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseFIPS": false, - "UseDualStack": true - } - }, - { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie.cn-north-1.amazonaws.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseFIPS": false, - "UseDualStack": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseFIPS": true, - "UseDualStack": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseFIPS": true, - "UseDualStack": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://macie.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseFIPS": false, - "UseDualStack": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseFIPS": false, - "UseDualStack": false - } - }, - { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" - }, - "params": { - "Region": "us-iso-east-1", - "UseFIPS": true, - "UseDualStack": true - } - }, - { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.us-iso-east-1.c2s.ic.gov" - } - }, - "params": { - "Region": "us-iso-east-1", - "UseFIPS": true, - "UseDualStack": false - } - }, - { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" - }, - "params": { - "Region": "us-iso-east-1", - "UseFIPS": false, - "UseDualStack": true - } - }, - { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie.us-iso-east-1.c2s.ic.gov" - } - }, - "params": { - "Region": "us-iso-east-1", - "UseFIPS": false, - "UseDualStack": false - } - }, - { - "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" - }, - "params": { - "Region": "us-isob-east-1", - "UseFIPS": true, - "UseDualStack": true - } - }, - { - "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie-fips.us-isob-east-1.sc2s.sgov.gov" - } - }, - "params": { - "Region": "us-isob-east-1", - "UseFIPS": true, - "UseDualStack": false - } - }, - { - "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" - }, - "params": { - "Region": "us-isob-east-1", - "UseFIPS": false, - "UseDualStack": true - } - }, - { - "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://macie.us-isob-east-1.sc2s.sgov.gov" - } - }, - "params": { - "Region": "us-isob-east-1", - "UseFIPS": false, - "UseDualStack": false - } - }, - { - "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", - "expect": { - "endpoint": { - "url": "https://example.com" - } - }, - "params": { - "Region": "us-east-1", - "UseFIPS": false, - "UseDualStack": false, - "Endpoint": "https://example.com" - } - }, - { - "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", - "expect": { - "endpoint": { - "url": "https://example.com" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": false, - "Endpoint": "https://example.com" - } - }, - { - "documentation": "For custom endpoint with fips enabled and dualstack disabled", - "expect": { - "error": "Invalid Configuration: FIPS and custom endpoint are not supported" - }, - "params": { - "Region": "us-east-1", - "UseFIPS": true, - "UseDualStack": false, - "Endpoint": "https://example.com" - } - }, - { - "documentation": "For custom endpoint with fips disabled and dualstack enabled", - "expect": { - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" - }, - "params": { - "Region": "us-east-1", - "UseFIPS": false, - "UseDualStack": true, - "Endpoint": "https://example.com" - } - }, - { - "documentation": "Missing region", - "expect": { - "error": "Invalid Configuration: Missing Region" - } - } - ], - "version": "1.0" -} \ No newline at end of file diff --git a/tests/functional/test_event_alias.py b/tests/functional/test_event_alias.py index 7ea5d0bcf7..9d0ec1730a 100644 --- a/tests/functional/test_event_alias.py +++ b/tests/functional/test_event_alias.py @@ -218,7 +218,6 @@ "endpoint_prefix": "machinelearning", "service_id": "machine-learning", }, - "macie": {"endpoint_prefix": "macie", "service_id": "macie"}, "marketplace-entitlement": { "endpoint_prefix": "entitlement.marketplace", "service_id": "marketplace-entitlement-service",