Skip to content

Commit f9f02dc

Browse files
Merge branch 'release-1.40.33' into develop
* release-1.40.33: Bumping version to 1.40.33 Update to latest models
2 parents 4f0b58a + 0a27824 commit f9f02dc

File tree

7 files changed

+48
-15
lines changed

7 files changed

+48
-15
lines changed

.changes/1.40.33.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[
2+
{
3+
"category": "``ec2``",
4+
"description": "Add mac-m4.metal and mac-m4pro.metal instance types.",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``network-firewall``",
9+
"description": "Network Firewall now prevents TLS handshakes with the target server until after the Server Name Indication (SNI) has been seen and verified. The monitoring dashboard now provides deeper insights into PrivateLink endpoint candidates and offers filters based on IP addresses and protocol.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``pcs``",
14+
"description": "Add support for Amazon EC2 Capacity Blocks for ML",
15+
"type": "api-change"
16+
}
17+
]

CHANGELOG.rst

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

5+
1.40.33
6+
=======
7+
8+
* api-change:``ec2``: Add mac-m4.metal and mac-m4pro.metal instance types.
9+
* api-change:``network-firewall``: Network Firewall now prevents TLS handshakes with the target server until after the Server Name Indication (SNI) has been seen and verified. The monitoring dashboard now provides deeper insights into PrivateLink endpoint candidates and offers filters based on IP addresses and protocol.
10+
* api-change:``pcs``: Add support for Amazon EC2 Capacity Blocks for ML
11+
12+
513
1.40.32
614
=======
715

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.40.32'
20+
__version__ = '1.40.33'
2121

2222

2323
# Configure default logger to do nothing

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42529,7 +42529,9 @@
4252942529
"i8ge.24xlarge",
4253042530
"i8ge.48xlarge",
4253142531
"i8ge.metal-24xl",
42532-
"i8ge.metal-48xl"
42532+
"i8ge.metal-48xl",
42533+
"mac-m4.metal",
42534+
"mac-m4pro.metal"
4253342535
]
4253442536
},
4253542537
"InstanceTypeHypervisor":{

botocore/data/network-firewall/2020-11-12/service-2.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
{"shape":"ResourceNotFoundException"},
227227
{"shape":"ThrottlingException"}
228228
],
229-
"documentation":"<p>Deletes a transit gateway attachment from a Network Firewall. Either the firewall owner or the transit gateway owner can delete the attachment.</p> <important> <p>After you delete a transit gateway attachment, raffic will no longer flow through the firewall endpoints.</p> </important> <p>After you initiate the delete operation, use <a>DescribeFirewall</a> to monitor the deletion status.</p>"
229+
"documentation":"<p>Deletes a transit gateway attachment from a Network Firewall. Either the firewall owner or the transit gateway owner can delete the attachment.</p> <important> <p>After you delete a transit gateway attachment, traffic will no longer flow through the firewall endpoints.</p> </important> <p>After you initiate the delete operation, use <a>DescribeFirewall</a> to monitor the deletion status.</p>"
230230
},
231231
"DeleteResourcePolicy":{
232232
"name":"DeleteResourcePolicy",
@@ -695,7 +695,7 @@
695695
{"shape":"ResourceNotFoundException"},
696696
{"shape":"ThrottlingException"}
697697
],
698-
"documentation":"<p>Rejects a transit gateway attachment request for Network Firewall. When you reject the attachment request, Network Firewall cancels the creation of routing components between the transit gateway and firewall endpoints.</p> <p>Only the firewall owner can reject the attachment. After rejection, no traffic will flow through the firewall endpoints for this attachment.</p> <p>Use <a>DescribeFirewall</a> to monitor the rejection status. To accept the attachment instead of rejecting it, use <a>AcceptNetworkFirewallTransitGatewayAttachment</a>.</p> <note> <p>Once rejected, you cannot reverse this action. To establish connectivity, you must create a new transit gateway-attached firewall.</p> </note>"
698+
"documentation":"<p>Rejects a transit gateway attachment request for Network Firewall. When you reject the attachment request, Network Firewall cancels the creation of routing components between the transit gateway and firewall endpoints.</p> <p>Only the transit gateway owner can reject the attachment. After rejection, no traffic will flow through the firewall endpoints for this attachment.</p> <p>Use <a>DescribeFirewall</a> to monitor the rejection status. To accept the attachment instead of rejecting it, use <a>AcceptNetworkFirewallTransitGatewayAttachment</a>.</p> <note> <p>Once rejected, you cannot reverse this action. To establish connectivity, you must create a new transit gateway-attached firewall.</p> </note>"
699699
},
700700
"StartAnalysisReport":{
701701
"name":"StartAnalysisReport",
@@ -1522,7 +1522,7 @@
15221522
},
15231523
"AvailabilityZoneMappings":{
15241524
"shape":"AvailabilityZoneMappings",
1525-
"documentation":"<p>Required. The Availability Zones where you want to create firewall endpoints for a transit gateway-attached firewall. You must specify at least one Availability Zone. Consider enabling the firewall in every Availability Zone where you have workloads to maintain Availability Zone independence.</p> <p>You can modify Availability Zones later using <a>AssociateAvailabilityZones</a> or <a>DisassociateAvailabilityZones</a>, but this may briefly disrupt traffic. The <code>AvailabilityZoneChangeProtection</code> setting controls whether you can make these modifications.</p>"
1525+
"documentation":"<p>Required. The Availability Zones where you want to create firewall endpoints for a transit gateway-attached firewall. You must specify at least one Availability Zone. Consider enabling the firewall in every Availability Zone where you have workloads to maintain Availability Zone isolation.</p> <p>You can modify Availability Zones later using <a>AssociateAvailabilityZones</a> or <a>DisassociateAvailabilityZones</a>, but this may briefly disrupt traffic. The <code>AvailabilityZoneChangeProtection</code> setting controls whether you can make these modifications.</p>"
15261526
},
15271527
"AvailabilityZoneChangeProtection":{
15281528
"shape":"Boolean",
@@ -2410,6 +2410,7 @@
24102410
},
24112411
"Domain":{"type":"string"},
24122412
"EnableMonitoringDashboard":{"type":"boolean"},
2413+
"EnableTLSSessionHolding":{"type":"boolean"},
24132414
"EnabledAnalysisType":{
24142415
"type":"string",
24152416
"enum":[
@@ -2594,6 +2595,10 @@
25942595
"PolicyVariables":{
25952596
"shape":"PolicyVariables",
25962597
"documentation":"<p>Contains variables that you can use to override default Suricata settings in your firewall policy.</p>"
2598+
},
2599+
"EnableTLSSessionHolding":{
2600+
"shape":"EnableTLSSessionHolding",
2601+
"documentation":"<p>When true, prevents TCP and TLS packets from reaching destination servers until TLS Inspection has evaluated Server Name Indication (SNI) rules. Requires an associated TLS Inspection configuration.</p>"
25972602
}
25982603
},
25992604
"documentation":"<p>The firewall policy defines the behavior of a firewall using a collection of stateless and stateful rule groups and other settings. You can use one firewall policy for multiple firewalls. </p> <p>This, along with <a>FirewallPolicyResponse</a>, define the policy. You can retrieve all objects for a firewall policy by calling <a>DescribeFirewallPolicy</a>.</p>"

botocore/data/pcs/2023-02-10/service-2.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@
639639
},
640640
"purchaseOption":{
641641
"shape":"PurchaseOption",
642-
"documentation":"<p>Specifies how EC2 instances are purchased on your behalf. Amazon Web Services PCS supports On-Demand and Spot instances. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Instance purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
642+
"documentation":"<p>Specifies how EC2 instances are purchased on your behalf. PCS supports On-Demand Instances, Spot Instances, and Amazon EC2 Capacity Blocks for ML. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Amazon EC2 billing and purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about PCS support for Capacity Blocks, see <a href=\"https://docs.aws.amazon.com/pcs/latest/userguide/capacity-blocks.html\">Using Amazon EC2 Capacity Blocks for ML with PCS</a> in the <i>PCS User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
643643
},
644644
"customLaunchTemplate":{"shape":"CustomLaunchTemplate"},
645645
"iamInstanceProfileArn":{
@@ -649,7 +649,7 @@
649649
"scalingConfiguration":{"shape":"ScalingConfiguration"},
650650
"instanceConfigs":{
651651
"shape":"InstanceList",
652-
"documentation":"<p>A list of EC2 instance configurations that Amazon Web Services PCS can provision in the compute node group.</p>"
652+
"documentation":"<p>A list of EC2 instance configurations that PCS can provision in the compute node group.</p>"
653653
},
654654
"spotOptions":{"shape":"SpotOptions"},
655655
"slurmConfiguration":{"shape":"ComputeNodeGroupSlurmConfiguration"},
@@ -866,7 +866,7 @@
866866
},
867867
"purchaseOption":{
868868
"shape":"PurchaseOption",
869-
"documentation":"<p>Specifies how EC2 instances are purchased on your behalf. Amazon Web Services PCS supports On-Demand and Spot instances. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Instance purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
869+
"documentation":"<p>Specifies how EC2 instances are purchased on your behalf. PCS supports On-Demand Instances, Spot Instances, and Amazon EC2 Capacity Blocks for ML. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Amazon EC2 billing and purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about PCS support for Capacity Blocks, see <a href=\"https://docs.aws.amazon.com/pcs/latest/userguide/capacity-blocks.html\">Using Amazon EC2 Capacity Blocks for ML with PCS</a> in the <i>PCS User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
870870
},
871871
"customLaunchTemplate":{"shape":"CustomLaunchTemplate"},
872872
"iamInstanceProfileArn":{
@@ -879,7 +879,7 @@
879879
},
880880
"instanceConfigs":{
881881
"shape":"InstanceList",
882-
"documentation":"<p>A list of EC2 instance configurations that Amazon Web Services PCS can provision in the compute node group.</p>"
882+
"documentation":"<p>A list of EC2 instance configurations that PCS can provision in the compute node group.</p>"
883883
},
884884
"spotOptions":{"shape":"SpotOptions"},
885885
"slurmConfiguration":{
@@ -1332,7 +1332,7 @@
13321332
"members":{
13331333
"subnetIds":{
13341334
"shape":"SubnetIdList",
1335-
"documentation":"<p>The list of subnet IDs where Amazon Web Services PCS creates an Elastic Network Interface (ENI) to enable communication between managed controllers and Amazon Web Services PCS resources. Subnet IDs have the form <code>subnet-0123456789abcdef0</code>.</p> <p>Subnets can't be in Outposts, Wavelength or an Amazon Web Services Local Zone.</p> <note> <p>Amazon Web Services PCS currently supports only 1 subnet in this list.</p> </note>"
1335+
"documentation":"<p>The list of subnet IDs where PCS creates an Elastic Network Interface (ENI) to enable communication between managed controllers and PCS resources. Subnet IDs have the form <code>subnet-0123456789abcdef0</code>.</p> <p>Subnets can't be in Outposts, Wavelength or an Amazon Web Services Local Zone.</p> <note> <p>PCS currently supports only 1 subnet in this list.</p> </note>"
13361336
},
13371337
"securityGroupIds":{
13381338
"shape":"SecurityGroupIdList",
@@ -1349,7 +1349,8 @@
13491349
"type":"string",
13501350
"enum":[
13511351
"ONDEMAND",
1352-
"SPOT"
1352+
"SPOT",
1353+
"CAPACITY_BLOCK"
13531354
]
13541355
},
13551356
"Queue":{
@@ -1705,7 +1706,7 @@
17051706
"members":{
17061707
"secretArn":{
17071708
"shape":"String",
1708-
"documentation":"<p>The Amazon Resource Name (ARN) of the the shared Slurm key.</p>"
1709+
"documentation":"<p>The Amazon Resource Name (ARN) of the shared Slurm key.</p>"
17091710
},
17101711
"secretVersion":{
17111712
"shape":"String",
@@ -1749,7 +1750,7 @@
17491750
"members":{
17501751
"allocationStrategy":{
17511752
"shape":"SpotAllocationStrategy",
1752-
"documentation":"<p>The Amazon EC2 allocation strategy Amazon Web Services PCS uses to provision EC2 instances. Amazon Web Services PCS supports <b>lowest price</b>, <b>capacity optimized</b>, and <b>price capacity optimized</b>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-allocation-strategy.html\">Use allocation strategies to determine how EC2 Fleet or Spot Fleet fulfills Spot and On-Demand capacity</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to <b>price capacity optimized</b>.</p>"
1753+
"documentation":"<p>The Amazon EC2 allocation strategy PCS uses to provision EC2 instances. PCS supports <b>lowest price</b>, <b>capacity optimized</b>, and <b>price capacity optimized</b>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-allocation-strategy.html\">Use allocation strategies to determine how EC2 Fleet or Spot Fleet fulfills Spot and On-Demand capacity</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to <b>price capacity optimized</b>.</p>"
17531754
}
17541755
},
17551756
"documentation":"<p>Additional configuration when you specify <code>SPOT</code> as the <code>purchaseOption</code> for the <code>CreateComputeNodeGroup</code> API action.</p>"
@@ -1862,7 +1863,7 @@
18621863
"customLaunchTemplate":{"shape":"CustomLaunchTemplate"},
18631864
"purchaseOption":{
18641865
"shape":"PurchaseOption",
1865-
"documentation":"<p>Specifies how EC2 instances are purchased on your behalf. Amazon Web Services PCS supports On-Demand and Spot instances. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Instance purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
1866+
"documentation":"<p>Specifies how EC2 instances are purchased on your behalf. PCS supports On-Demand Instances, Spot Instances, and Amazon EC2 Capacity Blocks for ML. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Amazon EC2 billing and purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about PCS support for Capacity Blocks, see <a href=\"https://docs.aws.amazon.com/pcs/latest/userguide/capacity-blocks.html\">Using Amazon EC2 Capacity Blocks for ML with PCS</a> in the <i>PCS User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
18661867
},
18671868
"spotOptions":{"shape":"SpotOptions"},
18681869
"scalingConfiguration":{

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
# The short X.Y version.
6060
version = '1.40.'
6161
# The full version, including alpha/beta/rc tags.
62-
release = '1.40.32'
62+
release = '1.40.33'
6363

6464
# The language for content autogenerated by Sphinx. Refer to documentation
6565
# for a list of supported languages.

0 commit comments

Comments
 (0)