Skip to content

Resolves #24699, Support ES2 and ECS instance providers for S3 buckets #24700

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

Merged
rullzer merged 4 commits into from
Feb 2, 2021
Merged

Resolves #24699, Support ES2 and ECS instance providers for S3 buckets #24700

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85aa775
Resolves #24699, Support ES2 and ECS instance providers for S3 buckets
Dec 14, 2020
5b756a9
Replace defaultProvider with explicit calls to exclude user home dire…
Dec 14, 2020
ad95e51
Add web identity provider to S3 connection chain
Dec 15, 2020
45a02ee
Fix failing tests
Dec 16, 2020
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
6 changes: 5 additions & 1 deletion lib/private/Files/ObjectStore/S3ConnectionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

use Aws\ClientResolver;
use Aws\Credentials\CredentialProvider;
use Aws\Credentials\EcsCredentialProvider;
use Aws\Credentials\Credentials;
use Aws\Exception\CredentialsException;
use Aws\S3\Exception\S3Exception;
Expand Down Expand Up @@ -104,7 +105,10 @@ public function getConnection() {
CredentialProvider::chain(
$this->paramCredentialProvider(),
CredentialProvider::env(),
CredentialProvider::instanceProfile()
CredentialProvider::assumeRoleWithWebIdentityCredentialProvider()
!empty(getenv(EcsCredentialProvider::ENV_URI))
? CredentialProvider::ecsCredentials()
: CredentialProvider::instanceProfile()
)
);

Expand Down