Skip to content

Commit d8de3a3

Browse files
committed
remove copy check, some comments
1 parent f929745 commit d8de3a3

File tree

2 files changed

+1
-49
lines changed

2 files changed

+1
-49
lines changed

lambdas/shared/src/common/aws_s3_utils.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,4 @@ def delete_file(
4343
Bucket=source_bucket,
4444
Key=source_key,
4545
ExpectedBucketOwner=expected_bucket_owner,
46-
)
47-
48-
49-
def is_file_in_bucket(bucket_name: str, file_key: str) -> None:
50-
s3_client = get_s3_client()
51-
s3_client.head_object(Bucket=bucket_name, Key=file_key)
46+
)

lambdas/shared/tests/test_common/test_s3_utils.py

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from unittest.mock import patch
55

66
import boto3
7-
from botocore.exceptions import ClientError
87
from moto import mock_aws
98

109
from common import aws_s3_utils
@@ -117,45 +116,3 @@ def test_move_file_outside_bucket_copies_then_deletes(self):
117116
# Assert source object was deleted
118117
with self.assertRaises(self.s3.exceptions.NoSuchKey):
119118
self.s3.get_object(Bucket=self.source_bucket, Key=source_key)
120-
121-
def test_is_file_in_bucket(self):
122-
"""File should be present in destination bucket"""
123-
file_key = "src/move_file_test.csv"
124-
125-
# Put an object in the source bucket
126-
body_content = b"dummy file content"
127-
self.s3.put_object(Bucket=self.source_bucket, Key=file_key, Body=body_content)
128-
129-
# Should raise no exception
130-
aws_s3_utils.is_file_in_bucket(
131-
bucket_name=self.source_bucket,
132-
file_key=file_key,
133-
)
134-
135-
def test_is_file_not_in_bucket(self):
136-
"""File should not be present in source bucket"""
137-
file_key = "src/move_file_test.csv"
138-
139-
# Don't put the object in the source bucket
140-
141-
# Should raise an exception
142-
with self.assertRaises(ClientError):
143-
aws_s3_utils.is_file_in_bucket(
144-
bucket_name=self.source_bucket,
145-
file_key=file_key,
146-
)
147-
148-
def test_is_file_in_wrong_bucket(self):
149-
"""File should not be present in destination bucket"""
150-
file_key = "src/move_file_test.csv"
151-
152-
# Put an object in the source bucket
153-
body_content = b"dummy file content"
154-
self.s3.put_object(Bucket=self.source_bucket, Key=file_key, Body=body_content)
155-
156-
# Should raise an exception
157-
with self.assertRaises(ClientError):
158-
aws_s3_utils.is_file_in_bucket(
159-
bucket_name=self.destination_bucket,
160-
file_key=file_key,
161-
)

0 commit comments

Comments
 (0)