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)

Author: aws-sdk-python-automation

.changes/1.44.25.json

@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``connectcases``",
+    "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.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "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.",
+    "type": "api-change"
+  },
+  {
+    "category": "``evidently``",
+    "description": "Deprecate all Evidently API for AWS CloudWatch Evidently deprecation",
+    "type": "api-change"
+  },
+  {
+    "category": "``groundstation``",
+    "description": "Adds support for AWS Ground Station Telemetry.",
+    "type": "api-change"
+  },
+  {
+    "category": "documentation",
+    "description": "Fixed shorthand example generation in documentation.",
+    "type": "bugfix"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.44.25
+=======
+
+* 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.
+* 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.
+* api-change:``evidently``: Deprecate all Evidently API for AWS CloudWatch Evidently deprecation
+* api-change:``groundstation``: Adds support for AWS Ground Station Telemetry.
+* bugfix:documentation: Fixed shorthand example generation in documentation.
+
+
 1.44.24
 =======
 

awscli/__init__.py

@@ -18,7 +18,7 @@
 
 import os
 
-__version__ = '1.44.24'
+__version__ = '1.44.25'
 
 #
 # Get our data path to be added to botocore's search path

awscli/argprocess.py

@@ -536,7 +536,11 @@ def _list_docs(self, argument_model, stack):
 
     def _map_docs(self, argument_model, stack):
         k = argument_model.key
-        value_docs = self._shorthand_docs(argument_model.value, stack)
+        stack.append(argument_model.value.name)
+        try:
+            value_docs = self._shorthand_docs(argument_model.value, stack)
+        finally:
+            stack.pop()
         start = 'KeyName1=%s,KeyName2=%s' % (value_docs, value_docs)
         if k.enum and not stack:
             start += '\n\nWhere valid key names are:\n'

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.44.'
 # The full version, including alpha/beta/rc tags.
-release = '1.44.24'
+release = '1.44.25'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.cfg

@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.42.34
+        botocore==1.42.35
         docutils>=0.18.1,<=0.19
         s3transfer>=0.16.0,<0.17.0
         PyYAML>=3.10,<6.1

setup.py

@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.42.34',
+    'botocore==1.42.35',
     'docutils>=0.18.1,<=0.19',
     's3transfer>=0.16.0,<0.17.0',
     'PyYAML>=3.10,<6.1',

tests/unit/test_argprocess.py

@@ -803,6 +803,24 @@ def test_skip_deeply_nested_shorthand(self):
         generated_example = self.get_generated_example_for(argument)
         self.assertEqual(generated_example, '')
 
+    def test_structure_within_map(self):
+        argument = self.create_argument(
+            {
+                'A': {
+                    'type': 'map',
+                    'key': {'type': 'string'},
+                    'value': {
+                        'type': 'structure',
+                        'members': {
+                            'B': {'type': 'string'},
+                        },
+                    },
+                },
+            }
+        )
+        generated_example = self.get_generated_example_for(argument)
+        self.assertEqual('A={KeyName1={B=string},KeyName2={B=string}}', generated_example)
+
 
 class TestUnpackJSONParams(BaseArgProcessTest):
     def setUp(self):