Skip to content

fix: unnecessary session call while generating pipeline definition #2824

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.

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 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/sagemaker/workflow/lambda_step.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ def _get_function_arn(self):
Method creates a lambda function and returns it's arn.
If the lambda is already present, it will build it's arn and return that.
"""
account_id = self.lambda_func.session.account_id()
region = self.lambda_func.session.boto_region_name
if region.lower() == "cn-north-1" or region.lower() == "cn-northwest-1":
partition = "aws-cn"
Expand All @@ -163,6 +162,7 @@ def _get_function_arn(self):

if self.lambda_func.function_arn is None:
try:
account_id = self.lambda_func.session.account_id()
response = self.lambda_func.create()
return response["FunctionArn"]
except ValueError as error:
Expand Down
38 changes: 36 additions & 2 deletions tests/unit/sagemaker/workflow/test_lambda_step.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import pytest

from mock import Mock
from mock import Mock, MagicMock

from sagemaker.workflow.parameters import ParameterInteger, ParameterString
from sagemaker.workflow.pipeline import Pipeline
Expand All @@ -27,12 +27,13 @@
@pytest.fixture()
def sagemaker_session():
boto_mock = Mock(name="boto_session", region_name="us-west-2")
session_mock = Mock(
session_mock = MagicMock(
name="sagemaker_session",
boto_session=boto_mock,
boto_region_name="us-west-2",
config=None,
local_mode=False,
account_id=Mock(),
)
return session_mock

Expand Down Expand Up @@ -173,3 +174,36 @@ def test_lambda_step_no_inputs_outputs(sagemaker_session):
"OutputParameters": [],
"Arguments": {},
}


def test_lambda_step_with_function_arn(sagemaker_session):
lambda_step = LambdaStep(
name="MyLambdaStep",
depends_on=["TestStep"],
lambda_func=Lambda(
function_arn="arn:aws:lambda:us-west-2:123456789012:function:sagemaker_test_lambda",
session=sagemaker_session,
),
inputs={},
outputs=[],
)
lambda_step._get_function_arn()
sagemaker_session.account_id.assert_not_called()


def test_lambda_step_without_function_arn(sagemaker_session):
lambda_step = LambdaStep(
name="MyLambdaStep",
depends_on=["TestStep"],
lambda_func=Lambda(
function_name="name",
execution_role_arn="arn:aws:lambda:us-west-2:123456789012:execution_role",
zipped_code_dir="",
handler="",
session=sagemaker_session,
),
inputs={},
outputs=[],
)
lambda_step._get_function_arn()
sagemaker_session.account_id.assert_called_once()