Skip to content

Use temporary file in GCSToS3Operator #21295

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
eladkal merged 5 commits into from
Feb 11, 2022
Merged

Use temporary file in GCSToS3Operator #21295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afe97bd
Use temporary file in GCSToS3Operator
Feb 3, 2022
9b53efc
Use `GCSHook.provide_file` instead of creating temp file manually
Feb 3, 2022
d768a0a
Do not mock GCSHook twice
Feb 8, 2022
b00bc90
Fix tests
Feb 8, 2022
410fce8
Fix S3Hook.get_bucket method return value
Feb 8, 2022
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 airflow/providers/amazon/aws/hooks/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def check_for_bucket(self, bucket_name: Optional[str] = None) -> bool:
return False

@provide_bucket_name
def get_bucket(self, bucket_name: Optional[str] = None) -> str:
def get_bucket(self, bucket_name: Optional[str] = None) -> object:
"""
Returns a boto3.S3.Bucket object

Expand Down
18 changes: 10 additions & 8 deletions airflow/providers/amazon/aws/transfers/gcs_to_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,16 @@ def execute(self, context: 'Context') -> List[str]:
if files:

for file in files:
file_bytes = hook.download(object_name=file, bucket_name=self.bucket)

dest_key = self.dest_s3_key + file
self.log.info("Saving file to %s", dest_key)

s3_hook.load_bytes(
file_bytes, key=dest_key, replace=self.replace, acl_policy=self.s3_acl_policy
)
with hook.provide_file(object_name=file, bucket_name=self.bucket) as local_tmp_file:
dest_key = self.dest_s3_key + file
self.log.info("Saving file to %s", dest_key)

s3_hook.load_file(
filename=local_tmp_file.name,
key=dest_key,
replace=self.replace,
acl_policy=self.s3_acl_policy,
)

self.log.info("All done, uploaded %d files to S3", len(files))
else:
Expand Down
Loading