diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 09:06:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 09:06:24 +0300 |
commit | 1ef4b65f55f4fc6524a47050b4f6d686beb81d3a (patch) | |
tree | 3efc2710e564b86e5e2420d65457f656454006bb /spec/services | |
parent | 18a102a5b95198b6bc8db2589de6353997a33543 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/clusters/aws/fetch_credentials_service_spec.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/spec/services/clusters/aws/fetch_credentials_service_spec.rb b/spec/services/clusters/aws/fetch_credentials_service_spec.rb index 6476130ab32..09f3be0534d 100644 --- a/spec/services/clusters/aws/fetch_credentials_service_spec.rb +++ b/spec/services/clusters/aws/fetch_credentials_service_spec.rb @@ -13,15 +13,6 @@ describe Clusters::Aws::FetchCredentialsService do let(:sts_client) { Aws::STS::Client.new(credentials: gitlab_credentials, region: provider.region) } let(:assumed_role) { instance_double(Aws::AssumeRoleCredentials, credentials: assumed_role_credentials) } - let(:kubernetes_provisioner_settings) do - { - aws: { - access_key_id: gitlab_access_key_id, - secret_access_key: gitlab_secret_access_key - } - } - end - let(:assumed_role_credentials) { double } subject { described_class.new(provider).execute } @@ -30,7 +21,8 @@ describe Clusters::Aws::FetchCredentialsService do let(:provision_role) { create(:aws_role, user: provider.created_by_user) } before do - stub_config(kubernetes: { provisioners: kubernetes_provisioner_settings }) + stub_application_setting(eks_access_key_id: gitlab_access_key_id) + stub_application_setting(eks_secret_access_key: gitlab_secret_access_key) expect(Aws::Credentials).to receive(:new) .with(gitlab_access_key_id, gitlab_secret_access_key) |