Merge branch 'release-1.17.11'

* release-1.17.11: Bumping version to 1.17.11 Update changelog based on model updates Revert "Merge pull request #4831 from aws/dependabot/pip/colorama-gte-0.2.5-and-lt-0.4.4" Fix paramter validation bug for ec2 bundle-instance Correct link to Sphinx updated Update colorama requirement from <0.4.2,>=0.2.5 to >=0.2.5,<0.4.4 format output for iam list-policies
aws · Feb 5, 2020 · e161586 · e161586
2 parents bce871b + 71d0a12
commit e161586
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 14 deletions.
diff --git a/.changes/1.17.11.json b/.changes/1.17.11.json
@@ -0,0 +1,42 @@
+[
+  {
+    "category": "``ec2``", 
+    "description": "Update ec2 command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``dlm``", 
+    "description": "Update dlm command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``securityhub``", 
+    "description": "Update securityhub command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``mediaconvert``", 
+    "description": "Update mediaconvert command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``groundstation``", 
+    "description": "Update groundstation command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``resourcegroupstaggingapi``", 
+    "description": "Update resourcegroupstaggingapi command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "ec2", 
+    "description": "Fixed a paramter validation bug for the ec2 bundle-instance parameter --storage.", 
+    "type": "bugfix"
+  }, 
+  {
+    "category": "``forecastquery``", 
+    "description": "Update forecastquery command to latest version", 
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,19 @@
 CHANGELOG
 =========
 
+1.17.11
+=======
+
+* api-change:``ec2``: Update ec2 command to latest version
+* api-change:``dlm``: Update dlm command to latest version
+* api-change:``securityhub``: Update securityhub command to latest version
+* api-change:``mediaconvert``: Update mediaconvert command to latest version
+* api-change:``groundstation``: Update groundstation command to latest version
+* api-change:``resourcegroupstaggingapi``: Update resourcegroupstaggingapi command to latest version
+* bugfix:ec2: Fixed a paramter validation bug for the ec2 bundle-instance parameter --storage.
+* api-change:``forecastquery``: Update forecastquery command to latest version
+
+
 1.17.10
 =======
 

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2012-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"). You
 may not use this file except in compliance with the License. A copy of

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.17.10'
+__version__ = '1.17.11'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/customizations/ec2/bundleinstance.py b/awscli/customizations/ec2/bundleinstance.py
@@ -98,8 +98,8 @@ def _check_args(parsed_args, **kwargs):
     logger.debug(parsed_args)
     arg_dict = vars(parsed_args)
     if arg_dict['storage']:
-        for key in ('bucket', 'prefix', 'owner-akid',
-                    'owner-sak', 'policy'):
+        for key in ('bucket', 'prefix', 'owner_akid',
+                    'owner_sak', 'policy'):
             if arg_dict[key]:
                 msg = ('Mixing the --storage option '
                        'with the simple, scalar options is '

diff --git a/awscli/examples/iam/list-policies.rst b/awscli/examples/iam/list-policies.rst
@@ -23,11 +23,11 @@ Output::
 		},
 		{
 		  "PolicyName": "ASamplePolicy",
-          "CreateDate": "2015-06-17T19:23;32Z",
-          "AttachmentCount": "0",
-          "IsAttachable": "true",
+          	  "CreateDate": "2015-06-17T19:23;32Z",
+          	  "AttachmentCount": "0",
+          	  "IsAttachable": "true",
 		  "PolicyId": "Z27SI6FQMGNQ2EXAMPLE1",
-          "DefaultVersionId": "v1",
+          	  "DefaultVersionId": "v1",
 		  "Path": "/",
 		  "Arn": "arn:aws:iam::123456789012:policy/ASamplePolicy",
 		  "UpdateDate": "2015-06-17T19:23:32Z"
@@ -37,4 +37,4 @@ Output::
 
 For more information, see `Overview of IAM Policies`_ in the *Using IAM* guide.
 
-.. _`Overview of IAM Policies`: http://docs.aws.amazon.com/IAM/latest/UserGuide/policies_overview.html
+.. _`Overview of IAM Policies`: http://docs.aws.amazon.com/IAM/latest/UserGuide/policies_overview.html
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.17.'
 # The full version, including alpha/beta/rc tags.
-release = '1.17.10'
+release = '1.17.11'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/layout.html b/doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/layout.html
@@ -118,7 +118,7 @@
 
   {%- block footer_wrapper %}
   <div class="footer container">
-    &copy; Copyright {{ copyright }}. Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
+    &copy; Copyright {{ copyright }}. Created using <a href="http://www.sphinx-doc.org/">Sphinx</a>.
   </div>
   {%- endblock %}
 

diff --git a/setup.cfg b/setup.cfg
@@ -4,7 +4,7 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.14.10
+        botocore==1.14.11
         colorama>=0.2.5,<0.4.2
         docutils>=0.10,<0.16
         rsa>=3.1.2,<=3.5.0

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@ def find_version(*file_paths):
     raise RuntimeError("Unable to find version string.")
 
 
-install_requires = ['botocore==1.14.10',
+install_requires = ['botocore==1.14.11',
                     'docutils>=0.10,<0.16',
                     'rsa>=3.1.2,<=3.5.0',
                     's3transfer>=0.3.0,<0.4.0',

diff --git a/tests/functional/ec2/test_bundle_instance.py b/tests/functional/ec2/test_bundle_instance.py
@@ -93,7 +93,12 @@ def test_both(self):
         json = """{"S3":{"Bucket":"foobar","Prefix":"fiebaz"}}"""
         args = ' --instance-id i-12345678 --owner-aki blah --owner-sak blah --storage %s' % json
         args_list = (self.prefix + args).split()
-        self.assert_params_for_cmd(args_list, expected_rc=255)
+        _, stderr, _ = self.assert_params_for_cmd(args_list, expected_rc=255)
+        expected_err_msg = (
+            'Mixing the --storage option with the simple, '
+            'scalar options is not recommended'
+        )
+        self.assertIn(expected_err_msg, stderr)
 
 
 if __name__ == "__main__":