Merge branch 'release-1.34.52' into develop

* release-1.34.52:
  Bumping version to 1.34.52
  Update to latest models

.changes/1.34.52.json

@@ -0,0 +1,32 @@
+[
+  {
+    "category": "``batch``",
+    "description": "This release adds Batch support for configuration of multicontainer jobs in ECS, Fargate, and EKS. This support is available for all types of jobs, including both array jobs and multi-node parallel jobs.",
+    "type": "api-change"
+  },
+  {
+    "category": "``bedrock-agent-runtime``",
+    "description": "This release adds support to override search strategy performed by the Retrieve and RetrieveAndGenerate APIs for Amazon Bedrock Agents",
+    "type": "api-change"
+  },
+  {
+    "category": "``ce``",
+    "description": "This release introduces the new API 'GetApproximateUsageRecords', which retrieves estimated usage records for hourly granularity or resource-level data at daily granularity.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "This release increases the range of MaxResults for GetNetworkInsightsAccessScopeAnalysisFindings to 1,000.",
+    "type": "api-change"
+  },
+  {
+    "category": "``iot``",
+    "description": "This release reduces the maximum results returned per query invocation from 500 to 100 for the SearchIndex API. This change has no implications as long as the API is invoked until the nextToken is NULL.",
+    "type": "api-change"
+  },
+  {
+    "category": "``wafv2``",
+    "description": "AWS WAF now supports configurable time windows for request aggregation with rate-based rules. Customers can now select time windows of 1 minute, 2 minutes or 10 minutes, in addition to the previously supported 5 minutes.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.34.52
+=======
+
+* api-change:``batch``: This release adds Batch support for configuration of multicontainer jobs in ECS, Fargate, and EKS. This support is available for all types of jobs, including both array jobs and multi-node parallel jobs.
+* api-change:``bedrock-agent-runtime``: This release adds support to override search strategy performed by the Retrieve and RetrieveAndGenerate APIs for Amazon Bedrock Agents
+* api-change:``ce``: This release introduces the new API 'GetApproximateUsageRecords', which retrieves estimated usage records for hourly granularity or resource-level data at daily granularity.
+* api-change:``ec2``: This release increases the range of MaxResults for GetNetworkInsightsAccessScopeAnalysisFindings to 1,000.
+* api-change:``iot``: This release reduces the maximum results returned per query invocation from 500 to 100 for the SearchIndex API. This change has no implications as long as the API is invoked until the nextToken is NULL.
+* api-change:``wafv2``: AWS WAF now supports configurable time windows for request aggregation with rate-based rules. Customers can now select time windows of 1 minute, 2 minutes or 10 minutes, in addition to the previously supported 5 minutes.
+
+
 1.34.51
 =======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.34.51'
+__version__ = '1.34.52'
 
 
 class NullHandler(logging.Handler):

botocore/data/bedrock-agent-runtime/2023-07-26/service-2.json

@@ -465,25 +465,30 @@
       ],
       "members":{
         "knowledgeBaseId":{"shape":"KnowledgeBaseId"},
-        "modelArn":{"shape":"BedrockModelArn"}
+        "modelArn":{"shape":"BedrockModelArn"},
+        "retrievalConfiguration":{"shape":"KnowledgeBaseRetrievalConfiguration"}
       },
       "documentation":"<p>Configurations for retrieval and generation for knowledge base.</p>"
     },
     "KnowledgeBaseVectorSearchConfiguration":{
       "type":"structure",
-      "required":["numberOfResults"],
       "members":{
         "numberOfResults":{
           "shape":"KnowledgeBaseVectorSearchConfigurationNumberOfResultsInteger",
-          "documentation":"<p>Top-K results to retrieve from knowledge base.</p>"
+          "documentation":"<p>Top-K results to retrieve from knowledge base.</p>",
+          "box":true
+        },
+        "overrideSearchType":{
+          "shape":"SearchType",
+          "documentation":"<p>Override the type of query to be performed on data store</p>"
         }
       },
       "documentation":"<p>Knowledge base vector search configuration</p>"
     },
     "KnowledgeBaseVectorSearchConfigurationNumberOfResultsInteger":{
       "type":"integer",
       "box":true,
-      "max":10,
+      "max":25,
       "min":1
     },
     "LambdaArn":{
@@ -748,7 +753,8 @@
           "documentation":"<p>Content of a retrieval result in text</p>"
         }
       },
-      "documentation":"<p>Content of a retrieval result.</p>"
+      "documentation":"<p>Content of a retrieval result.</p>",
+      "sensitive":true
     },
     "RetrievalResultLocation":{
       "type":"structure",
@@ -757,7 +763,8 @@
         "type":{"shape":"RetrievalResultLocationType"},
         "s3Location":{"shape":"RetrievalResultS3Location"}
       },
-      "documentation":"<p>The source location of a retrieval result.</p>"
+      "documentation":"<p>The source location of a retrieval result.</p>",
+      "sensitive":true
     },
     "RetrievalResultLocationType":{
       "type":"string",
@@ -888,6 +895,14 @@
       "member":{"shape":"RetrievedReference"},
       "documentation":"<p>list of retrieved references</p>"
     },
+    "SearchType":{
+      "type":"string",
+      "documentation":"<p>Query type to be performed on data store.</p>",
+      "enum":[
+        "HYBRID",
+        "SEMANTIC"
+      ]
+    },
     "ServiceQuotaExceededException":{
       "type":"structure",
       "members":{
@@ -985,7 +1000,8 @@
         },
         "span":{"shape":"Span"}
       },
-      "documentation":"<p>Text response part</p>"
+      "documentation":"<p>Text response part</p>",
+      "sensitive":true
     },
     "ThrottlingException":{
       "type":"structure",

botocore/data/ce/2017-10-25/service-2.json

@@ -155,6 +155,20 @@
       ],
       "documentation":"<p>Retrieves the cost anomaly subscription objects for your account. You can filter using a list of cost anomaly monitor Amazon Resource Names (ARNs). </p>"
     },
+    "GetApproximateUsageRecords":{
+      "name":"GetApproximateUsageRecords",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetApproximateUsageRecordsRequest"},
+      "output":{"shape":"GetApproximateUsageRecordsResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"},
+        {"shape":"DataUnavailableException"}
+      ],
+      "documentation":"<p>Retrieves estimated usage records for hourly granularity or resource-level data at daily granularity.</p>"
+    },
     "GetCostAndUsage":{
       "name":"GetCostAndUsage",
       "http":{
@@ -780,6 +794,18 @@
       "type":"list",
       "member":{"shape":"AnomalySubscription"}
     },
+    "ApproximateUsageRecordsPerService":{
+      "type":"map",
+      "key":{"shape":"GenericString"},
+      "value":{"shape":"NonNegativeLong"}
+    },
+    "ApproximationDimension":{
+      "type":"string",
+      "enum":[
+        "SERVICE",
+        "RESOURCE"
+      ]
+    },
     "Arn":{
       "type":"string",
       "max":2048,
@@ -2063,6 +2089,44 @@
         }
       }
     },
+    "GetApproximateUsageRecordsRequest":{
+      "type":"structure",
+      "required":[
+        "Granularity",
+        "ApproximationDimension"
+      ],
+      "members":{
+        "Granularity":{
+          "shape":"Granularity",
+          "documentation":"<p>How granular you want the data to be. You can enable data at hourly or daily granularity.</p>"
+        },
+        "Services":{
+          "shape":"UsageServices",
+          "documentation":"<p>The service metadata for the service or services you want to query. If not specified, all elements are returned.</p>"
+        },
+        "ApproximationDimension":{
+          "shape":"ApproximationDimension",
+          "documentation":"<p>The service to evaluate for the usage records. You can choose resource-level data at daily granularity, or hourly granularity with or without resource-level data.</p>"
+        }
+      }
+    },
+    "GetApproximateUsageRecordsResponse":{
+      "type":"structure",
+      "members":{
+        "Services":{
+          "shape":"ApproximateUsageRecordsPerService",
+          "documentation":"<p>The service metadata for the service or services in the response.</p>"
+        },
+        "TotalRecords":{
+          "shape":"NonNegativeLong",
+          "documentation":"<p>The total number of usage records for all services in the services list.</p>"
+        },
+        "LookbackPeriod":{
+          "shape":"DateInterval",
+          "documentation":"<p>The lookback period that's used for the estimation.</p>"
+        }
+      }
+    },
     "GetCostAndUsageRequest":{
       "type":"structure",
       "required":[
@@ -3297,6 +3361,10 @@
       "type":"integer",
       "min":0
     },
+    "NonNegativeLong":{
+      "type":"long",
+      "min":0
+    },
     "NullableNonNegativeDouble":{
       "type":"double",
       "min":0.0
@@ -4995,6 +5063,10 @@
         }
       }
     },
+    "UsageServices":{
+      "type":"list",
+      "member":{"shape":"GenericString"}
+    },
     "UtilizationByTime":{
       "type":"structure",
       "members":{

botocore/data/ec2/2016-11-15/service-2.json

@@ -31197,6 +31197,11 @@
         }
       }
     },
+    "GetNetworkInsightsAccessScopeAnalysisFindingsMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
     "GetNetworkInsightsAccessScopeAnalysisFindingsRequest":{
       "type":"structure",
       "required":["NetworkInsightsAccessScopeAnalysisId"],
@@ -31206,7 +31211,7 @@
           "documentation":"<p>The ID of the Network Access Scope analysis.</p>"
         },
         "MaxResults":{
-          "shape":"NetworkInsightsMaxResults",
+          "shape":"GetNetworkInsightsAccessScopeAnalysisFindingsMaxResults",
           "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
         },
         "NextToken":{