diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9bcb9a48cb98..88645d826717 100644 --- a/CHANGELOG.rst +++ b/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 ===== diff --git a/awscli/__init__.py b/awscli/__init__.py index a6f96146b633..9612d6db8be0 100644 --- a/awscli/__init__.py +++ b/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 diff --git a/awscli/customizations/route53resourceid.py b/awscli/customizations/route53resourceid.py index 45b33bfd6bad..8c6130cfabff 100644 --- a/awscli/customizations/route53resourceid.py +++ b/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 diff --git a/doc/source/conf.py b/doc/source/conf.py index 60aa0d6a21d1..fc6a75f7151f 100644 --- a/doc/source/conf.py +++ b/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. diff --git a/setup.py b/setup.py index 1ef8777df2eb..3525a38b9dba 100644 --- a/setup.py +++ b/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', diff --git a/tests/unit/route53/test_resource_id.py b/tests/unit/route53/test_resource_id.py index ef529c9d2030..be1e32738846 100644 --- a/tests/unit/route53/test_resource_id.py +++ b/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'