Skip to content

fix: update get_execution_role_arn from metadata file if present #4388

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 2 commits into from
Jan 24, 2024
Merged

fix: update get_execution_role_arn from metadata file if present #4388

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
5f6d8ca
fix: update get_execution_role_arn from metadata file if present
jgoyani1 Jan 23, 2024
7db7b9e
Merge branch 'master' into execution-role-arn
jgoyani1 Jan 24, 2024
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
7 changes: 6 additions & 1 deletion src/sagemaker/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5412,14 +5412,19 @@ def get_caller_identity_arn(self):
domain_id = metadata.get("DomainId")
user_profile_name = metadata.get("UserProfileName")
space_name = metadata.get("SpaceName")
execution_role_arn = metadata.get("ExecutionRoleArn")
try:
if domain_id is None:
instance_desc = self.sagemaker_client.describe_notebook_instance(
NotebookInstanceName=instance_name
)
return instance_desc["RoleArn"]

# In Space app, find execution role from DefaultSpaceSettings on domain level
# find execution role from the metadata file if present
if execution_role_arn is not None:
return execution_role_arn

# In Shared Space app, find execution role from DefaultSpaceSettings on domain level
if space_name is not None:
domain_desc = self.sagemaker_client.describe_domain(DomainId=domain_id)
return domain_desc["DefaultSpaceSettings"]["ExecutionRole"]
Expand Down
19 changes: 19 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 @@ -698,6 +698,25 @@ def test_fallback_to_domain_if_role_unavailable_in_user_settings(boto_session):
sess.sagemaker_client.describe_domain.assert_called_once_with(DomainId="d-kbnw5yk6tg8j")


@patch(
"six.moves.builtins.open",
mock_open(
read_data='{"ResourceName": "SageMakerInstance", '
'"DomainId": "d-kbnw5yk6tg8j", '
'"ExecutionRoleArn": "arn:aws:iam::369233609183:role/service-role/SageMakerRole-20171129T072388", '
'"SpaceName": "space_name"}'
),
)
@patch("os.path.exists", side_effect=mock_exists(NOTEBOOK_METADATA_FILE, True))
def test_get_caller_identity_arn_from_metadata_file_for_space(boto_session):
sess = Session(boto_session)
expected_role = "arn:aws:iam::369233609183:role/service-role/SageMakerRole-20171129T072388"

actual = sess.get_caller_identity_arn()

assert actual == expected_role


@patch(
"six.moves.builtins.open",
mock_open(
Expand Down