diff options
| author | James Letendre <James.Letendre@gmail.com> | 2020-12-15 16:37:46 -0500 |
|---|---|---|
| committer | James Letendre <James.Letendre@gmail.com> | 2020-12-15 16:37:46 -0500 |
| commit | ad95e51cbed523a0f1e3f65fa2a5dd22c8d025f0 (patch) | |
| tree | 6eaa27c9e38cc4aa900934181c168adff8dbadff /lib/private/Files/ObjectStore/S3ConnectionTrait.php | |
| parent | 5b756a9fb077bf71edd744c5018772ac649e5374 (diff) | |
| download | nextcloud-server-ad95e51cbed523a0f1e3f65fa2a5dd22c8d025f0.tar.gz nextcloud-server-ad95e51cbed523a0f1e3f65fa2a5dd22c8d025f0.zip | |
Add web identity provider to S3 connection chain
Signed-off-by: James Letendre <james.letendre@gmail.com>
Diffstat (limited to 'lib/private/Files/ObjectStore/S3ConnectionTrait.php')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index eaa9e9a9074..cbe2f4b20a6 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -105,22 +105,13 @@ trait S3ConnectionTrait { CredentialProvider::chain( $this->paramCredentialProvider(), CredentialProvider::env(), - CredentialProvider::instanceProfile() + CredentialProvider::assumeRoleWithWebIdentityCredentialProvider() + !empty(getenv(EcsCredentialProvider::ENV_URI)) + ? CredentialProvider::ecsCredentials() + : CredentialProvider::instanceProfile() ) ); - // If running in an ECS environment, then also include the ECS task role in the chain - if (!empty(getenv(EcsCredentialProvider::ENV_URI))) { - $provider = CredentialProvider::memoize( - CredentialProvider::chain( - $this->paramCredentialProvider(), - CredentialProvider::env(), - CredentialProvider::ecsCredentials(), - CredentialProvider::instanceProfile() - ) - ); - } - $options = [ 'version' => isset($this->params['version']) ? $this->params['version'] : 'latest', 'credentials' => $provider, |