Add latest changes from gitlab-org/gitlab@master

spec/services/clusters/kubernetes/create_or_update_namespace_service_spec.rb

@@ -22,7 +22,6 @@ describe Clusters::Kubernetes::CreateOrUpdateNamespaceService, '#execute' do
   before do
     stub_kubeclient_discover(api_url)
-    stub_kubeclient_get_namespaces(api_url)
     stub_kubeclient_get_service_account_error(api_url, 'gitlab')
     stub_kubeclient_create_service_account(api_url)
     stub_kubeclient_get_secret_error(api_url, 'gitlab-token')
@@ -31,6 +30,7 @@ describe Clusters::Kubernetes::CreateOrUpdateNamespaceService, '#execute' do
     stub_kubeclient_get_role_binding(api_url, "gitlab-#{namespace}", namespace: namespace)
     stub_kubeclient_put_role_binding(api_url, "gitlab-#{namespace}", namespace: namespace)
     stub_kubeclient_get_namespace(api_url, namespace: namespace)
+    stub_kubeclient_get_namespace(api_url, namespace: Clusters::Kubernetes::KNATIVE_SERVING_NAMESPACE)
     stub_kubeclient_get_service_account_error(api_url, "#{namespace}-service-account", namespace: namespace)
     stub_kubeclient_create_service_account(api_url, namespace: namespace)
     stub_kubeclient_create_secret(api_url, namespace: namespace)

spec/services/clusters/kubernetes/create_or_update_service_account_service_spec.rb

@@ -141,7 +141,7 @@ describe Clusters::Kubernetes::CreateOrUpdateServiceAccountService do
       before do
         cluster.platform_kubernetes.rbac!
-        stub_kubeclient_get_namespaces(api_url)
+        stub_kubeclient_get_namespace(api_url, namespace: Clusters::Kubernetes::KNATIVE_SERVING_NAMESPACE)
         stub_kubeclient_get_role_binding_error(api_url, role_binding_name, namespace: namespace)
         stub_kubeclient_create_role_binding(api_url, namespace: namespace)
         stub_kubeclient_put_role(api_url, Clusters::Kubernetes::GITLAB_KNATIVE_SERVING_ROLE_NAME, namespace: namespace)

spec/workers/hashed_storage/project_migrate_worker_spec.rb

@@ -5,13 +5,13 @@ require 'spec_helper'
 describe HashedStorage::ProjectMigrateWorker, :clean_gitlab_redis_shared_state do
   include ExclusiveLeaseHelpers
-  describe '#perform' do
-    let(:project) { create(:project, :empty_repo, :legacy_storage) }
-    let(:lease_key) { "project_migrate_hashed_storage_worker:#{project.id}" }
-    let(:lease_timeout) { described_class::LEASE_TIMEOUT }
-    let(:migration_service) { ::Projects::HashedStorage::MigrationService }
+  let(:migration_service) { ::Projects::HashedStorage::MigrationService }
+  let(:lease_timeout) { described_class::LEASE_TIMEOUT }
+  describe '#perform' do
     it 'skips when project no longer exists' do
+      stub_exclusive_lease(lease_key(-1), 'uuid', timeout: lease_timeout)
+
       expect(migration_service).not_to receive(:new)
       subject.perform(-1)
@@ -19,32 +19,67 @@ describe HashedStorage::ProjectMigrateWorker, :clean_gitlab_redis_shared_state d
     it 'skips when project is pending delete' do
       pending_delete_project = create(:project, :empty_repo, pending_delete: true)
+      stub_exclusive_lease(lease_key(pending_delete_project.id), 'uuid', timeout: lease_timeout)
       expect(migration_service).not_to receive(:new)
       subject.perform(pending_delete_project.id)
     end
-    it 'delegates migration to service class when we have exclusive lease' do
-      stub_exclusive_lease(lease_key, 'uuid', timeout: lease_timeout)
-      service_spy = spy
-      allow(migration_service)
-        .to receive(:new).with(project, project.full_path, logger: subject.logger)
-        .and_return(service_spy)
-      subject.perform(project.id)
-      expect(service_spy).to have_received(:execute)
+    it 'skips when project is already migrated' do
+      migrated_project = create(:project, :empty_repo)
+      stub_exclusive_lease(lease_key(migrated_project.id), 'uuid', timeout: lease_timeout)
+
+      expect(migration_service).not_to receive(:new)
+
+      subject.perform(migrated_project.id)
+    end
+
+    context 'with exclusive lease available' do
+      it 'delegates migration to service class' do
+        project = create(:project, :empty_repo, :legacy_storage)
+        stub_exclusive_lease(lease_key(project.id), 'uuid', timeout: lease_timeout)
+        service_spy = spy
+        allow(migration_service)
+          .to receive(:new).with(project, project.full_path, logger: subject.logger)
+                .and_return(service_spy)
+        subject.perform(project.id)
+        expect(service_spy).to have_received(:execute)
+      end
+
+      it 'delegates migration to service class with correct path in a partially migrated project' do
+        project = create(:project, :empty_repo, storage_version: 1)
+        stub_exclusive_lease(lease_key(project.id), 'uuid', timeout: lease_timeout)
+
+        service_spy = spy
+
+        allow(migration_service)
+          .to receive(:new).with(project, project.full_path, logger: subject.logger)
+                .and_return(service_spy)
+
+        subject.perform(project.id)
+
+        expect(service_spy).to have_received(:execute)
+      end
     end
-    it 'skips when it cant acquire the exclusive lease' do
-      stub_exclusive_lease_taken(lease_key, timeout: lease_timeout)
-      expect(migration_service).not_to receive(:new)
-      subject.perform(project.id)
+    context 'with exclusive lease taken' do
+      it 'skips when it cant acquire the exclusive lease' do
+        project = create(:project, :empty_repo, :legacy_storage)
+        stub_exclusive_lease_taken(lease_key(project.id), timeout: lease_timeout)
+        expect(migration_service).not_to receive(:new)
+        subject.perform(project.id)
+      end
     end
   end
+
+  def lease_key(key)
+    "project_migrate_hashed_storage_worker:#{key}"
+  end
 end