Skip to content

Commit 6dc3193

Browse files
aws-sdk-python-automationaws-sdk-python-automation
committed
Merge branch 'release-1.24.5'
* release-1.24.5: Bumping version to 1.24.5 Update changelog based on model updates Bump docutils upper bound to <0.17 Fix whitespace in cognito-idp admin-update-user-attributes example New CLI examples for ec2, lightsail, route53resolver
2 parents 2436eb8 + 601d6b4 commit 6dc3193

11 files changed

Lines changed: 182 additions & 154 deletions

File tree

‎.changes/1.24.5.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[
2+
{
3+
"category": "``comprehend``",
4+
"description": "Comprehend releases 14 new entity types for DetectPiiEntities and ContainsPiiEntities APIs.",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``logs``",
9+
"description": "Doc-only update to publish the new valid values for log retention",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "dependency",
14+
"description": "Bump upper bound of docutils to <0.17",
15+
"type": "enhancement"
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.24.5
6+
======
7+
8+
* api-change:``comprehend``: Comprehend releases 14 new entity types for DetectPiiEntities and ContainsPiiEntities APIs.
9+
* api-change:``logs``: Doc-only update to publish the new valid values for log retention
10+
* enhancement:dependency: Bump upper bound of docutils to <0.17
11+
12+
513
1.24.4
614
======
715

‎awscli/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"""
1818
import os
1919

20-
__version__ = '1.24.4'
20+
__version__ = '1.24.5'
2121

2222
#
2323
# Get our data path to be added to botocore's search path

‎awscli/examples/cognito-idp/admin-update-user-attributes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ This example updates a custom user attribute CustomAttr1 for user diego@example.
44

55
Command::
66

7-
aws cognito-idp admin-update-user-attributes --user-pool-id us-west-2_aaaaaaaaa --username diego@example.com --user-attributes Name="custom:CustomAttr1",Value="Purple"
7+
aws cognito-idp admin-update-user-attributes --user-pool-id us-west-2_aaaaaaaaa --username diego@example.com --user-attributes Name="custom:CustomAttr1",Value="Purple"
88

‎awscli/examples/ec2/modify-instance-metadata-options.rst‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,27 @@ Output::
4242
}
4343

4444
For more information, see `Instance metadata and user data <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html>`__ in the *Amazon Elastic Compute Cloud User Guide for Linux Instances*.
45+
46+
**Example 3: To enable instance metadata IPv6 endpoint for your instance**
47+
48+
The following ``modify-instance-metadata-options`` example shows you how to turn on the IPv6 endpoint for the instance metadata service. ::
49+
50+
aws ec2 modify-instance-metadata-options \
51+
--instance-id i-1234567898abcdef0 \
52+
--http-protocol-ipv6 enabled \
53+
--http-endpoint enabled
54+
55+
Output::
56+
57+
{
58+
"InstanceId": "i-1234567898abcdef0",
59+
"InstanceMetadataOptions": {
60+
"State": "pending",
61+
"HttpTokens": "required",
62+
"HttpPutResponseHopLimit": 1,
63+
"HttpEndpoint": "enabled",
64+
HttpProtocolIpv6": "enabled"
65+
}
66+
}
67+
68+
By default, the IPv6 endpoint is disabled. This is true even if you have launched an instance into an IPv6-only subnet. The IPv6 endpoint for IMDS is only accessible on instances built on the Nitro System. For more information, see `Instance metadata and user data <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html>`__ in the *Amazon Elastic Compute Cloud User Guide for Linux Instances*.

‎awscli/examples/lightsail/get-relational-database-bundles.rst‎

Lines changed: 102 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,102 @@
1-
**To get the bundles for new relational databases**
2-
3-
The following ``get-relational-database-bundles`` example displays details about all of the available relational database bundles that can be used to create new relational databases in Amazon Lightsail. ::
4-
5-
aws lightsail get-relational-database-bundles
6-
7-
Output::
8-
9-
{
10-
"bundles": [
11-
{
12-
"bundleId": "micro_1_0",
13-
"name": "Micro",
14-
"price": 15.0,
15-
"ramSizeInGb": 1.0,
16-
"diskSizeInGb": 40,
17-
"transferPerMonthInGb": 100,
18-
"cpuCount": 1,
19-
"isEncrypted": false,
20-
"isActive": true
21-
},
22-
{
23-
"bundleId": "micro_ha_1_0",
24-
"name": "Micro with High Availability",
25-
"price": 30.0,
26-
"ramSizeInGb": 1.0,
27-
"diskSizeInGb": 40,
28-
"transferPerMonthInGb": 100,
29-
"cpuCount": 1,
30-
"isEncrypted": false,
31-
"isActive": true
32-
},
33-
{
34-
"bundleId": "small_1_0",
35-
"name": "Small",
36-
"price": 30.0,
37-
"ramSizeInGb": 2.0,
38-
"diskSizeInGb": 80,
39-
"transferPerMonthInGb": 100,
40-
"cpuCount": 1,
41-
"isEncrypted": true,
42-
"isActive": true
43-
},
44-
{
45-
"bundleId": "small_ha_1_0",
46-
"name": "Small with High Availability",
47-
"price": 60.0,
48-
"ramSizeInGb": 2.0,
49-
"diskSizeInGb": 80,
50-
"transferPerMonthInGb": 100,
51-
"cpuCount": 1,
52-
"isEncrypted": true,
53-
"isActive": true
54-
},
55-
{
56-
"bundleId": "medium_1_0",
57-
"name": "Medium",
58-
"price": 60.0,
59-
"ramSizeInGb": 4.0,
60-
"diskSizeInGb": 120,
61-
"transferPerMonthInGb": 100,
62-
"cpuCount": 2,
63-
"isEncrypted": true,
64-
"isActive": true
65-
},
66-
{
67-
"bundleId": "medium_ha_1_0",
68-
"name": "Medium with High Availability",
69-
"price": 120.0,
70-
"ramSizeInGb": 4.0,
71-
"diskSizeInGb": 120,
72-
"transferPerMonthInGb": 100,
73-
"cpuCount": 2,
74-
"isEncrypted": true,
75-
"isActive": true
76-
},
77-
{
78-
"bundleId": "large_1_0",
79-
"name": "Large",
80-
"price": 115.0,
81-
"ramSizeInGb": 8.0,
82-
"diskSizeInGb": 240,
83-
"transferPerMonthInGb": 200,
84-
"cpuCount": 2,
85-
"isEncrypted": true,
86-
"isActive": true
87-
},
88-
{
89-
"bundleId": "large_ha_1_0",
90-
"name": "Large with High Availability",
91-
"price": 230.0,
92-
"ramSizeInGb": 8.0,
93-
"diskSizeInGb": 240,
94-
"transferPerMonthInGb": 200,
95-
"cpuCount": 2,
96-
"isEncrypted": true,
97-
"isActive": true
98-
}
99-
]
100-
}
1+
**To get the bundles for new relational databases**
2+
3+
The following ``get-relational-database-bundles`` example displays details about all of the available relational database bundles that can be used to create new relational databases in Amazon Lightsail. Note that the response does not include inactive bundles because the ``--include-inactive`` flag is not specified in the command. You cannot use inactive bundles to create new relational databases. ::
4+
5+
aws lightsail get-relational-database-bundles
6+
7+
Output::
8+
9+
{
10+
"bundles": [
11+
{
12+
"bundleId": "micro_2_0",
13+
"name": "Micro",
14+
"price": 15.0,
15+
"ramSizeInGb": 1.0,
16+
"diskSizeInGb": 40,
17+
"transferPerMonthInGb": 100,
18+
"cpuCount": 2,
19+
"isEncrypted": true,
20+
"isActive": true
21+
},
22+
{
23+
"bundleId": "micro_ha_2_0",
24+
"name": "Micro with High Availability",
25+
"price": 30.0,
26+
"ramSizeInGb": 1.0,
27+
"diskSizeInGb": 40,
28+
"transferPerMonthInGb": 100,
29+
"cpuCount": 2,
30+
"isEncrypted": true,
31+
"isActive": true
32+
},
33+
{
34+
"bundleId": "small_2_0",
35+
"name": "Small",
36+
"price": 30.0,
37+
"ramSizeInGb": 2.0,
38+
"diskSizeInGb": 80,
39+
"transferPerMonthInGb": 100,
40+
"cpuCount": 2,
41+
"isEncrypted": true,
42+
"isActive": true
43+
},
44+
{
45+
"bundleId": "small_ha_2_0",
46+
"name": "Small with High Availability",
47+
"price": 60.0,
48+
"ramSizeInGb": 2.0,
49+
"diskSizeInGb": 80,
50+
"transferPerMonthInGb": 100,
51+
"cpuCount": 2,
52+
"isEncrypted": true,
53+
"isActive": true
54+
},
55+
{
56+
"bundleId": "medium_2_0",
57+
"name": "Medium",
58+
"price": 60.0,
59+
"ramSizeInGb": 4.0,
60+
"diskSizeInGb": 120,
61+
"transferPerMonthInGb": 100,
62+
"cpuCount": 2,
63+
"isEncrypted": true,
64+
"isActive": true
65+
},
66+
{
67+
"bundleId": "medium_ha_2_0",
68+
"name": "Medium with High Availability",
69+
"price": 120.0,
70+
"ramSizeInGb": 4.0,
71+
"diskSizeInGb": 120,
72+
"transferPerMonthInGb": 100,
73+
"cpuCount": 2,
74+
"isEncrypted": true,
75+
"isActive": true
76+
},
77+
{
78+
"bundleId": "large_2_0",
79+
"name": "Large",
80+
"price": 115.0,
81+
"ramSizeInGb": 8.0,
82+
"diskSizeInGb": 240,
83+
"transferPerMonthInGb": 200,
84+
"cpuCount": 2,
85+
"isEncrypted": true,
86+
"isActive": true
87+
},
88+
{
89+
"bundleId": "large_ha_2_0",
90+
"name": "Large with High Availability",
91+
"price": 230.0,
92+
"ramSizeInGb": 8.0,
93+
"diskSizeInGb": 240,
94+
"transferPerMonthInGb": 200,
95+
"cpuCount": 2,
96+
"isEncrypted": true,
97+
"isActive": true
98+
}
99+
]
100+
}
101+
102+
For more information, see `Creating a database in Amazon Lightsail <https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-creating-a-database>`__ in the *Amazon Lightsail Developer Guide*.

‎awscli/examples/route53resolver/create-resolver-rule.rst‎

Lines changed: 22 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,41 @@
11
**To create a Resolver rule**
22

3-
The following ``create-resolver-rule`` example creates a Resolver forwarding rule. The rule uses the outbound endpoint ``rslvr-out-d5e5920e37example`` to forward DNS queries for example.com to the IP address 192.0.2.44. ::
3+
The following ``create-resolver-rule`` example creates a Resolver forwarding rule. The rule uses the outbound endpoint rslvr-out-d5e5920e37example to forward DNS queries for ``example.com`` to the IP addresses 10.24.8.75 and 10.24.8.156. ::
44

55
aws route53resolver create-resolver-rule \
66
--creator-request-id 2020-01-02-18:47 \
77
--domain-name example.com \
88
--name my-rule \
99
--resolver-endpoint-id rslvr-out-d5e5920e37example \
1010
--rule-type FORWARD \
11-
--target-ips="Ip=192.0.2.44"
11+
--target-ips="Ip=10.24.8.75" "Ip=10.24.8.156"
1212

1313
Output::
1414

1515
{
1616
"ResolverRule": {
17-
"Id": "rslvr-rr-42b60677c0example",
18-
"CreatorRequestId": "2020-01-02-18:47",
19-
"Arn": "arn:aws:route53resolver:us-west-2:111122223333:resolver-rule/rslvr-rr-42b60677c0example",
20-
"DomainName": "example.com.",
21-
"Status": "COMPLETE",
22-
"StatusMessage": "[Trace id: 1-5dc4b177-ff1d9d001a0f80005example] Successfully created Resolver Rule.",
23-
"RuleType": "FORWARD",
24-
"Name": "my-rule",
17+
"Status": "COMPLETE",
18+
"RuleType": "FORWARD",
19+
"ResolverEndpointId": "rslvr-out-d5e5920e37example",
20+
"Name": "my-rule",
21+
"DomainName": "example.com.",
22+
"CreationTime": "2022-05-10T21:35:30.923187Z",
2523
"TargetIps": [
2624
{
27-
"Ip": "192.0.2.44",
25+
"Ip": "10.24.8.75",
26+
"Port": 53
27+
},
28+
{
29+
"Ip": "10.24.8.156",
2830
"Port": 53
2931
}
30-
],
31-
"ResolverEndpointId": "rslvr-out-d5e5920e37example",
32-
"OwnerId": "111122223333",
33-
"ShareStatus": "NOT_SHARED"
32+
],
33+
"CreatorRequestId": "2022-05-10-16:33",
34+
"ModificationTime": "2022-05-10T21:35:30.923187Z",
35+
"ShareStatus": "NOT_SHARED",
36+
"Arn": "arn:aws:route53resolver:us-east-1:111117012054:resolver-rule/rslvr-rr-b1e0b905e93611111",
37+
"OwnerId": "111111111111",
38+
"Id": "rslvr-rr-rslvr-rr-b1e0b905e93611111",
39+
"StatusMessage": "[Trace id: 1-22222222-3e56afcc71a3724664f22e24] Successfully created Resolver Rule."
3440
}
35-
}
36-
37-
Alternatively, when you have complicated parameters with multiple values, you can choose to include the parameters in a JSON file and then specify the file when you call ``create-resolver-rule``. Here's the command, which includes a parameter that specifies the name and location of the JSON file. ::
38-
39-
aws route53resolver create-resolver-rule \
40-
--cli-input-json file://c:\temp\create-resolver-rule.json
41-
42-
Contents of ``create-resolver-rule.json``::
43-
44-
{
45-
"CreatorRequestId": "2020-01-02-18:47",
46-
"Name": "my-rule",
47-
"RuleType": "FORWARD",
48-
"DomainName": "example.com",
49-
"TargetIps": [
50-
{
51-
"Ip": "192.0.2.44",
52-
"Port": 53
53-
}
54-
],
55-
"ResolverEndpointId": "rslvr-out-d5e5920e37example",
56-
"Tags": [
57-
{
58-
"Key": "my-key",
59-
"Value": "my-value"
60-
}
61-
]
62-
}
63-
64-
For more information about rules, see `Managing Forwarding Rules <https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resolver-rules-managing.html>`__ in the *Amazon Route 53 Developer Guide*.
41+
}

‎doc/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# The short X.Y version.
5353
version = '1.24'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '1.24.4'
55+
release = '1.24.5'
5656

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

‎requirements-docs.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
jinja2<3.1
44

55

6-
docutils>=0.10,<0.16
7-
Sphinx==1.2.3
6+
docutils>=0.10,<0.17
7+
Sphinx==1.3.2
88
-e .

‎setup.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ universal = 0
33

44
[metadata]
55
requires_dist =
6-
botocore==1.26.4
7-
docutils>=0.10,<0.16
6+
botocore==1.26.5
7+
docutils>=0.10,<0.17
88
s3transfer>=0.5.0,<0.6.0
99
PyYAML>=3.10,<5.5
1010
colorama>=0.2.5,<0.4.5

0 commit comments

Comments
 (0)