Add latest changes from gitlab-org/gitlab@master

2 files changed, 156 insertions, 0 deletions

diff --git a/spec/migrations/add_temporary_partial_index_on_project_id_to_services_spec.rb b/spec/migrations/add_temporary_partial_index_on_project_id_to_services_spec.rb
new file mode 100644
index 00000000000..2d12fec5cb3
--- /dev/null
+++ b/spec/migrations/add_temporary_partial_index_on_project_id_to_services_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200114112932_add_temporary_partial_index_on_project_id_to_services.rb')
+
+describe AddTemporaryPartialIndexOnProjectIdToServices, :migration do
+  let(:migration) { described_class.new }
+
+  describe '#up' do
+    it 'creates temporary partial index on type' do
+      expect { migration.up }.to change { migration.index_exists?(:services, :project_id, name: described_class::INDEX_NAME) }.from(false).to(true)
+    end
+  end
+
+  describe '#down' do
+    it 'removes temporary partial index on type' do
+      migration.up
+
+      expect { migration.down }.to change { migration.index_exists?(:services, :project_id, name: described_class::INDEX_NAME) }.from(true).to(false)
+    end
+  end
+end
diff --git a/spec/migrations/patch_prometheus_services_for_shared_cluster_applications_spec.rb b/spec/migrations/patch_prometheus_services_for_shared_cluster_applications_spec.rb
new file mode 100644
index 00000000000..83f994c2a94
--- /dev/null
+++ b/spec/migrations/patch_prometheus_services_for_shared_cluster_applications_spec.rb
@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200114113341_patch_prometheus_services_for_shared_cluster_applications.rb')
+
+describe PatchPrometheusServicesForSharedClusterApplications, :migration, :sidekiq do
+  include MigrationHelpers::PrometheusServiceHelpers
+
+  let(:namespaces) { table(:namespaces) }
+  let(:projects) { table(:projects) }
+  let(:services) { table(:services) }
+  let(:clusters) { table(:clusters) }
+  let(:cluster_groups) { table(:cluster_groups) }
+  let(:clusters_applications_prometheus) { table(:clusters_applications_prometheus) }
+  let(:namespace) { namespaces.create!(name: 'gitlab', path: 'gitlab-org') }
+
+  let(:application_statuses) do
+    {
+      errored: -1,
+      installed: 3,
+      updated: 5
+    }
+  end
+
+  let(:cluster_types) do
+    {
+      instance_type: 1,
+      group_type: 2
+    }
+  end
+
+  describe '#up' do
+    let!(:project_with_missing_service) { projects.create!(name: 'gitlab', path: 'gitlab-ce', namespace_id: namespace.id) }
+    let(:project_with_inactive_service) { projects.create!(name: 'gitlab', path: 'gitlab-ee', namespace_id: namespace.id) }
+    let(:project_with_active_service) { projects.create!(name: 'gitlab', path: 'gitlab-ee', namespace_id: namespace.id) }
+    let(:project_with_manual_active_service) { projects.create!(name: 'gitlab', path: 'gitlab-ee', namespace_id: namespace.id) }
+    let(:project_with_manual_inactive_service) { projects.create!(name: 'gitlab', path: 'gitlab-ee', namespace_id: namespace.id) }
+    let(:project_with_active_not_prometheus_service) { projects.create!(name: 'gitlab', path: 'gitlab-ee', namespace_id: namespace.id) }
+    let(:project_with_inactive_not_prometheus_service) { projects.create!(name: 'gitlab', path: 'gitlab-ee', namespace_id: namespace.id) }
+
+    before do
+      services.create(service_params_for(project_with_inactive_service.id, active: false))
+      services.create(service_params_for(project_with_active_service.id, active: true))
+      services.create(service_params_for(project_with_active_not_prometheus_service.id, active: true, type: 'other'))
+      services.create(service_params_for(project_with_inactive_not_prometheus_service.id, active: false, type: 'other'))
+      services.create(service_params_for(project_with_manual_inactive_service.id, active: false, properties: { some: 'data' }.to_json))
+      services.create(service_params_for(project_with_manual_active_service.id, active: true, properties: { some: 'data' }.to_json))
+    end
+
+    shared_examples 'patch prometheus services post migration' do
+      context 'prometheus application is installed on the cluster' do
+        it 'schedules a background migration' do
+          clusters_applications_prometheus.create(cluster_id: cluster.id, status: application_statuses[:installed], version: '123')
+
+          Sidekiq::Testing.fake! do
+            Timecop.freeze do
+              background_migrations = [["ActivatePrometheusServicesForSharedClusterApplications", project_with_missing_service.id],
+                                       ["ActivatePrometheusServicesForSharedClusterApplications", project_with_inactive_service.id],
+                                       ["ActivatePrometheusServicesForSharedClusterApplications", project_with_active_not_prometheus_service.id],
+                                       ["ActivatePrometheusServicesForSharedClusterApplications", project_with_inactive_not_prometheus_service.id]]
+
+              migrate!
+
+              enqueued_migrations = BackgroundMigrationWorker.jobs.map { |job| job['args'] }
+              expect(enqueued_migrations).to match_array(background_migrations)
+            end
+          end
+        end
+      end
+
+      context 'prometheus application was recently updated on the cluster' do
+        it 'schedules a background migration' do
+          clusters_applications_prometheus.create(cluster_id: cluster.id, status: application_statuses[:updated], version: '123')
+
+          Sidekiq::Testing.fake! do
+            Timecop.freeze do
+              background_migrations = [["ActivatePrometheusServicesForSharedClusterApplications", project_with_missing_service.id],
+                                       ["ActivatePrometheusServicesForSharedClusterApplications", project_with_inactive_service.id],
+                                       ["ActivatePrometheusServicesForSharedClusterApplications", project_with_active_not_prometheus_service.id],
+                                       ["ActivatePrometheusServicesForSharedClusterApplications", project_with_inactive_not_prometheus_service.id]]
+
+              migrate!
+
+              enqueued_migrations = BackgroundMigrationWorker.jobs.map { |job| job['args'] }
+              expect(enqueued_migrations).to match_array(background_migrations)
+            end
+          end
+        end
+      end
+
+      context 'prometheus application failed to install on the cluster' do
+        it 'does not schedule a background migration' do
+          clusters_applications_prometheus.create(cluster_id: cluster.id, status: application_statuses[:errored], version: '123')
+
+          Sidekiq::Testing.fake! do
+            Timecop.freeze do
+              migrate!
+
+              expect(BackgroundMigrationWorker.jobs.size).to eq 0
+            end
+          end
+        end
+      end
+
+      context 'prometheus application is NOT installed on the cluster' do
+        it 'does not schedule a background migration' do
+          Sidekiq::Testing.fake! do
+            Timecop.freeze do
+              migrate!
+
+              expect(BackgroundMigrationWorker.jobs.size).to eq 0
+            end
+          end
+        end
+      end
+    end
+
+    context 'Cluster is group_type' do
+      let(:cluster) { clusters.create(name: 'cluster', cluster_type: cluster_types[:group_type]) }
+
+      before do
+        cluster_groups.create(group_id: namespace.id, cluster_id: cluster.id)
+      end
+
+      it_behaves_like 'patch prometheus services post migration'
+    end
+
+    context 'Cluster is instance_type' do
+      let(:cluster) { clusters.create(name: 'cluster', cluster_type: cluster_types[:instance_type]) }
+
+      it_behaves_like 'patch prometheus services post migration'
+    end
+  end
+end