Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

4 files changed, 60 insertions, 1 deletions

diff --git a/spec/services/clusters/agent_tokens/create_service_spec.rb b/spec/services/clusters/agent_tokens/create_service_spec.rb
index 92629af06c8..dc7abd1504b 100644
--- a/spec/services/clusters/agent_tokens/create_service_spec.rb
+++ b/spec/services/clusters/agent_tokens/create_service_spec.rb
@@ -47,6 +47,21 @@ RSpec.describe Clusters::AgentTokens::CreateService do
         expect(token.name).to eq(params[:name])
       end
 
+      it 'creates an activity event' do
+        expect { subject }.to change { ::Clusters::Agents::ActivityEvent.count }.by(1)
+
+        token = subject.payload[:token].reload
+        event = cluster_agent.activity_events.last
+
+        expect(event).to have_attributes(
+          kind: 'token_created',
+          level: 'info',
+          recorded_at: token.created_at,
+          user: token.created_by_user,
+          agent_token: token
+        )
+      end
+
       context 'when params are invalid' do
         let(:params) { { agent_id: 'bad_id' } }
 
@@ -54,6 +69,10 @@ RSpec.describe Clusters::AgentTokens::CreateService do
           expect { subject }.not_to change(::Clusters::AgentToken, :count)
         end
 
+        it 'does not create an activity event' do
+          expect { subject }.not_to change { ::Clusters::Agents::ActivityEvent.count }
+        end
+
         it 'returns validation errors', :aggregate_failures do
           expect(subject.status).to eq(:error)
           expect(subject.message).to eq(["Agent must exist", "Name can't be blank"])
diff --git a/spec/services/clusters/cleanup/project_namespace_service_spec.rb b/spec/services/clusters/cleanup/project_namespace_service_spec.rb
index ec510b2e3c5..8d3ae217a9f 100644
--- a/spec/services/clusters/cleanup/project_namespace_service_spec.rb
+++ b/spec/services/clusters/cleanup/project_namespace_service_spec.rb
@@ -95,5 +95,31 @@ RSpec.describe Clusters::Cleanup::ProjectNamespaceService do
         subject
       end
     end
+
+    context 'when there is a Kubeclient::HttpError' do
+      let(:kubeclient_instance_double) do
+        instance_double(Gitlab::Kubernetes::KubeClient)
+      end
+
+      ['Unauthorized', 'forbidden', 'Certificate verify Failed'].each do |message|
+        it 'schedules ::ServiceAccountWorker with accepted errors' do
+          allow(kubeclient_instance_double)
+            .to receive(:delete_namespace)
+            .and_raise(Kubeclient::HttpError.new(401, message, nil))
+
+          expect(Clusters::Cleanup::ServiceAccountWorker).to receive(:perform_async).with(cluster.id)
+
+          subject
+        end
+      end
+
+      it 'raises error with unaccepted errors' do
+        allow(kubeclient_instance_double)
+          .to receive(:delete_namespace)
+          .and_raise(Kubeclient::HttpError.new(401, 'unexpected message', nil))
+
+        expect { subject }.to raise_error(Kubeclient::HttpError)
+      end
+    end
   end
 end
diff --git a/spec/services/clusters/cleanup/service_account_service_spec.rb b/spec/services/clusters/cleanup/service_account_service_spec.rb
index adcdbd84da0..769762237f9 100644
--- a/spec/services/clusters/cleanup/service_account_service_spec.rb
+++ b/spec/services/clusters/cleanup/service_account_service_spec.rb
@@ -52,5 +52,19 @@ RSpec.describe Clusters::Cleanup::ServiceAccountService do
         expect { subject }.to change { Clusters::Cluster.where(id: cluster.id).exists? }.from(true).to(false)
       end
     end
+
+    context 'when there is a Kubeclient::HttpError' do
+      ['Unauthorized', 'forbidden', 'Certificate verify Failed'].each do |message|
+        before do
+          allow(kubeclient_instance_double)
+            .to receive(:delete_service_account)
+            .and_raise(Kubeclient::HttpError.new(401, message, nil))
+        end
+
+        it 'destroys cluster' do
+          expect { subject }.to change { Clusters::Cluster.where(id: cluster.id).exists? }.from(true).to(false)
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/clusters/integrations/prometheus_health_check_service_spec.rb b/spec/services/clusters/integrations/prometheus_health_check_service_spec.rb
index 9db3b9d2417..7147f1b9b28 100644
--- a/spec/services/clusters/integrations/prometheus_health_check_service_spec.rb
+++ b/spec/services/clusters/integrations/prometheus_health_check_service_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe Clusters::Integrations::PrometheusHealthCheckService, '#execute'
       let(:prometheus_enabled) { true }
 
       before do
-        client = instance_double('PrometheusClient', healthy?: client_healthy)
+        client = instance_double('Gitlab::PrometheusClient', healthy?: client_healthy)
         expect(prometheus).to receive(:prometheus_client).and_return(client)
       end