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

Fix a bug when creating emr role with AWS_CA_BUNDLE #1468

Merged
merged 1 commit into from
Aug 26, 2015
Merged

Fix a bug when creating emr role with AWS_CA_BUNDLE #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 emr create-default-roles``: Fix the issue where the command
would fail to honor an existing AWS_CA_BUNDLE environment setting and end up
with "SSLError: object has no attribute"
(`issue 1468 <https://github.com/aws/aws-cli/pull/1468>`__)


1.7.47
======

Expand Down
4 changes: 2 additions & 2 deletions awscli/customizations/emr/createdefaultroles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,6 @@ def _create_instance_profile_with_role(self, instance_profile_name,

def _call_iam_operation(self, operation_name, parameters, parsed_globals):
client = self._session.create_client(
'iam', self.region, self.iam_endpoint_url,
parsed_globals.verify_ssl)
'iam', region_name=self.region, endpoint_url=self.iam_endpoint_url,
verify=parsed_globals.verify_ssl)
return getattr(client, xform_name(operation_name))(**parameters)
9 changes: 5 additions & 4 deletions tests/unit/customizations/emr/test_create_default_role.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,22 +233,23 @@ def test_get_service_principal_parameters(self, get_rp_patch,
def test_call_parameters(self, call_patch):
cmdline = self.prefix + ' --region eu-west-1' + ' --no-verify-ssl'
self.run_cmd(cmdline, expected_rc=0)
self.assertEquals(call_patch.call_args[0][1], 'eu-west-1')
self.assertEquals(call_patch.call_args[0][3], False)
self.assertEquals(call_patch.call_args[1]['region_name'], 'eu-west-1')
self.assertEquals(call_patch.call_args[1]['verify'], False)

@mock.patch('botocore.session.Session.create_client')
def test_call_parameters_only_endpoint(self, call_patch):
endpoint_arg = 'https://elasticmapreduce.us-unknown-1.amazonaws.com'
cmdline = self.prefix + ' --endpoint ' + endpoint_arg
self.run_cmd(cmdline, expected_rc=0)
self.assertEquals(call_patch.call_args[0][2], None)
self.assertEquals(call_patch.call_args[1]['endpoint_url'], None)

@mock.patch('botocore.session.Session.create_client')
def test_call_parameters_only_iam_endpoint(self, call_patch):
endpoint_arg = 'https://elasticmapreduce.us-unknown-1.amazonaws.com'
cmdline = self.prefix + ' --iam-endpoint ' + endpoint_arg
self.run_cmd(cmdline, expected_rc=0)
self.assertEquals(call_patch.call_args[0][2], endpoint_arg)
self.assertEquals(call_patch.call_args[1]['endpoint_url'],
endpoint_arg)

@mock.patch('awscli.customizations.emr.emr.'
'CreateDefaultRoles._get_role_policy')
Expand Down