Rename to CreateOrUpdateServiceAccountService
This reflects how we now create or update
This commit is contained in:
parent
9c140b7d26
commit
ba2d8a3f34
|
@ -26,7 +26,7 @@ module Clusters
|
|||
private
|
||||
|
||||
def create_gitlab_service_account!
|
||||
Clusters::Gcp::Kubernetes::CreateServiceAccountService.gitlab_creator(
|
||||
Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService.gitlab_creator(
|
||||
kube_client,
|
||||
rbac: create_rbac_cluster?
|
||||
).execute
|
||||
|
|
|
@ -27,7 +27,7 @@ module Clusters
|
|||
end
|
||||
|
||||
def create_project_service_account
|
||||
Clusters::Gcp::Kubernetes::CreateServiceAccountService.namespace_creator(
|
||||
Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService.namespace_creator(
|
||||
platform.kubeclient,
|
||||
service_account_name: kubernetes_namespace.service_account_name,
|
||||
service_account_namespace: kubernetes_namespace.namespace,
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
module Clusters
|
||||
module Gcp
|
||||
module Kubernetes
|
||||
class CreateServiceAccountService
|
||||
class CreateOrUpdateServiceAccountService
|
||||
def initialize(kubeclient, service_account_name:, service_account_namespace:, token_name:, rbac:, namespace_creator: false, role_binding_name: nil)
|
||||
@kubeclient = kubeclient
|
||||
@service_account_name = service_account_name
|
|
@ -51,7 +51,7 @@ describe Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService, '#execute' d
|
|||
end
|
||||
|
||||
it 'creates project service account' do
|
||||
expect_any_instance_of(Clusters::Gcp::Kubernetes::CreateServiceAccountService).to receive(:execute).once
|
||||
expect_any_instance_of(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService).to receive(:execute).once
|
||||
|
||||
subject
|
||||
end
|
||||
|
@ -115,7 +115,7 @@ describe Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService, '#execute' d
|
|||
end
|
||||
|
||||
it 'creates project service account' do
|
||||
expect_any_instance_of(Clusters::Gcp::Kubernetes::CreateServiceAccountService).to receive(:execute).once
|
||||
expect_any_instance_of(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService).to receive(:execute).once
|
||||
|
||||
subject
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# frozen_string_literal: true
|
||||
require 'spec_helper'
|
||||
|
||||
describe Clusters::Gcp::Kubernetes::CreateServiceAccountService do
|
||||
describe Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService do
|
||||
include KubernetesHelpers
|
||||
|
||||
let(:api_url) { 'http://111.111.111.111' }
|
|
@ -5,11 +5,11 @@ require 'spec_helper'
|
|||
describe Clusters::RefreshService do
|
||||
shared_examples 'creates a kubernetes namespace' do
|
||||
let(:token) { 'aaaaaa' }
|
||||
let(:service_account_creator) { double(Clusters::Gcp::Kubernetes::CreateServiceAccountService, execute: true) }
|
||||
let(:service_account_creator) { double(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService, execute: true) }
|
||||
let(:secrets_fetcher) { double(Clusters::Gcp::Kubernetes::FetchKubernetesTokenService, execute: token) }
|
||||
|
||||
it 'creates a kubernetes namespace' do
|
||||
expect(Clusters::Gcp::Kubernetes::CreateServiceAccountService).to receive(:namespace_creator).and_return(service_account_creator)
|
||||
expect(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService).to receive(:namespace_creator).and_return(service_account_creator)
|
||||
expect(Clusters::Gcp::Kubernetes::FetchKubernetesTokenService).to receive(:new).and_return(secrets_fetcher)
|
||||
|
||||
expect { subject }.to change(project.kubernetes_namespaces, :count)
|
||||
|
@ -22,7 +22,7 @@ describe Clusters::RefreshService do
|
|||
|
||||
shared_examples 'does not create a kubernetes namespace' do
|
||||
it 'does not create a new kubernetes namespace' do
|
||||
expect(Clusters::Gcp::Kubernetes::CreateServiceAccountService).not_to receive(:namespace_creator)
|
||||
expect(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService).not_to receive(:namespace_creator)
|
||||
expect(Clusters::Gcp::Kubernetes::FetchKubernetesTokenService).not_to receive(:new)
|
||||
|
||||
expect { subject }.not_to change(Clusters::KubernetesNamespace, :count)
|
||||
|
|
|
@ -266,13 +266,13 @@ describe Projects::CreateService, '#execute' do
|
|||
let(:group) { group_cluster.group }
|
||||
|
||||
let(:token) { 'aaaa' }
|
||||
let(:service_account_creator) { double(Clusters::Gcp::Kubernetes::CreateServiceAccountService, execute: true) }
|
||||
let(:service_account_creator) { double(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService, execute: true) }
|
||||
let(:secrets_fetcher) { double(Clusters::Gcp::Kubernetes::FetchKubernetesTokenService, execute: token) }
|
||||
|
||||
before do
|
||||
group.add_owner(user)
|
||||
|
||||
expect(Clusters::Gcp::Kubernetes::CreateServiceAccountService).to receive(:namespace_creator).and_return(service_account_creator)
|
||||
expect(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService).to receive(:namespace_creator).and_return(service_account_creator)
|
||||
expect(Clusters::Gcp::Kubernetes::FetchKubernetesTokenService).to receive(:new).and_return(secrets_fetcher)
|
||||
end
|
||||
|
||||
|
|
|
@ -68,13 +68,13 @@ describe Projects::TransferService do
|
|||
let(:group) { group_cluster.group }
|
||||
|
||||
let(:token) { 'aaaa' }
|
||||
let(:service_account_creator) { double(Clusters::Gcp::Kubernetes::CreateServiceAccountService, execute: true) }
|
||||
let(:service_account_creator) { double(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService, execute: true) }
|
||||
let(:secrets_fetcher) { double(Clusters::Gcp::Kubernetes::FetchKubernetesTokenService, execute: token) }
|
||||
|
||||
subject { transfer_project(project, user, group) }
|
||||
|
||||
before do
|
||||
expect(Clusters::Gcp::Kubernetes::CreateServiceAccountService).to receive(:namespace_creator).and_return(service_account_creator)
|
||||
expect(Clusters::Gcp::Kubernetes::CreateOrUpdateServiceAccountService).to receive(:namespace_creator).and_return(service_account_creator)
|
||||
expect(Clusters::Gcp::Kubernetes::FetchKubernetesTokenService).to receive(:new).and_return(secrets_fetcher)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue