Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wrong use of verify_ssl for configservice #998

Merged
merged 2 commits into from
Nov 12, 2014
Merged

Fix wrong use of verify_ssl for configservice #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f73919
Fix wrong use of verify_ssl for configservice
kyleknap Nov 12, 2014
ff805ef
Update changelog
kyleknap Nov 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion awscli/customizations/configservice/getstatus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion awscli/customizations/configservice/subscribe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/customizations/configservice/test_getstatus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/customizations/configservice/test_subscribe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down