diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /app/services/clusters/aws/fetch_credentials_service.rb | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/services/clusters/aws/fetch_credentials_service.rb')
| -rw-r--r-- | app/services/clusters/aws/fetch_credentials_service.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/services/clusters/aws/fetch_credentials_service.rb b/app/services/clusters/aws/fetch_credentials_service.rb index 96abbb43969..497e676f549 100644 --- a/app/services/clusters/aws/fetch_credentials_service.rb +++ b/app/services/clusters/aws/fetch_credentials_service.rb @@ -30,10 +30,17 @@ module Clusters attr_reader :provider, :region def client - ::Aws::STS::Client.new(credentials: gitlab_credentials, region: region) + ::Aws::STS::Client.new(**client_args) + end + + def client_args + { region: region, credentials: gitlab_credentials }.compact end def gitlab_credentials + # These are not needed for IAM instance profiles + return unless access_key_id.present? && secret_access_key.present? + ::Aws::Credentials.new(access_key_id, secret_access_key) end |