Skip to content

try to get_role, but fall back to role from regex #305

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

Merged
merged 6 commits into from
Jul 20, 2018
Merged

try to get_role, but fall back to role from regex #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dee233b
try to get_role, but fall back to role from regex
Jul 19, 2018
938d4e1
add changelog
Jul 19, 2018
7cd5c6f
pr updates
Jul 19, 2018
96da497
Merge branch 'master' into get-execution-role-fix
andremoeller Jul 19, 2018
3b4112b
fix unit test
Jul 19, 2018
9174c00
Merge branch 'get-execution-role-fix' of github.com:andremoeller/sage…
Jul 19, 2018
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
3 changes: 2 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ CHANGELOG
=========

1.7.1dev
========
=====

* bug-fix: get_execution_role no longer fails if user can't call get_role
* bug-fix: Session: use existing model instead of failing during ``create_model()``

1.7.0
Expand Down
8 changes: 6 additions & 2 deletions src/sagemaker/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ def expand_role(self, role):
def get_caller_identity_arn(self):
"""Returns the ARN user or role whose credentials are used to call the API.
Returns:
(str): The ARN uer or role
(str): The ARN user or role
"""
assumed_role = self.boto_session.client('sts').get_caller_identity()['Arn']

Expand All @@ -772,7 +772,11 @@ def get_caller_identity_arn(self):

# Call IAM to get the role's path
role_name = role[role.rfind('/') + 1:]
role = self.boto_session.client('iam').get_role(RoleName=role_name)['Role']['Arn']
try:
role = self.boto_session.client('iam').get_role(RoleName=role_name)['Role']['Arn']
except ClientError:
LOGGER.warning("Couldn't call 'get_role' to get Role ARN from role name {} to get Role path."
.format(role_name))

return role

Expand Down
12 changes: 12 additions & 0 deletions tests/unit/test_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,18 @@ def test_get_caller_identity_arn_from_an_user(boto_session):
assert actual == 'arn:aws:iam::369233609183:user/mia'


def test_get_caller_identity_arn_from_an_user_without_permissions(boto_session):
sess = Session(boto_session)
arn = 'arn:aws:iam::369233609183:user/mia'
sess.boto_session.client('sts').get_caller_identity.return_value = {'Arn': arn}
sess.boto_session.client('iam').get_role.side_effect = ClientError({}, {})

with patch('logging.Logger.warning') as mock_logger:
actual = sess.get_caller_identity_arn()
assert actual == 'arn:aws:iam::369233609183:user/mia'
mock_logger.assert_called_once()


def test_get_caller_identity_arn_from_a_role(boto_session):
sess = Session(boto_session)
arn = 'arn:aws:sts::369233609183:assumed-role/SageMakerRole/6d009ef3-5306-49d5-8efc-78db644d8122'
Expand Down