Merge pull request #998 from kyleknap/config-fix

Fix wrong use of verify_ssl for configservice
aws · Nov 12, 2014 · 9913884 · 9913884
2 parents cdd91d3 + ff805ef
commit 9913884
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git 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 <https://github.com/aws/aws-cli/pull/998>`__)
+* bugfix:``aws deploy push``: Fix some python compatibility issues
+  (`issue 1000 <https://github.com/aws/aws-cli/pull/1000>`__)
+
 1.6.1
 =====
 * feature:``aws deploy``: Adds support for AWS CodeDeploy

diff --git 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
@@ -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
@@ -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
@@ -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
         )