Merge branch 'release-1.5.6'

* release-1.5.6:
  Bumping version to 1.5.6
  Simplify DelegationSetId format
  Update CHANGELOG with new service features
  Revert "Merge pull request #985 from kyleknap/waiters"
  Update waiter code based on feedback
  Expose waiters in the CLI

CHANGELOG.rst

@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.5.6
+=====
+
+* feature:``aws cloudfront``: Adds support for wildcard cookie names and
+  options caching.
+* feature:``aws route53``: Add further support for private dns and sigv4.
+* feature:``aws cognito-sync``: Add support for push sync.
+
+
 1.5.5
 =====
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.5.5'
+__version__ = '1.5.6'
 
 #
 # Get our data path to be added to botocore's search path

awscli/customizations/route53resourceid.py

@@ -22,8 +22,8 @@ def register_resource_id(cli):
 
 
 def _check_for_resource_id(param, value, **kwargs):
-    if param.name == 'ResourceId':
+    if param.name in ['ResourceId', 'DelegationSetId']:
         orig_value = value
         value = value.split('/')[-1]
-        logger.debug('ResourceId %s -> %s', orig_value, value)
+        logger.debug('%s %s -> %s', param.name, orig_value, value)
         return value

doc/source/conf.py

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

setup.py

@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore>=0.69.0,<0.70.0',
+requires = ['botocore>=0.70.0,<0.71.0',
             'bcdoc>=0.12.0,<0.13.0',
             'six>=1.1.0',
             'colorama==0.2.5',

tests/unit/route53/test_resource_id.py

@@ -86,6 +86,28 @@ def test_short_resource_id(self):
         self.assertEqual(self.last_kwargs['Id'], expected_id)
 
 
+class TestReusableDelegationSet(BaseAWSCommandParamsTest):
+
+    prefix = 'route53 get-reusable-delegation-set'
+
+    def setUp(self):
+        super(TestReusableDelegationSet, self).setUp()
+
+    def test_full_resource_id(self):
+        args = ' --id /delegationset/N9INWVYQ6Q0FN'
+        cmdline = self.prefix + args
+        expected_id = 'N9INWVYQ6Q0FN'
+        self.assert_params_for_cmd2(cmdline, {'Id': 'N9INWVYQ6Q0FN'},
+                                    expected_rc=0)
+
+    def test_short_resource_id(self):
+        args = ' --id N9INWVYQ6Q0FN'
+        cmdline = self.prefix + args
+        expected_id = 'N9INWVYQ6Q0FN'
+        self.assert_params_for_cmd2(cmdline, {'Id': 'N9INWVYQ6Q0FN'},
+                                    expected_rc=0)
+
+
 class TestMaxItems(BaseAWSCommandParamsTest):
 
     prefix = 'route53 list-resource-record-sets'