Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.Sign up
Add support for proxy authentication for s3 and ec2 #15352
Backport of #15293 in 2.x branch
When using S3 or EC2, it was possible to use a proxy to access EC2 or S3 API but username and password were not possible to be set.
This commit adds support for this. Also, to make all that consistent, proxy settings for both plugins have been renamed:
New settings are
cloud: aws: protocol: https proxy: host: proxy1.company.com port: 8083 username: myself password: theBestPasswordEver!
You can also set different proxies for
cloud: aws: s3: proxy: host: proxy1.company.com port: 8083 username: myself1 password: theBestPasswordEver1! ec2: proxy: host: proxy2.company.com port: 8083 username: myself2 password: theBestPasswordEver2!
We also fix a potential issue in S3 repository. We were supposed to accept key/secret either set under
account = settings.get("cloud.aws.access_key"); key = settings.get("cloud.aws.secret_key");
We replaced that by:
String account = settings.get(CLOUD_S3.KEY, settings.get(CLOUD_AWS.KEY)); String key = settings.get(CLOUD_S3.SECRET, settings.get(CLOUD_AWS.SECRET));
Also, we extract all settings for S3 in
Related to #15268.