diff options
Diffstat (limited to 'app/services/clusters/aws/fetch_credentials_service.rb')
| -rw-r--r-- | app/services/clusters/aws/fetch_credentials_service.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/services/clusters/aws/fetch_credentials_service.rb b/app/services/clusters/aws/fetch_credentials_service.rb index 33efc4cc120..96abbb43969 100644 --- a/app/services/clusters/aws/fetch_credentials_service.rb +++ b/app/services/clusters/aws/fetch_credentials_service.rb @@ -10,6 +10,7 @@ module Clusters def initialize(provision_role, provider: nil) @provision_role = provision_role @provider = provider + @region = provider&.region || provision_role&.region || Clusters::Providers::Aws::DEFAULT_REGION end def execute @@ -26,7 +27,7 @@ module Clusters private - attr_reader :provider + attr_reader :provider, :region def client ::Aws::STS::Client.new(credentials: gitlab_credentials, region: region) @@ -44,10 +45,6 @@ module Clusters Gitlab::CurrentSettings.eks_secret_access_key end - def region - provider&.region || Clusters::Providers::Aws::DEFAULT_REGION - end - ## # If we haven't created a provider record yet, # we restrict ourselves to read only access so |