Add options to force S3 address style.#1249
Merged
daviesrob merged 2 commits intosamtools:developfrom Mar 4, 2021
Merged
Conversation
jmarshall
reviewed
Mar 4, 2021
hfile_s3.c
Outdated
| "aws_session_token", &ad->token, | ||
| "region", &ad->region, NULL); | ||
| "region", &ad->region, | ||
| "addressing_style", &url_style, NULL); |
Member
There was a problem hiding this comment.
You or I should have put this NULL on the next line — so extra entries can be added more clearly — ages ago 😄 (and similarly in the other parse_ini call below).
Suggested change
| "addressing_style", &url_style, NULL); | |
| "addressing_style", &url_style, | |
| NULL); |
Member
There was a problem hiding this comment.
Adjusted (will squash on merge).
Member
|
Thanks, I've tested the various configuration options and they all behave as expected. Will merge shortly... |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There are now three ways to force the URL style in the S3 plugin. By setting addressing_style in the aws credentials file, by setting host_bucket in .s3cfg to anything not containing %(bucket).s (this is how s3cmd works) or by setting the HTS_S3_ADDRESS_STYLE env variable to path.
Should fix samtools/samtools#1377.