Merge branch 'release-1.25.62'

aws-sdk-python-automation · aws-sdk-python-automation · commit 925e5a0becc3 · 2022-08-26T18:11:49.000Z
* release-1.25.62: Bumping version to 1.25.62 Update changelog based on model updates Add note for Tagged Unions refactor config tests to be in CI and use `run_cmd` instead of `aws` (#7211) Update sidebar AWS logo in refs
diff --git a/.changes/1.25.62.json b/.changes/1.25.62.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "docs",
+    "description": "Generate a usage note for Tagged Union structures.",
+    "type": "enhancement"
+  },
+  {
+    "category": "``mediapackage``",
+    "description": "This release adds Ads AdTriggers and AdsOnDeliveryRestrictions to describe calls for CMAF endpoints on MediaPackage.",
+    "type": "api-change"
+  },
+  {
+    "category": "``rds``",
+    "description": "Removes support for RDS Custom from DBInstanceClass in ModifyDBInstance",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.25.62
+=======
+
+* enhancement:docs: Generate a usage note for Tagged Union structures.
+* api-change:``mediapackage``: This release adds Ads AdTriggers and AdsOnDeliveryRestrictions to describe calls for CMAF endpoints on MediaPackage.
+* api-change:``rds``: Removes support for RDS Custom from DBInstanceClass in ModifyDBInstance
+
+
 1.25.61
 =======
 
diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.25.61'
+__version__ = '1.25.62'
 
 #
 # Get our data path to be added to botocore's search path
diff --git a/awscli/clidocs.py b/awscli/clidocs.py
@@ -23,7 +23,8 @@
 from awscli.topictags import TopicTagDB
 from awscli.utils import (
     find_service_and_method_in_event_name, is_document_type,
-    operation_uses_document_types, is_streaming_blob_type
+    operation_uses_document_types, is_streaming_blob_type,
+    is_tagged_union_type
 )
 
 LOG = logging.getLogger(__name__)
@@ -56,6 +57,8 @@ def _get_argument_type_name(self, shape, default):
             return 'document'
         if is_streaming_blob_type(shape):
             return 'streaming blob'
+        if is_tagged_union_type(shape):
+            return 'tagged union structure'
         return default
 
     def _map_handlers(self, session, event_class, mapfn):
@@ -185,6 +188,8 @@ def doc_option(self, arg_name, help_command, **kwargs):
         doc.include_doc_string(argument.documentation)
         if is_streaming_blob_type(argument.argument_model):
             self._add_streaming_blob_note(doc)
+        if is_tagged_union_type(argument.argument_model):
+            self._add_tagged_union_note(argument.argument_model, doc)
         if hasattr(argument, 'argument_model'):
             self._document_enums(argument.argument_model, doc)
             self._document_nested_structure(argument.argument_model, doc)
@@ -264,6 +269,8 @@ def _do_doc_member(self, doc, member_name, member_shape, stack):
         doc.style.indent()
         doc.style.new_paragraph()
         doc.include_doc_string(docs)
+        if is_tagged_union_type(member_shape):
+            self._add_tagged_union_note(member_shape, doc)
         doc.style.new_paragraph()
         member_type_name = member_shape.type_name
         if member_type_name == 'structure':
@@ -290,6 +297,16 @@ def _add_streaming_blob_note(self, doc):
         doc.writeln(msg)
         doc.style.end_note()
 
+    def _add_tagged_union_note(self, shape, doc):
+        doc.style.start_note()
+        members_str = ", ".join(
+            [f'``{key}``' for key in shape.members.keys()]
+        )
+        msg = ("This is a Tagged Union structure. Only one of the "
+               f"following top level keys can be set: {members_str}.")
+        doc.writeln(msg)
+        doc.style.end_note()
+
 
 class ProviderDocumentEventHandler(CLIDocumentEventHandler):
 
diff --git a/awscli/customizations/configure/get.py b/awscli/customizations/configure/get.py
@@ -34,8 +34,12 @@ class ConfigureGetCommand(BasicCommand):
          'cli_type_name': 'string', 'positional_arg': True},
     ]
 
-    def __init__(self, session, stream=sys.stdout, error_stream=sys.stderr):
+    def __init__(self, session, stream=None, error_stream=None):
         super(ConfigureGetCommand, self).__init__(session)
+        if stream is None:
+            stream = sys.stdout
+        if error_stream is None:
+            error_stream = sys.stderr
         self._stream = stream
         self._error_stream = error_stream
 
diff --git a/awscli/customizations/configure/list.py b/awscli/customizations/configure/list.py
@@ -44,8 +44,10 @@ class ConfigureListCommand(BasicCommand):
         '\n'
     )
 
-    def __init__(self, session, stream=sys.stdout):
+    def __init__(self, session, stream=None):
         super(ConfigureListCommand, self).__init__(session)
+        if stream is None:
+            stream = sys.stdout
         self._stream = stream
 
     def _run_main(self, args, parsed_globals):
@@ -66,6 +68,7 @@ def _run_main(self, args, parsed_globals):
 
         region = self._lookup_config('region')
         self._display_config_value(region, 'region')
+        return 0
 
     def _display_config_value(self, config_value, config_name):
         self._stream.write('%10s %24s %16s    %s\n' % (
diff --git a/awscli/customizations/configure/set.py b/awscli/customizations/configure/set.py
@@ -105,3 +105,4 @@ def _run_main(self, args, parsed_globals):
             section = profile_to_section(profile)
         updated_config = {'__section__': section, varname: value}
         self._config_writer.update_config(updated_config, config_filename)
+        return 0
diff --git a/awscli/utils.py b/awscli/utils.py
@@ -159,6 +159,11 @@ def is_streaming_blob_type(shape):
             shape.serialization.get('streaming', False))
 
 
+def is_tagged_union_type(shape):
+    """Check if the shape is a tagged union structure."""
+    return getattr(shape, 'is_tagged_union', False)
+
+
 def operation_uses_document_types(operation_model):
     """Check if document types are ever used in the operation"""
     recording_visitor = ShapeRecordingVisitor()
diff --git a/doc/source/_static/logo.png b/doc/source/_static/logo.png
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.25.'
 # The full version, including alpha/beta/rc tags.
-release = '1.25.61'
+release = '1.25.62'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.27.60
+        botocore==1.27.61
         docutils>=0.10,<0.17
         s3transfer>=0.6.0,<0.7.0
         PyYAML>=3.10,<5.5
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.27.60',
+    'botocore==1.27.61',
     'docutils>=0.10,<0.17',
     's3transfer>=0.6.0,<0.7.0',
     'PyYAML>=3.10,<5.5',
diff --git a/tests/functional/configure/test_configure.py b/tests/functional/configure/test_configure.py
diff --git a/tests/integration/customizations/test_configure.py b/tests/integration/customizations/test_configure.py
diff --git a/tests/unit/test_clidocs.py b/tests/unit/test_clidocs.py
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"""`
`18`	`18`	`import os`
`19`	`19`
`20`		`-__version__ = '1.25.61'`
	`20`	`+__version__ = '1.25.62'`
`21`	`21`
`22`	`22`	`#`
`23`	`23`	`# Get our data path to be added to botocore's search path`