upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #27493 from cuppett/cuppett/simplify-aws-credential-provider

Browse source
This commit is contained in:
Julius Härtl 2021-12-21 11:58:52 +01:00 committed by GitHub
commit 1acfbd0b06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/Files/ObjectStore/S3ConnectionTrait.php
View file

@ -109,15 +109,11 @@ trait S3ConnectionTrait {
$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
// Adding explicit credential provider to the beginning chain.
// Including environment variables and IAM instance profiles.
// Including default credential provider (skipping AWS shared config files).
$provider = CredentialProvider::memoize(
CredentialProvider::chain(
$this->paramCredentialProvider(),
CredentialProvider::env(),
CredentialProvider::assumeRoleWithWebIdentityCredentialProvider(),
!empty(getenv(EcsCredentialProvider::ENV_URI))
? CredentialProvider::ecsCredentials()
: CredentialProvider::instanceProfile()
CredentialProvider::defaultProvider(['use_aws_shared_config_files' => false])
)
);