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

AWS_HTTPS support + fix missing scheme #476

Merged
merged 8 commits into from
Feb 4, 2022
Merged

AWS_HTTPS support + fix missing scheme #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35a67eb
AWS_HTTPS support + fix missing scheme
emmanuelmathot Jan 24, 2022
3fae1fe
updated changelog
emmanuelmathot Jan 24, 2022
a78f362
is not!
emmanuelmathot Jan 24, 2022
d540250
black reformatting
emmanuelmathot Jan 24, 2022
338dfc4
GDAL bool evaluation
emmanuelmathot Jan 25, 2022
dbe6df5
GDAL options comment
emmanuelmathot Jan 25, 2022
5c6b6be
Merge branch 'fixs3endpoint' of https://github.com/emmanuelmathot/rio…
emmanuelmathot Jan 25, 2022
9201057
black reformatting
emmanuelmathot Jan 25, 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
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# unreleased

* add support for setting the S3 endpoint url scheme via the `AWS_HTTPS` environment variables in `aws_get_object` function using boto3 (https://github.com/cogeotiff/rio-tiler/pull/476)

# 3.0.3 (2022-01-18)

Expand Down
8 changes: 8 additions & 0 deletions rio_tiler/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,15 @@ def aws_get_object(
"""AWS s3 get object content."""
if not client:
session = boto3_session()
# AWS_S3_ENDPOINT and AWS_HTTPS are GDAL config options of vsis3 driver
# https://gdal.org/user/virtual_file_systems.html#vsis3-aws-s3-files
endpoint_url = os.environ.get("AWS_S3_ENDPOINT", None)
if endpoint_url is not None:
vincentsarago marked this conversation as resolved.
Show resolved Hide resolved
use_https = os.environ.get("AWS_HTTPS", "YES")
if use_https.upper() in ["YES", "TRUE", "ON"]:
endpoint_url = "https://" + endpoint_url
else:
endpoint_url = "http://" + endpoint_url
client = session.client("s3", endpoint_url=endpoint_url)

params = {"Bucket": bucket, "Key": key}
Expand Down