Skip to content

Commit bca60ef

Browse files
Merge branch 'release-1.44.25'
* release-1.44.25: Bumping version to 1.44.25 Update changelog based on model updates Update ParamShorthand DocGen to fix the case of a structure within a map. (#10014)
2 parents 3af1873 + b11fddb commit bca60ef

8 files changed

Lines changed: 64 additions & 5 deletions

File tree

.changes/1.44.25.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[
2+
{
3+
"category": "``connectcases``",
4+
"description": "Amazon Connect now enables you to use tag-based access controls to define who can access specific cases. You can associate tags with case templates and configure security profiles to determine which users can access cases with those tags.",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``ec2``",
9+
"description": "DescribeInstanceTypes API response now includes an additionalFlexibleNetworkInterfaces field, the number of interfaces attachable to an instance when using flexible Elastic Network Adapter (ENA) queues in addition to the base number specified by maximumNetworkInterfaces.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``evidently``",
14+
"description": "Deprecate all Evidently API for AWS CloudWatch Evidently deprecation",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``groundstation``",
19+
"description": "Adds support for AWS Ground Station Telemetry.",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "documentation",
24+
"description": "Fixed shorthand example generation in documentation.",
25+
"type": "bugfix"
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.44.25
6+
=======
7+
8+
* api-change:``connectcases``: Amazon Connect now enables you to use tag-based access controls to define who can access specific cases. You can associate tags with case templates and configure security profiles to determine which users can access cases with those tags.
9+
* api-change:``ec2``: DescribeInstanceTypes API response now includes an additionalFlexibleNetworkInterfaces field, the number of interfaces attachable to an instance when using flexible Elastic Network Adapter (ENA) queues in addition to the base number specified by maximumNetworkInterfaces.
10+
* api-change:``evidently``: Deprecate all Evidently API for AWS CloudWatch Evidently deprecation
11+
* api-change:``groundstation``: Adds support for AWS Ground Station Telemetry.
12+
* bugfix:documentation: Fixed shorthand example generation in documentation.
13+
14+
515
1.44.24
616
=======
717

awscli/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import os
2020

21-
__version__ = '1.44.24'
21+
__version__ = '1.44.25'
2222

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

awscli/argprocess.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,11 @@ def _list_docs(self, argument_model, stack):
536536

537537
def _map_docs(self, argument_model, stack):
538538
k = argument_model.key
539-
value_docs = self._shorthand_docs(argument_model.value, stack)
539+
stack.append(argument_model.value.name)
540+
try:
541+
value_docs = self._shorthand_docs(argument_model.value, stack)
542+
finally:
543+
stack.pop()
540544
start = 'KeyName1=%s,KeyName2=%s' % (value_docs, value_docs)
541545
if k.enum and not stack:
542546
start += '\n\nWhere valid key names are:\n'

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.44.'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '1.44.24'
55+
release = '1.44.25'
5656

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

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ universal = 0
33

44
[metadata]
55
requires_dist =
6-
botocore==1.42.34
6+
botocore==1.42.35
77
docutils>=0.18.1,<=0.19
88
s3transfer>=0.16.0,<0.17.0
99
PyYAML>=3.10,<6.1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def find_version(*file_paths):
2424

2525

2626
install_requires = [
27-
'botocore==1.42.34',
27+
'botocore==1.42.35',
2828
'docutils>=0.18.1,<=0.19',
2929
's3transfer>=0.16.0,<0.17.0',
3030
'PyYAML>=3.10,<6.1',

tests/unit/test_argprocess.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,24 @@ def test_skip_deeply_nested_shorthand(self):
803803
generated_example = self.get_generated_example_for(argument)
804804
self.assertEqual(generated_example, '')
805805

806+
def test_structure_within_map(self):
807+
argument = self.create_argument(
808+
{
809+
'A': {
810+
'type': 'map',
811+
'key': {'type': 'string'},
812+
'value': {
813+
'type': 'structure',
814+
'members': {
815+
'B': {'type': 'string'},
816+
},
817+
},
818+
},
819+
}
820+
)
821+
generated_example = self.get_generated_example_for(argument)
822+
self.assertEqual('A={KeyName1={B=string},KeyName2={B=string}}', generated_example)
823+
806824

807825
class TestUnpackJSONParams(BaseArgProcessTest):
808826
def setUp(self):

0 commit comments

Comments
 (0)