Skip to content

Fix S3KeySensor #24378

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
potiuk merged 1 commit into from
Jun 11, 2022
Merged

Fix S3KeySensor #24378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions airflow/providers/amazon/aws/sensors/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#

import fnmatch
import os
import re
import sys
Expand Down Expand Up @@ -112,12 +112,13 @@ def _check_key(self, key):
"""
if self.wildcard_match:
prefix = re.split(r'[\[\*\?]', key, 1)[0]
files = self.get_hook().get_file_metadata(prefix, bucket_name)
if len(files) == 0:
keys = self.get_hook().get_file_metadata(prefix, bucket_name)
key_matches = [k for k in keys if fnmatch.fnmatch(k['Key'], key)]
if len(key_matches) == 0:
return False

# Reduce the set of metadata to size only
files = list(map(lambda f: {'Size': f['Size']}, files))
files = list(map(lambda f: {'Size': f['Size']}, key_matches))
else:
obj = self.get_hook().head_object(key, bucket_name)
if obj is None:
Expand Down Expand Up @@ -341,8 +342,7 @@ def __init__(
stacklevel=2,
)

self.prefix = prefix
prefixes = [self.prefix] if isinstance(self.prefix, str) else self.prefix
prefixes = [prefix] if isinstance(prefix, str) else prefix
keys = [pref if pref.endswith(delimiter) else pref + delimiter for pref in prefixes]

super().__init__(bucket_key=keys, **kwargs)
18 changes: 12 additions & 6 deletions tests/providers/amazon/aws/sensors/test_s3_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,25 +160,31 @@ def test_poke_wildcard(self, mock_get_file_metadata):
assert op.poke(None) is False
mock_get_file_metadata.assert_called_once_with("file", "test_bucket")

mock_get_file_metadata.return_value = [{'Size': 0}]
mock_get_file_metadata.return_value = [{'Key': 'dummyFile', 'Size': 0}]
assert op.poke(None) is False

mock_get_file_metadata.return_value = [{'Key': 'file1', 'Size': 0}]
assert op.poke(None) is True

@mock.patch('airflow.providers.amazon.aws.sensors.s3.S3Hook.get_file_metadata')
def test_poke_wildcard_multiple_files(self, mock_get_file_metadata):
op = S3KeySensor(
task_id='s3_key_sensor',
bucket_key=['s3://test_bucket/file1*', 's3://test_bucket/file2*'],
bucket_key=['s3://test_bucket/file*', 's3://test_bucket/*.zip'],
wildcard_match=True,
)

mock_get_file_metadata.side_effect = [[{'Size': 0}], []]
mock_get_file_metadata.side_effect = [[{'Key': 'file1', 'Size': 0}], []]
assert op.poke(None) is False

mock_get_file_metadata.side_effect = [[{'Key': 'file1', 'Size': 0}], [{'Key': 'file2', 'Size': 0}]]
assert op.poke(None) is False

mock_get_file_metadata.side_effect = [[{'Size': 0}], [{'Size': 0}]]
mock_get_file_metadata.side_effect = [[{'Key': 'file1', 'Size': 0}], [{'Key': 'test.zip', 'Size': 0}]]
assert op.poke(None) is True

mock_get_file_metadata.assert_any_call("file1", "test_bucket")
mock_get_file_metadata.assert_any_call("file2", "test_bucket")
mock_get_file_metadata.assert_any_call("file", "test_bucket")
mock_get_file_metadata.assert_any_call("", "test_bucket")

@mock.patch('airflow.providers.amazon.aws.sensors.s3.S3Hook.head_object')
def test_poke_with_check_function(self, mock_head_object):
Expand Down