Skip to content

Commit 374c632

Browse files
Merge branch 'release-1.42.57' into develop
* release-1.42.57: Bumping version to 1.42.57 Update endpoints model Update to latest models
2 parents 14b2696 + 6a6ee17 commit 374c632

10 files changed

Lines changed: 302 additions & 10 deletions

File tree

.changes/1.42.57.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[
2+
{
3+
"category": "``batch``",
4+
"description": "AWS Batch documentation update for service job capacity units.",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``ec2``",
9+
"description": "Add support for EC2 Capacity Blocks in Local Zones.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``ecr``",
14+
"description": "Update repository name regex to comply with OCI Distribution Specification",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``neptune``",
19+
"description": "Neptune global clusters now supports tags",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``wafv2``",
24+
"description": "AWS WAF now supports GetTopPathStatisticsByTraffic that provides aggregated statistics on the top URI paths accessed by bot traffic. Use this operation to see which paths receive the most bot traffic, identify the specific bots accessing them, and filter by category, organization, or bot name.",
25+
"type": "api-change"
26+
}
27+
]

CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
CHANGELOG
33
=========
44

5+
1.42.57
6+
=======
7+
8+
* api-change:``batch``: AWS Batch documentation update for service job capacity units.
9+
* api-change:``ec2``: Add support for EC2 Capacity Blocks in Local Zones.
10+
* api-change:``ecr``: Update repository name regex to comply with OCI Distribution Specification
11+
* api-change:``neptune``: Neptune global clusters now supports tags
12+
* api-change:``wafv2``: AWS WAF now supports GetTopPathStatisticsByTraffic that provides aggregated statistics on the top URI paths accessed by bot traffic. Use this operation to see which paths receive the most bot traffic, identify the specific bots accessing them, and filter by category, organization, or bot name.
13+
14+
515
1.42.56
616
=======
717

botocore/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import re
1818
from logging import NullHandler
1919

20-
__version__ = '1.42.56'
20+
__version__ = '1.42.57'
2121

2222

2323
# Configure default logger to do nothing

botocore/data/batch/2016-08-10/service-2.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2980,7 +2980,7 @@
29802980
"members":{
29812981
"capacityUnit":{
29822982
"shape":"String",
2983-
"documentation":"<p>The unit of measure for the capacity usage. For compute jobs, this is <code>VCPU</code> for Amazon EC2 and <code>cpu</code> for Amazon EKS. For service jobs, this is <code>NUM_INSTANCES</code>.</p>"
2983+
"documentation":"<p>The unit of measure for the capacity usage. For compute jobs, this is <code>VCPU</code> for Amazon EC2 and <code>cpu</code> for Amazon EKS. For service jobs, this is the instance type.</p>"
29842984
},
29852985
"quantity":{
29862986
"shape":"Double",
@@ -4380,7 +4380,7 @@
43804380
"members":{
43814381
"capacityUnit":{
43824382
"shape":"String",
4383-
"documentation":"<p>The unit of measure for the capacity usage. For compute jobs, this is <code>VCPU</code> for Amazon EC2 and <code>cpu</code> for Amazon EKS. For service jobs, this is <code>NUM_INSTANCES</code>.</p>"
4383+
"documentation":"<p>The unit of measure for the capacity usage. For compute jobs, this is <code>VCPU</code> for Amazon EC2 and <code>cpu</code> for Amazon EKS. For service jobs, this is the instance type.</p>"
43844384
},
43854385
"quantity":{
43864386
"shape":"Double",
@@ -4771,7 +4771,7 @@
47714771
"members":{
47724772
"capacityUnit":{
47734773
"shape":"String",
4774-
"documentation":"<p>The unit of measure for the service job capacity usage. For service jobs, this is <code>NUM_INSTANCES</code>.</p>"
4774+
"documentation":"<p>The unit of measure for the service job capacity usage. For service jobs, this is the instance type.</p>"
47754775
},
47764776
"quantity":{
47774777
"shape":"Double",
@@ -4789,7 +4789,7 @@
47894789
"members":{
47904790
"capacityUnit":{
47914791
"shape":"String",
4792-
"documentation":"<p>The unit of measure for the service job capacity usage. For service jobs, this is <code>NUM_INSTANCES</code>.</p>"
4792+
"documentation":"<p>The unit of measure for the service job capacity usage. For service jobs, this is the instance type.</p>"
47934793
},
47944794
"quantity":{
47954795
"shape":"Double",

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12144,6 +12144,11 @@
1214412144
"shape":"String",
1214512145
"documentation":"<p>The currency of the payment for the Capacity Block extension.</p>",
1214612146
"locationName":"currencyCode"
12147+
},
12148+
"ZoneType":{
12149+
"shape":"String",
12150+
"documentation":"<p>The type of zone where the Capacity Block extension is located.</p>",
12151+
"locationName":"zoneType"
1214712152
}
1214812153
},
1214912154
"documentation":"<p>Describes a Capacity Block extension. With an extension, you can extend the duration of time for an existing Capacity Block.</p>"
@@ -12210,6 +12215,11 @@
1221012215
"shape":"CapacityReservationTenancy",
1221112216
"documentation":"<p>Indicates the tenancy of the Capacity Block extension offering. A Capacity Block can have one of the following tenancy settings:</p> <ul> <li> <p> <code>default</code> - The Capacity Block is created on hardware that is shared with other Amazon Web Services accounts.</p> </li> <li> <p> <code>dedicated</code> - The Capacity Block is created on single-tenant hardware that is dedicated to a single Amazon Web Services account.</p> </li> </ul>",
1221212217
"locationName":"tenancy"
12218+
},
12219+
"ZoneType":{
12220+
"shape":"String",
12221+
"documentation":"<p>The type of zone where the Capacity Block extension offering is available.</p>",
12222+
"locationName":"zoneType"
1221312223
}
1221412224
},
1221512225
"documentation":"<p>The recommended Capacity Block extension that fits your search requirements.</p>"
@@ -12319,6 +12329,11 @@
1231912329
"shape":"Integer",
1232012330
"documentation":"<p>The number of minutes (in addition to <code>capacityBlockDurationHours</code>) for the duration of the Capacity Block reservation. For example, if a Capacity Block starts at <b>08:55</b> and ends at <b>11:30</b>, the minutes field would be <b>35</b>.</p>",
1232112331
"locationName":"capacityBlockDurationMinutes"
12332+
},
12333+
"ZoneType":{
12334+
"shape":"String",
12335+
"documentation":"<p>The type of zone where the Capacity Block offering is available.</p>",
12336+
"locationName":"zoneType"
1232212337
}
1232312338
},
1232412339
"documentation":"<p>The recommended Capacity Block that fits your search requirements.</p>"
@@ -24019,6 +24034,10 @@
2401924034
"UltraserverCount":{
2402024035
"shape":"Integer",
2402124036
"documentation":"<p>The number of EC2 UltraServers in the offerings.</p>"
24037+
},
24038+
"AllAvailabilityZones":{
24039+
"shape":"Boolean",
24040+
"documentation":"<p> Include all Availability Zones and Local Zones, regardless of your opt-in status. If you do not use this parameter, the results include available offerings from all Availability Zones in the Amazon Web Services Region and Local Zones you are opted into. </p>"
2402224041
}
2402324042
}
2402424043
},

botocore/data/ecr/2015-09-21/service-2.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3642,7 +3642,7 @@
36423642
"type":"string",
36433643
"max":256,
36443644
"min":1,
3645-
"pattern":"^((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*/?|ROOT)$"
3645+
"pattern":"^([a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*(\\/[a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*)*\\/?|ROOT)$"
36463646
},
36473647
"PrefixList":{
36483648
"type":"list",
@@ -3720,7 +3720,7 @@
37203720
"type":"string",
37213721
"max":30,
37223722
"min":2,
3723-
"pattern":"^((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*/?|ROOT)$"
3723+
"pattern":"^([a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*(\\/[a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*)*\\/?|ROOT)$"
37243724
},
37253725
"PullThroughCacheRuleRepositoryPrefixList":{
37263726
"type":"list",
@@ -4368,7 +4368,7 @@
43684368
"type":"string",
43694369
"max":256,
43704370
"min":2,
4371-
"pattern":"(?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*"
4371+
"pattern":"[a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*(\\/[a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*)*"
43724372
},
43734373
"RepositoryNameList":{
43744374
"type":"list",

botocore/data/endpoints.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16267,6 +16267,7 @@
1626716267
"tags" : [ "dualstack" ]
1626816268
} ]
1626916269
},
16270+
"ap-southeast-5" : { },
1627016271
"ca-central-1" : {
1627116272
"variants" : [ {
1627216273
"hostname" : "mediaconvert-fips.ca-central-1.amazonaws.com",
@@ -21535,6 +21536,7 @@
2153521536
"ap-southeast-3" : { },
2153621537
"ap-southeast-4" : { },
2153721538
"ap-southeast-5" : { },
21539+
"ap-southeast-6" : { },
2153821540
"ap-southeast-7" : { },
2153921541
"ca-central-1" : { },
2154021542
"ca-west-1" : { },
@@ -40652,6 +40654,11 @@
4065240654
"eusc-de-east-1" : { }
4065340655
}
4065440656
},
40657+
"runtime.sagemaker" : {
40658+
"endpoints" : {
40659+
"eusc-de-east-1" : { }
40660+
}
40661+
},
4065540662
"s3" : {
4065640663
"endpoints" : {
4065740664
"eusc-de-east-1" : { }

botocore/data/neptune/2014-10-31/service-2.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,10 @@
10261026
},
10271027
"errors":[
10281028
{"shape":"GlobalClusterNotFoundFault"},
1029-
{"shape":"InvalidGlobalClusterStateFault"}
1029+
{"shape":"GlobalClusterAlreadyExistsFault"},
1030+
{"shape":"InvalidGlobalClusterStateFault"},
1031+
{"shape":"InvalidDBClusterStateFault"},
1032+
{"shape":"InvalidDBInstanceStateFault"}
10301033
],
10311034
"documentation":"<p>Modify a setting for an Amazon Neptune global cluster. You can change one or more database configuration parameters by specifying these parameters and their new values in the request.</p>"
10321035
},
@@ -2190,6 +2193,14 @@
21902193
"shape":"BooleanOptional",
21912194
"documentation":"<p>The deletion protection setting for the new global database. The global database can't be deleted when deletion protection is enabled.</p>"
21922195
},
2196+
"DatabaseName":{
2197+
"shape":"String",
2198+
"documentation":"<p>The name for the new global database (up to 64 alpha-numeric characters.</p>"
2199+
},
2200+
"Tags":{
2201+
"shape":"TagList",
2202+
"documentation":"<p>Tags to assign to the global cluster.</p>"
2203+
},
21932204
"StorageEncrypted":{
21942205
"shape":"BooleanOptional",
21952206
"documentation":"<p>The storage encryption setting for the new global database cluster.</p>"
@@ -4647,6 +4658,10 @@
46474658
"shape":"String",
46484659
"documentation":"<p>The Neptune engine version used by the global database.</p>"
46494660
},
4661+
"DatabaseName":{
4662+
"shape":"String",
4663+
"documentation":"<p>The default database name within the new global database cluster.</p>"
4664+
},
46504665
"StorageEncrypted":{
46514666
"shape":"BooleanOptional",
46524667
"documentation":"<p>The storage encryption setting for the global database.</p>"
@@ -4662,6 +4677,10 @@
46624677
"FailoverState":{
46634678
"shape":"FailoverState",
46644679
"documentation":"<p>A data object containing all properties for the current state of an in-process or pending switchover or failover process for this global cluster (Neptune global database). This object is empty unless the <code>SwitchoverGlobalCluster</code> or <code>FailoverGlobalCluster</code> operation was called on this global cluster.</p>"
4680+
},
4681+
"TagList":{
4682+
"shape":"TagList",
4683+
"documentation":"<p>A list of global cluster tags.</p>"
46654684
}
46664685
},
46674686
"documentation":"<p>Contains the details of an Amazon Neptune global database.</p> <p>This data type is used as a response element for the <a>CreateGlobalCluster</a>, <a>DescribeGlobalClusters</a>, <a>ModifyGlobalCluster</a>, <a>DeleteGlobalCluster</a>, <a>FailoverGlobalCluster</a>, and <a>RemoveFromGlobalCluster</a> actions.</p>",

0 commit comments

Comments
 (0)