You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "roeap (via GitHub)" <gi...@apache.org> on 2023/04/13 16:24:03 UTC

[GitHub] [arrow-rs] roeap opened a new pull request, #4082: object_store: fix: Incorrect parsing of https Path Style S3 url

roeap opened a new pull request, #4082:
URL: https://github.com/apache/arrow-rs/pull/4082

   # Which issue does this PR close?
   
   <!--
   We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
   -->
   
   Closes #4078
   
   # Rationale for this change
    
   <!--
   Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
   Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
   -->
   
   # What changes are included in this PR?
   
   <!--
   There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
   -->
   
   # Are there any user-facing changes?
   
   
   <!--
   If there are user-facing changes then we may require documentation to be updated before approving the PR.
   -->
   
   <!---
   If there are any breaking changes to public APIs, please add the `breaking change` label.
   -->
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [arrow-rs] tustvold merged pull request #4082: object_store: fix: Incorrect parsing of https Path Style S3 url

Posted by "tustvold (via GitHub)" <gi...@apache.org>.
tustvold merged PR #4082:
URL: https://github.com/apache/arrow-rs/pull/4082


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [arrow-rs] roeap commented on pull request #4082: object_store: fix: Incorrect parsing of https Path Style S3 url

Posted by "roeap (via GitHub)" <gi...@apache.org>.
roeap commented on PR #4082:
URL: https://github.com/apache/arrow-rs/pull/4082#issuecomment-1507520314

   We are now also checking if the first path segment exists, and assigning it to the bucket.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [arrow-rs] tustvold commented on a diff in pull request #4082: object_store: fix: Incorrect parsing of https Path Style S3 url

Posted by "tustvold (via GitHub)" <gi...@apache.org>.
tustvold commented on code in PR #4082:
URL: https://github.com/apache/arrow-rs/pull/4082#discussion_r1165961414


##########
object_store/src/aws/mod.rs:
##########
@@ -758,12 +758,16 @@ impl AmazonS3Builder {
     fn parse_url(&mut self, url: &str) -> Result<()> {
         let parsed = Url::parse(url).context(UnableToParseUrlSnafu { url })?;
         let host = parsed.host_str().context(UrlNotRecognisedSnafu { url })?;
-
         match parsed.scheme() {
             "s3" | "s3a" => self.bucket_name = Some(host.to_string()),
             "https" => match host.splitn(4, '.').collect_tuple() {
-                Some(("s3", bucket, "amazonaws", "com")) => {
-                    self.bucket_name = Some(bucket.to_string());
+                Some(("s3", region, "amazonaws", "com")) => {
+                    self.region = Some(region.to_string());
+                    if let Some(bucket) =
+                        parsed.path_segments().and_then(|mut path| path.next())

Review Comment:
   Could we get a test of this perhaps?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [arrow-rs] roeap commented on pull request #4082: object_store: fix: Incorrect parsing of https Path Style S3 url

Posted by "roeap (via GitHub)" <gi...@apache.org>.
roeap commented on PR #4082:
URL: https://github.com/apache/arrow-rs/pull/4082#issuecomment-1507285048

   Not sure, but happy to add it.
   
   Guess it makes sense, since we cannot work without a bucket. Haven't considered it so far, since we were only processing the host.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [arrow-rs] roeap commented on a diff in pull request #4082: object_store: fix: Incorrect parsing of https Path Style S3 url

Posted by "roeap (via GitHub)" <gi...@apache.org>.
roeap commented on code in PR #4082:
URL: https://github.com/apache/arrow-rs/pull/4082#discussion_r1165965431


##########
object_store/src/aws/mod.rs:
##########
@@ -758,12 +758,16 @@ impl AmazonS3Builder {
     fn parse_url(&mut self, url: &str) -> Result<()> {
         let parsed = Url::parse(url).context(UnableToParseUrlSnafu { url })?;
         let host = parsed.host_str().context(UrlNotRecognisedSnafu { url })?;
-
         match parsed.scheme() {
             "s3" | "s3a" => self.bucket_name = Some(host.to_string()),
             "https" => match host.splitn(4, '.').collect_tuple() {
-                Some(("s3", bucket, "amazonaws", "com")) => {
-                    self.bucket_name = Some(bucket.to_string());
+                Some(("s3", region, "amazonaws", "com")) => {
+                    self.region = Some(region.to_string());
+                    if let Some(bucket) =
+                        parsed.path_segments().and_then(|mut path| path.next())

Review Comment:
   Of course and done - sorry for getting sloppy :).



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org