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.

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

object_store: add support for using proxy_url for connection testing #3109

Merged
merged 1 commit into from
Nov 29, 2022

Conversation

sum12
Copy link
Contributor

@sum12 sum12 commented Nov 14, 2022

Which issue does this PR close?

Closes #2989

Rationale for this change

What changes are included in this PR?

Are there any user-facing changes?

@github-actions github-actions bot added the object-store Object Store Interface label Nov 14, 2022
@sum12 sum12 force-pushed the proxy-for-objectstorage branch 2 times, most recently from 1843c0d to 25558d9 Compare November 14, 2022 16:22
tustvold
tustvold previously approved these changes Nov 14, 2022
Copy link
Contributor

@tustvold tustvold left a comment

Choose a reason for hiding this comment

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

Nice, thank you. Just some minor nits.

Do you have any recommendations on how to test this out?

object_store/src/azure/client.rs Outdated Show resolved Hide resolved
object_store/src/azure/mod.rs Outdated Show resolved Hide resolved
object_store/src/gcp/mod.rs Outdated Show resolved Hide resolved
object_store/src/gcp/mod.rs Outdated Show resolved Hide resolved
@sum12 sum12 force-pushed the proxy-for-objectstorage branch 2 times, most recently from 2ca5ac1 to 35e9482 Compare November 17, 2022 20:05
@sum12
Copy link
Contributor Author

sum12 commented Nov 17, 2022

added some unit-test. tried it against a local socks5 server

object_store/src/aws/mod.rs Outdated Show resolved Hide resolved
object_store/src/gcp/mod.rs Outdated Show resolved Hide resolved
@sum12 sum12 force-pushed the proxy-for-objectstorage branch from 35e9482 to cbfd34c Compare November 18, 2022 13:34
object_store/src/gcp/mod.rs Outdated Show resolved Hide resolved
object_store/src/gcp/mod.rs Outdated Show resolved Hide resolved
object_store/src/gcp/mod.rs Outdated Show resolved Hide resolved
object_store/src/gcp/mod.rs Outdated Show resolved Hide resolved
object_store/src/azure/client.rs Outdated Show resolved Hide resolved
@@ -561,6 +571,14 @@ impl AmazonS3Builder {
let bucket = self.bucket_name.context(MissingBucketNameSnafu)?;
let region = self.region.context(MissingRegionSnafu)?;

let clientbuilder = match self.proxy_url {
Copy link
Contributor

Choose a reason for hiding this comment

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

This currently only alters the client used to obtain credentials, it does not alter the client created in S3Client::new which likely needs the same treatment as AzureClient

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done, thanks for the review :-)

@tustvold tustvold dismissed their stale review November 23, 2022 16:14

Need changes

@alamb
Copy link
Contributor

alamb commented Nov 25, 2022

Is this PR ready to go?

@sum12 sum12 force-pushed the proxy-for-objectstorage branch from cbfd34c to a1c7906 Compare November 27, 2022 18:05
Copy link
Contributor

@tustvold tustvold left a comment

Choose a reason for hiding this comment

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

I think this is good to go, I just want to test it working locally and then I think it can go

@tustvold tustvold merged commit b2bfe9c into apache:master Nov 29, 2022
@ursabot
Copy link

ursabot commented Nov 29, 2022

Benchmark runs are scheduled for baseline = 1d6b5ab and contender = b2bfe9c. b2bfe9c is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
object-store Object Store Interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

socks5 proxy support for the object_store crate
5 participants