Skip to content
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

fix: deal with empty string and None values in s3 endpoint_url #1991

Merged
merged 1 commit into from
Aug 26, 2024
Merged

fix: deal with empty string and None values in s3 endpoint_url #1991

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
4 changes: 3 additions & 1 deletion metaflow/metaflow_environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,11 @@ def _get_download_code_package_cmd(self, code_package_url, datastore_type):
bucket, s3_object = parse_s3_full_path(code_package_url)
# NOTE: the script quoting is extremely sensitive due to the way shlex.split operates and this being inserted
# into a quoted command elsewhere.
# NOTE: Reason for the extra conditionals in the script are because
# Boto3 does not play well with passing None or an empty string to endpoint_url
return "{python} -c '{script}'".format(
python=self._python(),
script='import boto3, os; boto3.client(\\"s3\\", endpoint_url=os.getenv(\\"METAFLOW_S3_ENDPOINT_URL\\")).download_file(\\"%s\\", \\"%s\\", \\"job.tar\\")'
script='import boto3, os; ep=os.getenv(\\"METAFLOW_S3_ENDPOINT_URL\\"; (boto3.client(\\"s3\\", endpoint_url=ep) if ep else boto3.client(\\"s3\\")).download_file(\\"%s\\", \\"%s\\", \\"job.tar\\")'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would something like **(ep and {"endpoint_url":ep}) to specify endpoint_url help in reducing the number of chars used here?

% (bucket, s3_object),
)
elif datastore_type == "azure":
Expand Down
Loading