From 0f73919b79fa3666f22a62d31c47a4f5a9310957 Mon Sep 17 00:00:00 2001 From: kyleknap Date: Wed, 12 Nov 2014 13:24:22 -0800 Subject: [PATCH 1/2] Fix wrong use of verify_ssl for configservice --- awscli/customizations/configservice/getstatus.py | 2 +- awscli/customizations/configservice/subscribe.py | 2 +- tests/unit/customizations/configservice/test_getstatus.py | 2 +- tests/unit/customizations/configservice/test_subscribe.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awscli/customizations/configservice/getstatus.py b/awscli/customizations/configservice/getstatus.py index d6b36b254352..d3a2dd8ce2e9 100644 --- a/awscli/customizations/configservice/getstatus.py +++ b/awscli/customizations/configservice/getstatus.py @@ -40,7 +40,7 @@ def _run_main(self, parsed_args, parsed_globals): def _setup_client(self, parsed_globals): client_args = { - 'use_ssl': parsed_globals.verify_ssl, + 'verify': parsed_globals.verify_ssl, 'region_name': parsed_globals.region, 'endpoint_url': parsed_globals.endpoint_url } diff --git a/awscli/customizations/configservice/subscribe.py b/awscli/customizations/configservice/subscribe.py index 5ae51b71aa89..9075ade6e49b 100644 --- a/awscli/customizations/configservice/subscribe.py +++ b/awscli/customizations/configservice/subscribe.py @@ -118,7 +118,7 @@ def _run_main(self, parsed_args, parsed_globals): def _setup_clients(self, parsed_globals): client_args = { - 'use_ssl': parsed_globals.verify_ssl, + 'verify': parsed_globals.verify_ssl, 'region_name': parsed_globals.region } self._s3_client = self._session.create_client('s3', **client_args) diff --git a/tests/unit/customizations/configservice/test_getstatus.py b/tests/unit/customizations/configservice/test_getstatus.py index 40550f2e77aa..c5e3d82a029b 100644 --- a/tests/unit/customizations/configservice/test_getstatus.py +++ b/tests/unit/customizations/configservice/test_getstatus.py @@ -61,7 +61,7 @@ def test_create_client(self): self.cmd._run_main(self.parsed_args, self.parsed_globals) self.session.create_client.assert_called_with( 'config', - use_ssl=self.parsed_globals.verify_ssl, + verify=self.parsed_globals.verify_ssl, region_name=self.parsed_globals.region, endpoint_url=self.parsed_globals.endpoint_url ) diff --git a/tests/unit/customizations/configservice/test_subscribe.py b/tests/unit/customizations/configservice/test_subscribe.py index 1d394ec4af6e..98fab14fc893 100644 --- a/tests/unit/customizations/configservice/test_subscribe.py +++ b/tests/unit/customizations/configservice/test_subscribe.py @@ -126,17 +126,17 @@ def test_setup_clients(self): # Check to see that the clients were created correctly self.session.create_client.assert_any_call( 's3', - use_ssl=self.parsed_globals.verify_ssl, + verify=self.parsed_globals.verify_ssl, region_name=self.parsed_globals.region, ) self.session.create_client.assert_any_call( 'sns', - use_ssl=self.parsed_globals.verify_ssl, + verify=self.parsed_globals.verify_ssl, region_name=self.parsed_globals.region, ) self.session.create_client.assert_any_call( 'config', - use_ssl=self.parsed_globals.verify_ssl, + verify=self.parsed_globals.verify_ssl, region_name=self.parsed_globals.region, endpoint_url=self.parsed_globals.endpoint_url ) From ff805efa34f6df8ec7a0f90302bd032164b5eb62 Mon Sep 17 00:00:00 2001 From: kyleknap Date: Wed, 12 Nov 2014 15:21:50 -0800 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3cbcdea164c6..93ee45242537 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,15 @@ CHANGELOG ========= + +Next Release (TBD) +================== +* bugfix:``aws configservice get-status``: Fix connecting to endpoint without + using ssl. + (`issue 998 `__) +* bugfix:``aws deploy push``: Fix some python compatibility issues + (`issue 1000 `__) + 1.6.1 ===== * feature:``aws deploy``: Adds support for AWS CodeDeploy