Merge branch 'release-1.42.56'

* release-1.42.56:
  Bumping version to 1.42.56
  Update changelog based on model updates
  Fix flaky S3 bucket name generation in integration tests (#9778)
  Add 'wire' as a valid value for cli_timestamp_format. (#9800)

Author: aws-sdk-python-automation

.changes/1.42.56.json

@@ -0,0 +1,32 @@
+[
+  {
+    "category": "``dynamodb``",
+    "description": "Add AccountID based endpoint metric to endpoint rules.",
+    "type": "api-change"
+  },
+  {
+    "category": "``emr``",
+    "description": "Added RECONFIGURING to the InstanceFleetState convenience enum.",
+    "type": "api-change"
+  },
+  {
+    "category": "``endpoint-rules``",
+    "description": "Update endpoint-rules command to latest version",
+    "type": "api-change"
+  },
+  {
+    "category": "``mediaconvert``",
+    "description": "This release adds the ability to set resolution for the black video generator and also adds the StartJobsQuery and GetJobsQueryResults APIs which allow asynchronous search of job history using new filters.",
+    "type": "api-change"
+  },
+  {
+    "category": "``meteringmarketplace``",
+    "description": "Added ClientToken parameter to MeterUsage API for specifying idempotent requests.",
+    "type": "api-change"
+  },
+  {
+    "category": "timestamps",
+    "description": "Add ``wire`` as a valid value for ``cli_timestamp_format``.",
+    "type": "enhancement"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.42.56
+=======
+
+* api-change:``dynamodb``: Add AccountID based endpoint metric to endpoint rules.
+* api-change:``emr``: Added RECONFIGURING to the InstanceFleetState convenience enum.
+* api-change:``endpoint-rules``: Update endpoint-rules command to latest version
+* api-change:``mediaconvert``: This release adds the ability to set resolution for the black video generator and also adds the StartJobsQuery and GetJobsQueryResults APIs which allow asynchronous search of job history using new filters.
+* api-change:``meteringmarketplace``: Added ClientToken parameter to MeterUsage API for specifying idempotent requests.
+* enhancement:timestamps: Add ``wire`` as a valid value for ``cli_timestamp_format``.
+
+
 1.42.55
 =======
 

awscli/__init__.py

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

awscli/customizations/scalarparse.py

@@ -49,17 +49,19 @@ def add_timestamp_parser(session):
     try:
         timestamp_format = session.get_scoped_config().get(
             'cli_timestamp_format',
-            'none')
+            'wire')
     except ProfileNotFound:
         # If a --profile is provided that does not exist, loading
         # a value from get_scoped_config will crash the CLI.
         # This function can be called as the first handler for
         # the session-initialized event, which happens before a
         # profile can be created, even if the command would have
         # successfully created a profile. Instead of crashing here
-        # on a ProfileNotFound the CLI should just use 'none'.
-        timestamp_format = 'none'
-    if timestamp_format == 'none':
+        # on a ProfileNotFound the CLI should just use 'wire'.
+        timestamp_format = 'wire'
+    # We also support 'none' for backwards compatibility reasons, though we
+    # document 'wire' instead.
+    if timestamp_format == 'wire' or timestamp_format == 'none':
         # For backwards compatibility reasons, we replace botocore's timestamp
         # parser (which parses to a datetime.datetime object) with the
         # identity function which prints the date exactly the same as it comes
@@ -69,7 +71,7 @@ def add_timestamp_parser(session):
         timestamp_parser = iso_format
     else:
         raise ValueError('Unknown cli_timestamp_format value: %s, valid values'
-                         ' are "none" or "iso8601"' % timestamp_format)
+                         ' are "none", "wire" or "iso8601"' % timestamp_format)
     factory.set_parser_defaults(timestamp_parser=timestamp_parser)
 
 

awscli/topics/config-vars.rst

@@ -98,7 +98,7 @@ The valid values of the ``output`` configuration variable are:
 ``cli_timestamp_format`` controls the format of timestamps displayed by the AWS CLI.
 The valid values of the ``cli_timestamp_format`` configuration variable are:
 
-* none - Display the timestamp exactly as received from the HTTP response.
+* wire - Display the timestamp exactly as received from the HTTP response.
 * iso8601 - Reformat timestamp using iso8601 in the UTC timezone.
 
 ``cli_follow_urlparam`` controls whether or not the CLI will attempt to follow

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.42.'
 # The full version, including alpha/beta/rc tags.
-release = '1.42.55'
+release = '1.42.56'
 
 # 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.40.55
+        botocore==1.40.56
         docutils>=0.18.1,<=0.19
         s3transfer>=0.14.0,<0.15.0
         PyYAML>=3.10,<6.1

setup.py

@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.40.55',
+    'botocore==1.40.56',
     'docutils>=0.18.1,<=0.19',
     's3transfer>=0.14.0,<0.15.0',
     'PyYAML>=3.10,<6.1',

tests/integration/test_cli.py

@@ -14,13 +14,13 @@
 import signal
 import os
 import tempfile
-import random
 import shutil
 
 import botocore.session
 from awscli.testutils import unittest, aws, BaseS3CLICommand
 from awscli.testutils import temporary_file
 from awscli.testutils import skip_if_windows
+from awscli.testutils import random_bucket_name
 from awscli.clidriver import create_clidriver
 
 
@@ -159,8 +159,7 @@ def test_param_with_file(self):
     def test_streaming_output_operation(self):
         d = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, d)
-        bucket_name = 'clistream' + str(
-            int(time.time())) + str(random.randint(1, 100))
+        bucket_name = random_bucket_name('clistream')
 
         self.put_object(bucket=bucket_name, key='foobar',
                         content='foobar contents')
@@ -179,8 +178,7 @@ def test_no_sign_request(self):
         env_vars['AWS_ACCESS_KEY_ID'] = 'foo'
         env_vars['AWS_SECRET_ACCESS_KEY'] = 'bar'
 
-        bucket_name = 'nosign' + str(
-            int(time.time())) + str(random.randint(1, 100))
+        bucket_name = random_bucket_name('nosign')
         self.put_object(bucket_name, 'foo', content='bar',
                         extra_args={'ACL': 'public-read-write'})
 
@@ -203,8 +201,7 @@ def test_no_sign_request(self):
     def test_no_paginate_arg(self):
         d = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, d)
-        bucket_name = 'nopaginate' + str(
-            int(time.time())) + str(random.randint(1, 100))
+        bucket_name = random_bucket_name('nopaginate')
 
         self.put_object(bucket=bucket_name, key='foobar',
                         content='foobar contents')

tests/unit/customizations/test_scalarparse.py

@@ -49,6 +49,15 @@ def test_choose_none_timestamp_formatter(self):
         factory.set_parser_defaults.assert_called_with(
             timestamp_parser=scalarparse.identity)
 
+    def test_choose_wire_timestamp_formatter(self):
+        session = mock.Mock(spec=Session)
+        session.get_scoped_config.return_value = {'cli_timestamp_format':
+                                                  'wire'}
+        factory = session.get_component.return_value
+        scalarparse.add_scalar_parsers(session)
+        factory.set_parser_defaults.assert_called_with(
+            timestamp_parser=scalarparse.identity)
+
     def test_choose_iso_timestamp_formatter(self):
         session = mock.Mock(spec=Session)
         session.get_scoped_config.return_value = {'cli_timestamp_format':