Skip to content

Commit 6e735fa

Browse files
committed
Codestyle fixes
1 parent e3b88b6 commit 6e735fa

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

src/sagemaker/session.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -632,10 +632,14 @@ def _create_s3_bucket_if_it_does_not_exist(self, bucket_name, region):
632632
bucket = s3.Bucket(name=bucket_name)
633633
expected_bucket_owner_id = self.account_id()
634634
if bucket.creation_date is None:
635-
self.general_bucket_check_if_user_has_permission(bucket_name, s3, bucket, region, True, expected_bucket_owner_id)
635+
self.general_bucket_check_if_user_has_permission(
636+
bucket_name, s3, bucket, region, True, expected_bucket_owner_id
637+
)
636638

637639
elif self._default_bucket_set_by_sdk:
638-
self.general_bucket_check_if_user_has_permission(bucket_name, s3, bucket, region, False, expected_bucket_owner_id)
640+
self.general_bucket_check_if_user_has_permission(
641+
bucket_name, s3, bucket, region, False, expected_bucket_owner_id
642+
)
639643
self.expected_bucket_owner_id_bucket_check(bucket_name, s3, expected_bucket_owner_id)
640644

641645
def expected_bucket_owner_id_bucket_check(self, bucket_name, s3, expected_bucket_owner_id):
@@ -652,7 +656,7 @@ def expected_bucket_owner_id_bucket_check(self, bucket_name, s3, expected_bucket
652656
s3.meta.client.list_objects_v2(
653657
Bucket=bucket_name,
654658
Prefix=self.default_bucket_prefix,
655-
ExpectedBucketOwner=expected_bucket_owner_id
659+
ExpectedBucketOwner=expected_bucket_owner_id,
656660
)
657661
else:
658662
s3.meta.client.head_bucket(
@@ -690,8 +694,7 @@ def general_bucket_check_if_user_has_permission(
690694
try:
691695
if self.default_bucket_prefix:
692696
s3.meta.client.list_objects_v2(
693-
Bucket=bucket_name,
694-
Prefix=self.default_bucket_prefix
697+
Bucket=bucket_name, Prefix=self.default_bucket_prefix
695698
)
696699
else:
697700
s3.meta.client.head_bucket(Bucket=bucket_name)

tests/unit/test_default_bucket.py

+16-8
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ def sagemaker_session():
4343
def sagemaker_session_with_bucket_name_and_prefix():
4444
boto_mock = MagicMock(name="boto_session", region_name=REGION)
4545
boto_mock.client("sts").get_caller_identity.return_value = {"Account": ACCOUNT_ID}
46-
sagemaker_session = sagemaker.Session(boto_session=boto_mock,
47-
default_bucket="XXXXXXXXXXXXX",
48-
default_bucket_prefix="sample-prefix")
46+
sagemaker_session = sagemaker.Session(
47+
boto_session=boto_mock,
48+
default_bucket="XXXXXXXXXXXXX",
49+
default_bucket_prefix="sample-prefix",
50+
)
4951
sagemaker_session.boto_session.resource("s3").Bucket().creation_date = None
5052
return sagemaker_session
5153

@@ -106,15 +108,18 @@ def test_default_bucket_s3_needs_bucket_owner_access(sagemaker_session, datetime
106108
assert error_message in caplog.text
107109
assert sagemaker_session._default_bucket is None
108110

109-
def test_default_bucket_with_prefix_s3_needs_bucket_owner_access(sagemaker_session_with_bucket_name_and_prefix,
110-
datetime_obj,
111-
caplog):
111+
112+
def test_default_bucket_with_prefix_s3_needs_bucket_owner_access(
113+
sagemaker_session_with_bucket_name_and_prefix, datetime_obj, caplog
114+
):
112115
with pytest.raises(ClientError):
113116
error = ClientError(
114117
error_response={"Error": {"Code": "403", "Message": "Forbidden"}},
115118
operation_name="foo",
116119
)
117-
sagemaker_session_with_bucket_name_and_prefix.boto_session.resource("s3").meta.client.list_objects_v2.side_effect = error
120+
sagemaker_session_with_bucket_name_and_prefix.boto_session.resource(
121+
"s3"
122+
).meta.client.list_objects_v2.side_effect = error
118123
sagemaker_session_with_bucket_name_and_prefix.boto_session.resource("s3").Bucket(
119124
name=DEFAULT_BUCKET_NAME
120125
).creation_date = None
@@ -123,7 +128,10 @@ def test_default_bucket_with_prefix_s3_needs_bucket_owner_access(sagemaker_sessi
123128
error_message = "Please try again after adding appropriate access."
124129
assert error_message in caplog.text
125130
assert sagemaker_session_with_bucket_name_and_prefix._default_bucket is None
126-
sagemaker_session_with_bucket_name_and_prefix.boto_session.resource("s3").meta.client.list_objects_v2.assert_called_once()
131+
sagemaker_session_with_bucket_name_and_prefix.boto_session.resource(
132+
"s3"
133+
).meta.client.list_objects_v2.assert_called_once()
134+
127135

128136
def test_default_bucket_s3_custom_bucket_input(sagemaker_session, datetime_obj, caplog):
129137
sagemaker_session._default_bucket_name_override = "custom-bucket-override"

0 commit comments

Comments
 (0)