diff --git a/.changes/1.34.153.json b/.changes/1.34.153.json new file mode 100644 index 0000000000..232e845ab0 --- /dev/null +++ b/.changes/1.34.153.json @@ -0,0 +1,27 @@ +[ + { + "category": "``cloudwatch``", + "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.", + "type": "api-change" + }, + { + "category": "``kinesis``", + "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.", + "type": "api-change" + }, + { + "category": "``resiliencehub``", + "description": "Customers are presented with the grouping recommendations and can determine if the recommendations are accurate and apply to their case. This feature simplifies onboarding by organizing resources into appropriate AppComponents.", + "type": "api-change" + }, + { + "category": "``route53``", + "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.", + "type": "api-change" + }, + { + "category": "``waf-regional``", + "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.", + "type": "api-change" + } +] \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ec85cb8a52..e3bd8e049d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,16 @@ CHANGELOG ========= +1.34.153 +======== + +* api-change:``cloudwatch``: Add v2 smoke tests and smithy smokeTests trait for SDK testing. +* api-change:``kinesis``: Add v2 smoke tests and smithy smokeTests trait for SDK testing. +* api-change:``resiliencehub``: Customers are presented with the grouping recommendations and can determine if the recommendations are accurate and apply to their case. This feature simplifies onboarding by organizing resources into appropriate AppComponents. +* api-change:``route53``: Add v2 smoke tests and smithy smokeTests trait for SDK testing. +* api-change:``waf-regional``: Add v2 smoke tests and smithy smokeTests trait for SDK testing. + + 1.34.152 ======== diff --git a/botocore/__init__.py b/botocore/__init__.py index bbaf19578a..df63c22e6a 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.34.152' +__version__ = '1.34.153' class NullHandler(logging.Handler): diff --git a/botocore/data/cloudwatch/2010-08-01/service-2.json b/botocore/data/cloudwatch/2010-08-01/service-2.json index 29cdb7da8c..443cea7170 100644 --- a/botocore/data/cloudwatch/2010-08-01/service-2.json +++ b/botocore/data/cloudwatch/2010-08-01/service-2.json @@ -4,12 +4,14 @@ "apiVersion":"2010-08-01", "endpointPrefix":"monitoring", "protocol":"query", + "protocols":["query"], "serviceAbbreviation":"CloudWatch", "serviceFullName":"Amazon CloudWatch", "serviceId":"CloudWatch", "signatureVersion":"v4", "uid":"monitoring-2010-08-01", - "xmlNamespace":"http://monitoring.amazonaws.com/doc/2010-08-01/" + "xmlNamespace":"http://monitoring.amazonaws.com/doc/2010-08-01/", + "auth":["aws.auth#sigv4"] }, "operations":{ "DeleteAlarms":{ diff --git a/botocore/data/kinesis/2013-12-02/service-2.json b/botocore/data/kinesis/2013-12-02/service-2.json index 54b26deea0..93d247243d 100644 --- a/botocore/data/kinesis/2013-12-02/service-2.json +++ b/botocore/data/kinesis/2013-12-02/service-2.json @@ -6,12 +6,14 @@ "jsonVersion":"1.1", "protocol":"json", "protocolSettings":{"h2":"eventstream"}, + "protocols":["json"], "serviceAbbreviation":"Kinesis", "serviceFullName":"Amazon Kinesis", "serviceId":"Kinesis", "signatureVersion":"v4", "targetPrefix":"Kinesis_20131202", - "uid":"kinesis-2013-12-02" + "uid":"kinesis-2013-12-02", + "auth":["aws.auth#sigv4"] }, "operations":{ "AddTagsToStream":{ diff --git a/botocore/data/resiliencehub/2020-04-30/paginators-1.json b/botocore/data/resiliencehub/2020-04-30/paginators-1.json index 45c746174d..f98356da47 100644 --- a/botocore/data/resiliencehub/2020-04-30/paginators-1.json +++ b/botocore/data/resiliencehub/2020-04-30/paginators-1.json @@ -5,6 +5,12 @@ "output_token": "nextToken", "limit_key": "maxResults", "result_key": "resourceDrifts" + }, + "ListResourceGroupingRecommendations": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "groupingRecommendations" } } } diff --git a/botocore/data/resiliencehub/2020-04-30/service-2.json b/botocore/data/resiliencehub/2020-04-30/service-2.json index 9c465d0eec..4bb1d5776a 100644 --- a/botocore/data/resiliencehub/2020-04-30/service-2.json +++ b/botocore/data/resiliencehub/2020-04-30/service-2.json @@ -10,9 +10,28 @@ "serviceId":"resiliencehub", "signatureVersion":"v4", "signingName":"resiliencehub", - "uid":"resiliencehub-2020-04-30" + "uid":"resiliencehub-2020-04-30", + "auth":["aws.auth#sigv4"] }, "operations":{ + "AcceptResourceGroupingRecommendations":{ + "name":"AcceptResourceGroupingRecommendations", + "http":{ + "method":"POST", + "requestUri":"/accept-resource-grouping-recommendations", + "responseCode":200 + }, + "input":{"shape":"AcceptResourceGroupingRecommendationsRequest"}, + "output":{"shape":"AcceptResourceGroupingRecommendationsResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"} + ], + "documentation":"

Accepts the resource grouping recommendations suggested by Resilience Hub for your application.

" + }, "AddDraftAppVersionResourceMappings":{ "name":"AddDraftAppVersionResourceMappings", "http":{ @@ -26,11 +45,12 @@ {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ConflictException"}, + {"shape":"ServiceQuotaExceededException"}, {"shape":"ThrottlingException"}, {"shape":"ValidationException"}, {"shape":"AccessDeniedException"} ], - "documentation":"

Adds the source of resource-maps to the draft version of an application. During assessment, Resilience Hub will use these resource-maps to resolve the latest physical ID for each resource in the application template. For more information about different types of resources suported by Resilience Hub and how to add them in your application, see Step 2: How is your application managed? in the Resilience Hub User Guide.

" + "documentation":"

Adds the source of resource-maps to the draft version of an application. During assessment, Resilience Hub will use these resource-maps to resolve the latest physical ID for each resource in the application template. For more information about different types of resources supported by Resilience Hub and how to add them in your application, see Step 2: How is your application managed? in the Resilience Hub User Guide.

" }, "BatchUpdateRecommendationStatus":{ "name":"BatchUpdateRecommendationStatus", @@ -370,7 +390,7 @@ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"} ], - "documentation":"

Describes a resource of the Resilience Hub application.

This API accepts only one of the following parameters to descibe the resource:

" + "documentation":"

Describes a resource of the Resilience Hub application.

This API accepts only one of the following parameters to describe the resource:

" }, "DescribeAppVersionResourcesResolutionStatus":{ "name":"DescribeAppVersionResourcesResolutionStatus", @@ -444,6 +464,24 @@ ], "documentation":"

Describes a specified resiliency policy for an Resilience Hub application. The returned policy object includes creation time, data location constraints, the Amazon Resource Name (ARN) for the policy, tags, tier, and more.

" }, + "DescribeResourceGroupingRecommendationTask":{ + "name":"DescribeResourceGroupingRecommendationTask", + "http":{ + "method":"POST", + "requestUri":"/describe-resource-grouping-recommendation-task", + "responseCode":200 + }, + "input":{"shape":"DescribeResourceGroupingRecommendationTaskRequest"}, + "output":{"shape":"DescribeResourceGroupingRecommendationTaskResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"} + ], + "documentation":"

Describes the resource grouping recommendation tasks run by Resilience Hub for your application.

" + }, "ImportResourcesToDraftAppVersion":{ "name":"ImportResourcesToDraftAppVersion", "http":{ @@ -713,6 +751,24 @@ ], "documentation":"

Lists the resiliency policies for the Resilience Hub applications.

" }, + "ListResourceGroupingRecommendations":{ + "name":"ListResourceGroupingRecommendations", + "http":{ + "method":"GET", + "requestUri":"/list-resource-grouping-recommendations", + "responseCode":200 + }, + "input":{"shape":"ListResourceGroupingRecommendationsRequest"}, + "output":{"shape":"ListResourceGroupingRecommendationsResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"} + ], + "documentation":"

Lists the resource grouping recommendations suggested by Resilience Hub for your application.

" + }, "ListSopRecommendations":{ "name":"ListSopRecommendations", "http":{ @@ -844,6 +900,24 @@ ], "documentation":"

Adds or updates the app template for an Resilience Hub application draft version.

" }, + "RejectResourceGroupingRecommendations":{ + "name":"RejectResourceGroupingRecommendations", + "http":{ + "method":"POST", + "requestUri":"/reject-resource-grouping-recommendations", + "responseCode":200 + }, + "input":{"shape":"RejectResourceGroupingRecommendationsRequest"}, + "output":{"shape":"RejectResourceGroupingRecommendationsResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"} + ], + "documentation":"

Rejects resource grouping recommendations.

" + }, "RemoveDraftAppVersionResourceMappings":{ "name":"RemoveDraftAppVersionResourceMappings", "http":{ @@ -902,6 +976,25 @@ ], "documentation":"

Creates a new application assessment for an application.

" }, + "StartResourceGroupingRecommendationTask":{ + "name":"StartResourceGroupingRecommendationTask", + "http":{ + "method":"POST", + "requestUri":"/start-resource-grouping-recommendation-task", + "responseCode":200 + }, + "input":{"shape":"StartResourceGroupingRecommendationTaskRequest"}, + "output":{"shape":"StartResourceGroupingRecommendationTaskResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ConflictException"}, + {"shape":"ThrottlingException"}, + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"} + ], + "documentation":"

Starts grouping recommendation task.

" + }, "TagResource":{ "name":"TagResource", "http":{ @@ -1036,6 +1129,57 @@ } }, "shapes":{ + "AcceptGroupingRecommendationEntries":{ + "type":"list", + "member":{"shape":"AcceptGroupingRecommendationEntry"}, + "max":30, + "min":1 + }, + "AcceptGroupingRecommendationEntry":{ + "type":"structure", + "required":["groupingRecommendationId"], + "members":{ + "groupingRecommendationId":{ + "shape":"String255", + "documentation":"

Indicates the identifier of the grouping recommendation.

" + } + }, + "documentation":"

Indicates the grouping recommendation you have accepted to include in your application.

" + }, + "AcceptResourceGroupingRecommendationsRequest":{ + "type":"structure", + "required":[ + "appArn", + "entries" + ], + "members":{ + "appArn":{ + "shape":"Arn", + "documentation":"

Amazon Resource Name (ARN) of the Resilience Hub application. The format for this ARN is: arn:partition:resiliencehub:region:account:app/app-id. For more information about ARNs, see Amazon Resource Names (ARNs) in the Amazon Web Services General Reference guide.

" + }, + "entries":{ + "shape":"AcceptGroupingRecommendationEntries", + "documentation":"

Indicates the list of resource grouping recommendations you want to include in your application.

" + } + } + }, + "AcceptResourceGroupingRecommendationsResponse":{ + "type":"structure", + "required":[ + "appArn", + "failedEntries" + ], + "members":{ + "appArn":{ + "shape":"Arn", + "documentation":"

Amazon Resource Name (ARN) of the Resilience Hub application. The format for this ARN is: arn:partition:resiliencehub:region:account:app/app-id. For more information about ARNs, see Amazon Resource Names (ARNs) in the Amazon Web Services General Reference guide.

" + }, + "failedEntries":{ + "shape":"FailedGroupingRecommendationEntries", + "documentation":"

Indicates the list of resource grouping recommendations that could not be included in your application.

" + } + } + }, "AccessDeniedException":{ "type":"structure", "members":{ @@ -1327,6 +1471,10 @@ "shape":"TimeStamp", "documentation":"

Starting time for the action.

" }, + "summary":{ + "shape":"AssessmentSummary", + "documentation":"

Indicates a concise summary that provides an overview of the Resilience Hub assessment.

" + }, "tags":{ "shape":"TagMap", "documentation":"

Tags assigned to the resource. A tag is a label that you assign to an Amazon Web Services resource. Each tag consists of a key/value pair.

" @@ -1374,7 +1522,7 @@ }, "complianceStatus":{ "shape":"ComplianceStatus", - "documentation":"

TCurrent status of compliance for the resiliency policy.

" + "documentation":"

Current status of compliance for the resiliency policy.

" }, "cost":{ "shape":"Cost", @@ -1421,7 +1569,9 @@ "PolicyBreached", "PolicyMet", "NotAssessed", - "ChangesDetected" + "ChangesDetected", + "NotApplicable", + "MissingPolicy" ] }, "AppComponent":{ @@ -1436,11 +1586,11 @@ "documentation":"

Additional configuration parameters for an Resilience Hub application. If you want to implement additionalInfo through the Resilience Hub console rather than using an API call, see Configure the application configuration parameters.

Currently, this parameter accepts a key-value mapping (in a string format) of only one failover region and one associated account.

Key: \"failover-regions\"

Value: \"[{\"region\":\"<REGION>\", \"accounts\":[{\"id\":\"<ACCOUNT_ID>\"}]}]\"

" }, "id":{ - "shape":"String255", + "shape":"EntityName255", "documentation":"

Identifier of the Application Component.

" }, "name":{ - "shape":"String255", + "shape":"EntityName255", "documentation":"

Name of the Application Component.

" }, "type":{ @@ -1654,6 +1804,28 @@ "System" ] }, + "AssessmentRiskRecommendation":{ + "type":"structure", + "members":{ + "appComponents":{ + "shape":"AppComponentNameList", + "documentation":"

Indicates the Application Components (AppComponents) that were assessed as part of the assessnent and are associated with the identified risk and recommendation.

This property is available only in the US East (N. Virginia) Region.

" + }, + "recommendation":{ + "shape":"String255", + "documentation":"

Indicates the recommendation provided by the Resilience Hub to address the identified risks in the application.

This property is available only in the US East (N. Virginia) Region.

" + }, + "risk":{ + "shape":"String255", + "documentation":"

Indicates the description of the potential risk identified in the application as part of the Resilience Hub assessment.

This property is available only in the US East (N. Virginia) Region.

" + } + }, + "documentation":"

Indicates a specific risk identified in the Resilience Hub assessment and the corresponding recommendation provided to address that risk.

The assessment summary generated by large language models (LLMs) on Amazon Bedrock are only suggestions. The current level of generative AI technology is not perfect and LLMs are not infallible. Bias and incorrect answers, although rare, should be expected. Review each recommendation in the assessment summary before you use the output from an LLM.

This property is available only in the US East (N. Virginia) Region.

" + }, + "AssessmentRiskRecommendationList":{ + "type":"list", + "member":{"shape":"AssessmentRiskRecommendation"} + }, "AssessmentStatus":{ "type":"string", "enum":[ @@ -1669,6 +1841,20 @@ "max":10, "min":1 }, + "AssessmentSummary":{ + "type":"structure", + "members":{ + "riskRecommendations":{ + "shape":"AssessmentRiskRecommendationList", + "documentation":"

Indicates the top risks and recommendations identified by the Resilience Hub assessment, each representing a specific risk and the corresponding recommendation to address it.

This property is available only in the US East (N. Virginia) Region.

" + }, + "summary":{ + "shape":"String500", + "documentation":"

Indicates a concise summary that provides an overview of the Resilience Hub assessment.

This property is available only in the US East (N. Virginia) Region.

" + } + }, + "documentation":"

Indicates the AI-generated summary for the Resilience Hub assessment, providing a concise overview that highlights the top risks and recommendations.

This property is available only in the US East (N. Virginia) Region.

" + }, "AwsRegion":{ "type":"string", "pattern":"^[a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]$" @@ -1801,7 +1987,7 @@ }, "diffType":{ "shape":"DifferenceType", - "documentation":"

Difference type between actual and expected recovery point objective (RPO) and recovery time objective (RTO) values. Currently, Resilience Hub supports only NotEqual difference type.

" + "documentation":"

Difference type between actual and expected recovery point objective (RPO) and recovery time objective (RTO) values. Currently, Resilience Hub supports only NotEqual difference type.

" }, "driftType":{ "shape":"DriftType", @@ -1834,7 +2020,9 @@ "type":"string", "enum":[ "PolicyBreached", - "PolicyMet" + "PolicyMet", + "NotApplicable", + "MissingPolicy" ] }, "ComponentCompliancesList":{ @@ -2870,6 +3058,41 @@ } } }, + "DescribeResourceGroupingRecommendationTaskRequest":{ + "type":"structure", + "required":["appArn"], + "members":{ + "appArn":{ + "shape":"Arn", + "documentation":"

Amazon Resource Name (ARN) of the Resilience Hub application. The format for this ARN is: arn:partition:resiliencehub:region:account:app/app-id. For more information about ARNs, see Amazon Resource Names (ARNs) in the Amazon Web Services General Reference guide.

" + }, + "groupingId":{ + "shape":"String255", + "documentation":"

Indicates the identifier of the grouping recommendation task.

" + } + } + }, + "DescribeResourceGroupingRecommendationTaskResponse":{ + "type":"structure", + "required":[ + "groupingId", + "status" + ], + "members":{ + "errorMessage":{ + "shape":"String500", + "documentation":"

Indicates the error that occurred while generating a grouping recommendation.

" + }, + "groupingId":{ + "shape":"String255", + "documentation":"

Indicates the identifier of the grouping recommendation task.

" + }, + "status":{ + "shape":"ResourcesGroupingRecGenStatusType", + "documentation":"

Status of the action.

" + } + } + }, "DifferenceType":{ "type":"string", "enum":[ @@ -3028,6 +3251,10 @@ "type":"string", "pattern":"^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$" }, + "EntityName255":{ + "type":"string", + "pattern":"^[A-Za-z0-9][A-Za-z0-9_\\-]{0,254}$" + }, "EntityNameList":{ "type":"list", "member":{"shape":"EntityName"} @@ -3093,6 +3320,28 @@ "ComplexityOfImplementation" ] }, + "FailedGroupingRecommendationEntries":{ + "type":"list", + "member":{"shape":"FailedGroupingRecommendationEntry"} + }, + "FailedGroupingRecommendationEntry":{ + "type":"structure", + "required":[ + "errorMessage", + "groupingRecommendationId" + ], + "members":{ + "errorMessage":{ + "shape":"ErrorMessage", + "documentation":"

Indicates the error that occurred while implementing a grouping recommendation.

" + }, + "groupingRecommendationId":{ + "shape":"String255", + "documentation":"

Indicates the identifier of the grouping recommendation.

" + } + }, + "documentation":"

Indicates the accepted grouping recommendation whose implementation failed.

" + }, "FailurePolicy":{ "type":"structure", "required":[ @@ -3111,6 +3360,146 @@ }, "documentation":"

Defines a failure policy.

" }, + "GroupingAppComponent":{ + "type":"structure", + "required":[ + "appComponentId", + "appComponentName", + "appComponentType" + ], + "members":{ + "appComponentId":{ + "shape":"EntityName255", + "documentation":"

Indicates the identifier of an AppComponent.

" + }, + "appComponentName":{ + "shape":"EntityName255", + "documentation":"

Indicates the name of an AppComponent.

" + }, + "appComponentType":{ + "shape":"String255", + "documentation":"

Indicates the type of an AppComponent.

" + } + }, + "documentation":"

Creates a new recommended Application Component (AppComponent).

" + }, + "GroupingRecommendation":{ + "type":"structure", + "required":[ + "confidenceLevel", + "creationTime", + "groupingAppComponent", + "groupingRecommendationId", + "recommendationReasons", + "resources", + "score", + "status" + ], + "members":{ + "confidenceLevel":{ + "shape":"GroupingRecommendationConfidenceLevel", + "documentation":"

Indicates the confidence level of Resilience Hub on the grouping recommendation.

" + }, + "creationTime":{ + "shape":"TimeStamp", + "documentation":"

Indicates the creation time of the grouping recommendation.

" + }, + "groupingAppComponent":{ + "shape":"GroupingAppComponent", + "documentation":"

Indicates the name of the recommended Application Component (AppComponent).

" + }, + "groupingRecommendationId":{ + "shape":"String255", + "documentation":"

Indicates all the reasons available for rejecting a grouping recommendation.

" + }, + "recommendationReasons":{ + "shape":"String255List", + "documentation":"

Indicates all the reasons available for rejecting a grouping recommendation.

" + }, + "rejectionReason":{ + "shape":"GroupingRecommendationRejectionReason", + "documentation":"

Indicates the reason you had selected while rejecting a grouping recommendation.

" + }, + "resources":{ + "shape":"GroupingResourceList", + "documentation":"

Indicates the resources that are grouped in a recommended AppComponent.

" + }, + "score":{ + "shape":"Double", + "documentation":"

Indicates the confidence level of the grouping recommendation.

" + }, + "status":{ + "shape":"GroupingRecommendationStatusType", + "documentation":"

Indicates the status of grouping resources into AppComponents.

" + } + }, + "documentation":"

Creates a new grouping recommendation.

" + }, + "GroupingRecommendationConfidenceLevel":{ + "type":"string", + "enum":[ + "High", + "Medium" + ] + }, + "GroupingRecommendationList":{ + "type":"list", + "member":{"shape":"GroupingRecommendation"} + }, + "GroupingRecommendationRejectionReason":{ + "type":"string", + "enum":[ + "DistinctBusinessPurpose", + "SeparateDataConcern", + "DistinctUserGroupHandling", + "Other" + ] + }, + "GroupingRecommendationStatusType":{ + "type":"string", + "enum":[ + "Accepted", + "Rejected", + "PendingDecision" + ] + }, + "GroupingResource":{ + "type":"structure", + "required":[ + "logicalResourceId", + "physicalResourceId", + "resourceName", + "resourceType", + "sourceAppComponentIds" + ], + "members":{ + "logicalResourceId":{ + "shape":"LogicalResourceId", + "documentation":"

Indicates the logical identifier of the resource.

" + }, + "physicalResourceId":{ + "shape":"PhysicalResourceId", + "documentation":"

Indicates the physical identifier of the resource.

" + }, + "resourceName":{ + "shape":"String255", + "documentation":"

Indicates the resource name.

" + }, + "resourceType":{ + "shape":"String255", + "documentation":"

Indicates the resource type.

" + }, + "sourceAppComponentIds":{ + "shape":"String255List", + "documentation":"

Indicates the identifier of the source AppComponents in which the resources were previously grouped into.

" + } + }, + "documentation":"

Indicates the resource that will be grouped in the recommended Application Component (AppComponent).

" + }, + "GroupingResourceList":{ + "type":"list", + "member":{"shape":"GroupingResource"} + }, "HaArchitecture":{ "type":"string", "enum":[ @@ -3252,11 +3641,11 @@ }, "maxResults":{ "shape":"MaxResults", - "documentation":"

Indicates the maximum number of applications requested.

" + "documentation":"

Indicates the maximum number of compliance drifts requested.

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

Indicates the unique token number of the next application to be checked for compliance and regulatory requirements from the list of applications.

" + "documentation":"

Null, or the token from a previous call to get the next set of results.

" } } }, @@ -3270,7 +3659,7 @@ }, "nextToken":{ "shape":"NextToken", - "documentation":"

Token number of the next application to be checked for compliance and regulatory requirements from the list of applications.

" + "documentation":"

Null, or the token from a previous call to get the next set of results.

" } } }, @@ -3690,7 +4079,7 @@ }, "reverseOrder":{ "shape":"BooleanOptional", - "documentation":"

The application list is sorted based on the values of lastAppComplianceEvaluationTime field. By default, application list is sorted in ascending order. To sort the appliation list in descending order, set this field to True.

", + "documentation":"

The application list is sorted based on the values of lastAppComplianceEvaluationTime field. By default, application list is sorted in ascending order. To sort the application list in descending order, set this field to True.

", "location":"querystring", "locationName":"reverseOrder" }, @@ -3813,6 +4202,43 @@ } } }, + "ListResourceGroupingRecommendationsRequest":{ + "type":"structure", + "members":{ + "appArn":{ + "shape":"Arn", + "documentation":"

Amazon Resource Name (ARN) of the Resilience Hub application. The format for this ARN is: arn:partition:resiliencehub:region:account:app/app-id. For more information about ARNs, see Amazon Resource Names (ARNs) in the Amazon Web Services General Reference guide.

", + "location":"querystring", + "locationName":"appArn" + }, + "maxResults":{ + "shape":"MaxResults", + "documentation":"

Maximum number of grouping recommendations to be displayed per Resilience Hub application.

", + "location":"querystring", + "locationName":"maxResults" + }, + "nextToken":{ + "shape":"NextToken", + "documentation":"

Null, or the token from a previous call to get the next set of results.

", + "location":"querystring", + "locationName":"nextToken" + } + } + }, + "ListResourceGroupingRecommendationsResponse":{ + "type":"structure", + "required":["groupingRecommendations"], + "members":{ + "groupingRecommendations":{ + "shape":"GroupingRecommendationList", + "documentation":"

List of resource grouping recommendations generated by Resilience Hub.

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

Null, or the token from a previous call to get the next set of results.

" + } + } + }, "ListSopRecommendationsRequest":{ "type":"structure", "required":["assessmentArn"], @@ -4207,7 +4633,8 @@ "enum":[ "BreachedUnattainable", "BreachedCanMeet", - "MetCanImprove" + "MetCanImprove", + "MissingPolicy" ] }, "RecommendationDisruptionCompliance":{ @@ -4375,6 +4802,61 @@ "max":4, "min":1 }, + "RejectGroupingRecommendationEntries":{ + "type":"list", + "member":{"shape":"RejectGroupingRecommendationEntry"}, + "max":30, + "min":1 + }, + "RejectGroupingRecommendationEntry":{ + "type":"structure", + "required":["groupingRecommendationId"], + "members":{ + "groupingRecommendationId":{ + "shape":"String255", + "documentation":"

Indicates the identifier of the grouping recommendation.

" + }, + "rejectionReason":{ + "shape":"GroupingRecommendationRejectionReason", + "documentation":"

Indicates the reason you had selected while rejecting a grouping recommendation.

" + } + }, + "documentation":"

Indicates the rejected grouping recommendation.

" + }, + "RejectResourceGroupingRecommendationsRequest":{ + "type":"structure", + "required":[ + "appArn", + "entries" + ], + "members":{ + "appArn":{ + "shape":"Arn", + "documentation":"

Amazon Resource Name (ARN) of the Resilience Hub application. The format for this ARN is: arn:partition:resiliencehub:region:account:app/app-id. For more information about ARNs, see Amazon Resource Names (ARNs) in the Amazon Web Services General Reference guide.

" + }, + "entries":{ + "shape":"RejectGroupingRecommendationEntries", + "documentation":"

Indicates the list of resource grouping recommendations you have selected to exclude from your application.

" + } + } + }, + "RejectResourceGroupingRecommendationsResponse":{ + "type":"structure", + "required":[ + "appArn", + "failedEntries" + ], + "members":{ + "appArn":{ + "shape":"Arn", + "documentation":"

Amazon Resource Name (ARN) of the Resilience Hub application. The format for this ARN is: arn:partition:resiliencehub:region:account:app/app-id. For more information about ARNs, see Amazon Resource Names (ARNs) in the Amazon Web Services General Reference guide.

" + }, + "failedEntries":{ + "shape":"FailedGroupingRecommendationEntries", + "documentation":"

Indicates the list of resource grouping recommendations that failed to get excluded in your application.

" + } + } + }, "RemoveDraftAppVersionResourceMappingsRequest":{ "type":"structure", "required":["appArn"], @@ -4625,7 +5107,7 @@ "members":{ "hasMoreErrors":{ "shape":"BooleanOptional", - "documentation":"

This indicates if there are more errors not listed in the resourceErrors list.

" + "documentation":"

This indicates if there are more errors not listed in the resourceErrors list.

" }, "resourceErrors":{ "shape":"ResourceErrorList", @@ -4765,6 +5247,15 @@ "type":"string", "pattern":".*" }, + "ResourcesGroupingRecGenStatusType":{ + "type":"string", + "enum":[ + "Pending", + "InProgress", + "Failed", + "Success" + ] + }, "RetryAfterSeconds":{ "type":"integer", "box":true @@ -4933,6 +5424,42 @@ } } }, + "StartResourceGroupingRecommendationTaskRequest":{ + "type":"structure", + "required":["appArn"], + "members":{ + "appArn":{ + "shape":"Arn", + "documentation":"

Amazon Resource Name (ARN) of the Resilience Hub application. The format for this ARN is: arn:partition:resiliencehub:region:account:app/app-id. For more information about ARNs, see Amazon Resource Names (ARNs) in the Amazon Web Services General Reference guide.

" + } + } + }, + "StartResourceGroupingRecommendationTaskResponse":{ + "type":"structure", + "required":[ + "appArn", + "groupingId", + "status" + ], + "members":{ + "appArn":{ + "shape":"Arn", + "documentation":"

Amazon Resource Name (ARN) of the Resilience Hub application. The format for this ARN is: arn:partition:resiliencehub:region:account:app/app-id. For more information about ARNs, see Amazon Resource Names (ARNs) in the Amazon Web Services General Reference guide.

" + }, + "errorMessage":{ + "shape":"String500", + "documentation":"

Indicates the error that occurred while executing a grouping recommendation task.

" + }, + "groupingId":{ + "shape":"String255", + "documentation":"

Indicates the identifier of the grouping recommendation task.

" + }, + "status":{ + "shape":"ResourcesGroupingRecGenStatusType", + "documentation":"

Status of the action.

" + } + } + }, "String1024":{ "type":"string", "max":1024, diff --git a/botocore/data/route53/2013-04-01/service-2.json b/botocore/data/route53/2013-04-01/service-2.json index 0399620f94..fcb3fac736 100644 --- a/botocore/data/route53/2013-04-01/service-2.json +++ b/botocore/data/route53/2013-04-01/service-2.json @@ -5,11 +5,13 @@ "endpointPrefix":"route53", "globalEndpoint":"route53.amazonaws.com", "protocol":"rest-xml", + "protocols":["rest-xml"], "serviceAbbreviation":"Route 53", "serviceFullName":"Amazon Route 53", "serviceId":"Route 53", "signatureVersion":"v4", - "uid":"route53-2013-04-01" + "uid":"route53-2013-04-01", + "auth":["aws.auth#sigv4"] }, "operations":{ "ActivateKeySigningKey":{ diff --git a/botocore/data/waf-regional/2016-11-28/endpoint-rule-set-1.json b/botocore/data/waf-regional/2016-11-28/endpoint-rule-set-1.json index 91d6cda52e..9117fef38a 100644 --- a/botocore/data/waf-regional/2016-11-28/endpoint-rule-set-1.json +++ b/botocore/data/waf-regional/2016-11-28/endpoint-rule-set-1.json @@ -40,7 +40,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -83,7 +82,8 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -96,7 +96,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -110,7 +109,6 @@ "assign": "PartitionResult" } ], - "type": "tree", "rules": [ { "conditions": [ @@ -133,7 +131,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -168,7 +165,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -179,14 +175,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS and DualStack are enabled, but this partition does not support one or both", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -200,14 +198,12 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ - true, { "fn": "getAttr", "argv": [ @@ -216,11 +212,11 @@ }, "supportsFIPS" ] - } + }, + true ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -231,14 +227,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS is enabled but this partition does not support FIPS", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -252,7 +250,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -272,7 +269,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -283,14 +279,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "DualStack is enabled but this partition does not support DualStack", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [], @@ -301,9 +299,11 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" } - ] + ], + "type": "tree" }, { "conditions": [], diff --git a/botocore/data/waf-regional/2016-11-28/service-2.json b/botocore/data/waf-regional/2016-11-28/service-2.json index bbf6036e1a..71e9730153 100644 --- a/botocore/data/waf-regional/2016-11-28/service-2.json +++ b/botocore/data/waf-regional/2016-11-28/service-2.json @@ -5,12 +5,14 @@ "endpointPrefix":"waf-regional", "jsonVersion":"1.1", "protocol":"json", + "protocols":["json"], "serviceAbbreviation":"WAF Regional", "serviceFullName":"AWS WAF Regional", "serviceId":"WAF Regional", "signatureVersion":"v4", "targetPrefix":"AWSWAF_Regional_20161128", - "uid":"waf-regional-2016-11-28" + "uid":"waf-regional-2016-11-28", + "auth":["aws.auth#sigv4"] }, "operations":{ "AssociateWebACL":{ diff --git a/docs/source/conf.py b/docs/source/conf.py index 3690369066..2ef6347021 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.34.1' # The full version, including alpha/beta/rc tags. -release = '1.34.152' +release = '1.34.153' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.