mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25451 from nextcloud/backport/24700/stable21 

[stable21] Resolves #24699, Support ES2 and ECS instance providers for S3 buckets
This commit is contained in:
Roeland Jago Douma 2021-02-05 11:21:20 +01:00 committed by GitHub
parent ba63f588e7 74d90d0165
commit f24ce39733
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Files/ObjectStore/S3ConnectionTrait.php
View File

@ -32,6 +32,7 @@ namespace OC\Files\ObjectStore;
use Aws\ClientResolver; use Aws\ClientResolver;
use Aws\Credentials\CredentialProvider; use Aws\Credentials\CredentialProvider;
use Aws\Credentials\EcsCredentialProvider;
use Aws\Credentials\Credentials; use Aws\Credentials\Credentials;
use Aws\Exception\CredentialsException; use Aws\Exception\CredentialsException;
use Aws\S3\Exception\S3Exception; use Aws\S3\Exception\S3Exception;
@ -105,7 +106,10 @@ trait S3ConnectionTrait {
CredentialProvider::chain( CredentialProvider::chain(
$this->paramCredentialProvider(), $this->paramCredentialProvider(),
CredentialProvider::env(), CredentialProvider::env(),
CredentialProvider::instanceProfile() CredentialProvider::assumeRoleWithWebIdentityCredentialProvider(),
!empty(getenv(EcsCredentialProvider::ENV_URI))
? CredentialProvider::ecsCredentials()
: CredentialProvider::instanceProfile()
) )
); );