Skip to content

Commit 68ca78f

Browse files
Merge branch 'release-1.37.11' into develop
* release-1.37.11: Bumping version to 1.37.11 Update endpoints model Update to latest models
2 parents 1f1e7d4 + a9c8435 commit 68ca78f

File tree

10 files changed

+569
-78
lines changed

10 files changed

+569
-78
lines changed

.changes/1.37.11.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[
2+
{
3+
"category": "``ec2``",
4+
"description": "This release adds the GroupLongName field to the response of the DescribeAvailabilityZones API.",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``ecr``",
9+
"description": "This release adds Amazon ECR to Amazon ECR pull through cache rules support.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``ecs``",
14+
"description": "This is a documentation only update for Amazon ECS to address various tickets.",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``inspector2``",
19+
"description": "Adding componentArn to network reachability details",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``medialive``",
24+
"description": "Add an enum option DISABLED for Output Locking Mode under Global Configuration.",
25+
"type": "api-change"
26+
}
27+
]

CHANGELOG.rst

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
CHANGELOG
33
=========
44

5+
1.37.11
6+
=======
7+
8+
* api-change:``ec2``: This release adds the GroupLongName field to the response of the DescribeAvailabilityZones API.
9+
* api-change:``ecr``: This release adds Amazon ECR to Amazon ECR pull through cache rules support.
10+
* api-change:``ecs``: This is a documentation only update for Amazon ECS to address various tickets.
11+
* api-change:``inspector2``: Adding componentArn to network reachability details
12+
* api-change:``medialive``: Add an enum option DISABLED for Output Locking Mode under Global Configuration.
13+
14+
515
1.37.10
616
=======
717

botocore/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import os
1717
import re
1818

19-
__version__ = '1.37.10'
19+
__version__ = '1.37.11'
2020

2121

2222
class NullHandler(logging.Handler):

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

+13-8
Original file line numberDiff line numberDiff line change
@@ -9799,6 +9799,11 @@
97999799
"documentation":"<p>The ID of the zone that handles some of the Local Zone or Wavelength Zone control plane operations, such as API calls.</p>",
98009800
"locationName":"parentZoneId"
98019801
},
9802+
"GroupLongName":{
9803+
"shape":"String",
9804+
"documentation":"<p>The long name of the Availability Zone group, Local Zone group, or Wavelength Zone group.</p>",
9805+
"locationName":"groupLongName"
9806+
},
98029807
"State":{
98039808
"shape":"AvailabilityZoneState",
98049809
"documentation":"<p>The state of the Availability Zone, Local Zone, or Wavelength Zone. This value is always <code>available</code>.</p>",
@@ -20444,7 +20449,7 @@
2044420449
},
2044520450
"Filters":{
2044620451
"shape":"FilterList",
20447-
"documentation":"<p>The filters.</p> <ul> <li> <p> <code>group-name</code> - The name of the zone group for the Availability Zone (for example, <code>us-east-1-zg-1</code>), the Local Zone (for example, <code>us-west-2-lax-1</code>), or the Wavelength Zone (for example, <code>us-east-1-wl1</code>).</p> </li> <li> <p> <code>message</code> - The Zone message.</p> </li> <li> <p> <code>opt-in-status</code> - The opt-in status (<code>opted-in</code> | <code>not-opted-in</code> | <code>opt-in-not-required</code>).</p> </li> <li> <p> <code>parent-zone-id</code> - The ID of the zone that handles some of the Local Zone and Wavelength Zone control plane operations, such as API calls.</p> </li> <li> <p> <code>parent-zone-name</code> - The ID of the zone that handles some of the Local Zone and Wavelength Zone control plane operations, such as API calls.</p> </li> <li> <p> <code>region-name</code> - The name of the Region for the Zone (for example, <code>us-east-1</code>).</p> </li> <li> <p> <code>state</code> - The state of the Availability Zone, the Local Zone, or the Wavelength Zone (<code>available</code>).</p> </li> <li> <p> <code>zone-id</code> - The ID of the Availability Zone (for example, <code>use1-az1</code>), the Local Zone (for example, <code>usw2-lax1-az1</code>), or the Wavelength Zone (for example, <code>us-east-1-wl1-bos-wlz-1</code>).</p> </li> <li> <p> <code>zone-name</code> - The name of the Availability Zone (for example, <code>us-east-1a</code>), the Local Zone (for example, <code>us-west-2-lax-1a</code>), or the Wavelength Zone (for example, <code>us-east-1-wl1-bos-wlz-1</code>).</p> </li> <li> <p> <code>zone-type</code> - The type of zone (<code>availability-zone</code> | <code>local-zone</code> | <code>wavelength-zone</code>).</p> </li> </ul>",
20452+
"documentation":"<p>The filters.</p> <ul> <li> <p> <code>group-long-name</code> - The long name of the zone group for the Availability Zone (for example, <code>US West (Oregon) 1</code>), the Local Zone (for example, for Zone group <code>us-west-2-lax-1</code>, it is <code>US West (Los Angeles)</code>, or the Wavelength Zone (for example, for Zone group <code>us-east-1-wl1</code>, it is <code>US East (Verizon)</code>.</p> </li> <li> <p> <code>group-name</code> - The name of the zone group for the Availability Zone (for example, <code>us-east-1-zg-1</code>), the Local Zone (for example, <code>us-west-2-lax-1</code>), or the Wavelength Zone (for example, <code>us-east-1-wl1</code>).</p> </li> <li> <p> <code>message</code> - The Zone message.</p> </li> <li> <p> <code>opt-in-status</code> - The opt-in status (<code>opted-in</code> | <code>not-opted-in</code> | <code>opt-in-not-required</code>).</p> </li> <li> <p> <code>parent-zone-id</code> - The ID of the zone that handles some of the Local Zone and Wavelength Zone control plane operations, such as API calls.</p> </li> <li> <p> <code>parent-zone-name</code> - The ID of the zone that handles some of the Local Zone and Wavelength Zone control plane operations, such as API calls.</p> </li> <li> <p> <code>region-name</code> - The name of the Region for the Zone (for example, <code>us-east-1</code>).</p> </li> <li> <p> <code>state</code> - The state of the Availability Zone, the Local Zone, or the Wavelength Zone (<code>available</code>).</p> </li> <li> <p> <code>zone-id</code> - The ID of the Availability Zone (for example, <code>use1-az1</code>), the Local Zone (for example, <code>usw2-lax1-az1</code>), or the Wavelength Zone (for example, <code>us-east-1-wl1-bos-wlz-1</code>).</p> </li> <li> <p> <code>zone-name</code> - The name of the Availability Zone (for example, <code>us-east-1a</code>), the Local Zone (for example, <code>us-west-2-lax-1a</code>), or the Wavelength Zone (for example, <code>us-east-1-wl1-bos-wlz-1</code>).</p> </li> <li> <p> <code>zone-type</code> - The type of zone (<code>availability-zone</code> | <code>local-zone</code> | <code>wavelength-zone</code>).</p> </li> </ul>",
2044820453
"locationName":"Filter"
2044920454
}
2045020455
}
@@ -31911,7 +31916,7 @@
3191131916
},
3191231917
"KmsKeyId":{
3191331918
"shape":"KmsKeyId",
31914-
"documentation":"<p>Identifier (key ID, key alias, key ARN, or alias ARN) of the customer managed KMS key to use for EBS encryption.</p> <p>This parameter is only supported on <code>BlockDeviceMapping</code> objects called by <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html\">RequestSpotFleet</a>, and <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html\">RequestSpotInstances</a>.</p>"
31919+
"documentation":"<p>Identifier (key ID, key alias, key ARN, or alias ARN) of the customer managed KMS key to use for EBS encryption.</p> <p>This parameter is only supported on <code>BlockDeviceMapping</code> objects called by <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet.html\">CreateFleet</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html\">RequestSpotInstances</a>, and <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>.</p>"
3191531920
},
3191631921
"SnapshotId":{
3191731922
"shape":"SnapshotId",
@@ -32101,15 +32106,15 @@
3210132106
},
3210232107
"BlockDeviceMappings":{
3210332108
"shape":"FleetBlockDeviceMappingRequestList",
32104-
"documentation":"<p>The block device mapping, which defines the EBS volumes and instance store volumes to attach to the instance at launch. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html\">Block device mappings for volumes on Amazon EC2 instances</a> in the <i>Amazon EC2 User Guide</i>.</p> <p>To override a block device mapping specified in the launch template:</p> <ul> <li> <p>Specify the exact same <code>DeviceName</code> here as specified in the launch template.</p> </li> <li> <p>Only specify the parameters you want to change.</p> </li> <li> <p>Any parameters you don't specify here will keep their original launch template values.</p> </li> </ul> <p>To add a new block device mapping:</p> <ul> <li> <p>Specify a <code>DeviceName</code> that doesn't exist in the launch template.</p> </li> <li> <p>Specify all desired parameters here.</p> </li> </ul>",
32109+
"documentation":"<p>The block device mapping, which defines the EBS volumes and instance store volumes to attach to the instance at launch. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html\">Block device mappings for volumes on Amazon EC2 instances</a> in the <i>Amazon EC2 User Guide</i>.</p>",
3210532110
"locationName":"BlockDeviceMapping"
3210632111
},
3210732112
"InstanceRequirements":{
3210832113
"shape":"InstanceRequirementsRequest",
3210932114
"documentation":"<p>The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with those attributes.</p> <note> <p>If you specify <code>InstanceRequirements</code>, you can't specify <code>InstanceType</code>.</p> </note>"
3211032115
},
3211132116
"ImageId":{
32112-
"shape":"ImageId",
32117+
"shape":"String",
3211332118
"documentation":"<p>The ID of the AMI in the format <code>ami-17characters00000</code>.</p> <p>Alternatively, you can specify a Systems Manager parameter, using one of the following formats. The Systems Manager parameter will resolve to an AMI ID on launch.</p> <p>To reference a public parameter:</p> <ul> <li> <p> <code>resolve:ssm:<i>public-parameter</i> </code> </p> </li> </ul> <p>To reference a parameter stored in the same account:</p> <ul> <li> <p> <code>resolve:ssm:<i>parameter-name</i> </code> </p> </li> <li> <p> <code>resolve:ssm:<i>parameter-name:version-number</i> </code> </p> </li> <li> <p> <code>resolve:ssm:<i>parameter-name:label</i> </code> </p> </li> </ul> <p>To reference a parameter shared from another Amazon Web Services account:</p> <ul> <li> <p> <code>resolve:ssm:<i>parameter-ARN</i> </code> </p> </li> <li> <p> <code>resolve:ssm:<i>parameter-ARN:version-number</i> </code> </p> </li> <li> <p> <code>resolve:ssm:<i>parameter-ARN:label</i> </code> </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-launch-template.html#use-an-ssm-parameter-instead-of-an-ami-id\">Use a Systems Manager parameter instead of an AMI ID</a> in the <i>Amazon EC2 User Guide</i>.</p> <note> <p>This parameter is only available for fleets of type <code>instant</code>. For fleets of type <code>maintain</code> and <code>request</code>, you must specify the AMI ID in the launch template.</p> </note>"
3211432119
}
3211532120
},
@@ -37477,7 +37482,7 @@
3747737482
},
3747837483
"Tags":{
3747937484
"shape":"TagList",
37480-
"documentation":"<p>The instance tags associated with the event window. Any instances associated with the tags will be associated with the event window.</p>",
37485+
"documentation":"<p>The instance tags associated with the event window. Any instances associated with the tags will be associated with the event window.</p> <p>Note that while you can't create tag keys beginning with <code>aws:</code>, you can specify existing Amazon Web Services managed tag keys (with the <code>aws:</code> prefix) when specifying them as targets to associate with the event window.</p>",
3748137486
"locationName":"tagSet"
3748237487
},
3748337488
"DedicatedHostIds":{
@@ -38494,7 +38499,7 @@
3849438499
},
3849538500
"AcceleratorTypes":{
3849638501
"shape":"AcceleratorTypeSet",
38497-
"documentation":"<p>The accelerator types that must be on the instance type.</p> <ul> <li> <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p> </li> <li> <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p> </li> <li> <p>For instance types with Inference accelerators, specify <code>inference</code>.</p> </li> <li> <p>For instance types with Inference accelerators, specify <code>inference</code>.</p> </li> </ul> <p>Default: Any accelerator type</p>",
38502+
"documentation":"<p>The accelerator types that must be on the instance type.</p> <ul> <li> <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p> </li> <li> <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p> </li> <li> <p>For instance types with Inference accelerators, specify <code>inference</code>.</p> </li> </ul> <p>Default: Any accelerator type</p>",
3849838503
"locationName":"acceleratorTypeSet"
3849938504
},
3850038505
"AcceleratorCount":{
@@ -49900,7 +49905,7 @@
4990049905
"members":{
4990149906
"Managed":{
4990249907
"shape":"Boolean",
49903-
"documentation":"<p>If <code>true</code>, the resource is managed by an service provider.</p>",
49908+
"documentation":"<p>If <code>true</code>, the resource is managed by a service provider.</p>",
4990449909
"locationName":"managed"
4990549910
},
4990649911
"Principal":{
@@ -49909,7 +49914,7 @@
4990949914
"locationName":"principal"
4991049915
}
4991149916
},
49912-
"documentation":"<p>Describes whether the resource is managed by an service provider and, if so, describes the service provider that manages it.</p>"
49917+
"documentation":"<p>Describes whether the resource is managed by a service provider and, if so, describes the service provider that manages it.</p>"
4991349918
},
4991449919
"OrganizationArnStringList":{
4991549920
"type":"list",

0 commit comments

Comments
 (0)