Add latest changes from gitlab-org/gitlab@master

4 files changed, 170 insertions, 3 deletions

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 5bc56f11425..a12cab11293 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -389,6 +389,40 @@ RSpec.describe Gitlab::Database::MigrationHelpers do
 
         model.add_concurrent_index(:users, :foo)
       end
+
+      context 'when targeting a partition table' do
+        let(:schema) { 'public' }
+        let(:name) { '_test_partition_01' }
+        let(:identifier) { "#{schema}.#{name}" }
+
+        before do
+          model.execute(<<~SQL)
+            CREATE TABLE public._test_partitioned_table (
+              id serial NOT NULL,
+              partition_id serial NOT NULL,
+              PRIMARY KEY (id, partition_id)
+            ) PARTITION BY LIST(partition_id);
+
+            CREATE TABLE #{identifier} PARTITION OF public._test_partitioned_table
+            FOR VALUES IN (1);
+          SQL
+        end
+
+        context 'when allow_partition is true' do
+          it 'creates the index concurrently' do
+            expect(model).to receive(:add_index).with(:_test_partition_01, :foo, algorithm: :concurrently)
+
+            model.add_concurrent_index(:_test_partition_01, :foo, allow_partition: true)
+          end
+        end
+
+        context 'when allow_partition is not provided' do
+          it 'raises ArgumentError' do
+            expect { model.add_concurrent_index(:_test_partition_01, :foo) }
+              .to raise_error(ArgumentError, /use add_concurrent_partitioned_index/)
+          end
+        end
+      end
     end
 
     context 'inside a transaction' do
@@ -2889,4 +2923,36 @@ RSpec.describe Gitlab::Database::MigrationHelpers do
       model.add_sequence(:test_table, :test_column, :test_table_id_seq, 1)
     end
   end
+
+  describe "#partition?" do
+    subject { model.partition?(table_name) }
+
+    let(:table_name) { 'ci_builds_metadata' }
+
+    context "when a partition table exist" do
+      context 'when the view postgres_partitions exists' do
+        it 'calls the view', :aggregate_failures do
+          expect(Gitlab::Database::PostgresPartition).to receive(:partition_exists?).with(table_name).and_call_original
+          expect(subject).to be_truthy
+        end
+      end
+
+      context 'when the view postgres_partitions does not exist' do
+        before do
+          allow(model).to receive(:view_exists?).and_return(false)
+        end
+
+        it 'does not call the view', :aggregate_failures do
+          expect(Gitlab::Database::PostgresPartition).to receive(:legacy_partition_exists?).with(table_name).and_call_original
+          expect(subject).to be_truthy
+        end
+      end
+    end
+
+    context "when a partition table does not exist" do
+      let(:table_name) { 'partition_does_not_exist' }
+
+      it { is_expected.to be_falsey }
+    end
+  end
 end
diff --git a/spec/lib/gitlab/database/partitioning_migration_helpers/index_helpers_spec.rb b/spec/lib/gitlab/database/partitioning_migration_helpers/index_helpers_spec.rb
index 5d02266e8a2..a81c8a5a49c 100644
--- a/spec/lib/gitlab/database/partitioning_migration_helpers/index_helpers_spec.rb
+++ b/spec/lib/gitlab/database/partitioning_migration_helpers/index_helpers_spec.rb
@@ -65,8 +65,11 @@ RSpec.describe Gitlab::Database::PartitioningMigrationHelpers::IndexHelpers do
       end
 
       def expect_add_concurrent_index_and_call_original(table, column, index)
-        expect(migration).to receive(:add_concurrent_index).ordered.with(table, column, { name: index })
-          .and_wrap_original { |_, table, column, options| connection.add_index(table, column, **options) }
+        expect(migration).to receive(:add_concurrent_index).ordered.with(table, column, { name: index, allow_partition: true })
+          .and_wrap_original do |_, table, column, options|
+            options.delete(:allow_partition)
+            connection.add_index(table, column, **options)
+          end
       end
     end
 
@@ -91,7 +94,7 @@ RSpec.describe Gitlab::Database::PartitioningMigrationHelpers::IndexHelpers do
 
       it 'forwards them to the index helper methods', :aggregate_failures do
         expect(migration).to receive(:add_concurrent_index)
-          .with(partition1_identifier, column_name, { name: partition1_index, where: 'x > 0', unique: true })
+          .with(partition1_identifier, column_name, { name: partition1_index, where: 'x > 0', unique: true, allow_partition: true })
 
         expect(migration).to receive(:add_index)
           .with(table_name, column_name, { name: index_name, where: 'x > 0', unique: true })
diff --git a/spec/lib/gitlab/database/postgres_partition_spec.rb b/spec/lib/gitlab/database/postgres_partition_spec.rb
index 5a44090d5ae..14a4d405621 100644
--- a/spec/lib/gitlab/database/postgres_partition_spec.rb
+++ b/spec/lib/gitlab/database/postgres_partition_spec.rb
@@ -72,4 +72,36 @@ RSpec.describe Gitlab::Database::PostgresPartition, type: :model do
       expect(find(identifier).condition).to eq("FOR VALUES FROM ('2020-01-01 00:00:00+00') TO ('2020-02-01 00:00:00+00')")
     end
   end
+
+  describe '.partition_exists?' do
+    subject { described_class.partition_exists?(table_name) }
+
+    context 'when the partition exists' do
+      let(:table_name) { "ci_builds_metadata" }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when the partition does not exist' do
+      let(:table_name) { 'partition_does_not_exist' }
+
+      it { is_expected.to be_falsey }
+    end
+  end
+
+  describe '.legacy_partition_exists?' do
+    subject { described_class.legacy_partition_exists?(table_name) }
+
+    context 'when the partition exists' do
+      let(:table_name) { "ci_builds_metadata" }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when the partition does not exist' do
+      let(:table_name) { 'partition_does_not_exist' }
+
+      it { is_expected.to be_falsey }
+    end
+  end
 end
diff --git a/spec/lib/gitlab/gon_helper_spec.rb b/spec/lib/gitlab/gon_helper_spec.rb
index dd4dcca809b..94192a9257c 100644
--- a/spec/lib/gitlab/gon_helper_spec.rb
+++ b/spec/lib/gitlab/gon_helper_spec.rb
@@ -39,6 +39,72 @@ RSpec.describe Gitlab::GonHelper do
         helper.add_gon_variables
       end
     end
+
+    describe 'sentry configuration' do
+      let(:legacy_clientside_dsn) { 'https://xxx@sentry-legacy.example.com/1' }
+      let(:clientside_dsn) { 'https://xxx@sentry.example.com/1' }
+      let(:environment) { 'production' }
+
+      context 'with enable_old_sentry_clientside_integration enabled' do
+        before do
+          stub_feature_flags(
+            enable_old_sentry_clientside_integration: true,
+            enable_new_sentry_clientside_integration: false
+          )
+
+          stub_config(sentry: { enabled: true, clientside_dsn: legacy_clientside_dsn, environment: environment })
+        end
+
+        it 'sets sentry dsn and environment from config' do
+          expect(gon).to receive(:sentry_dsn=).with(legacy_clientside_dsn)
+          expect(gon).to receive(:sentry_environment=).with(environment)
+
+          helper.add_gon_variables
+        end
+      end
+
+      context 'with enable_new_sentry_clientside_integration enabled' do
+        before do
+          stub_feature_flags(
+            enable_old_sentry_clientside_integration: false,
+            enable_new_sentry_clientside_integration: true
+          )
+
+          stub_application_setting(sentry_enabled: true)
+          stub_application_setting(sentry_clientside_dsn: clientside_dsn)
+          stub_application_setting(sentry_environment: environment)
+        end
+
+        it 'sets sentry dsn and environment from application settings' do
+          expect(gon).to receive(:sentry_dsn=).with(clientside_dsn)
+          expect(gon).to receive(:sentry_environment=).with(environment)
+
+          helper.add_gon_variables
+        end
+      end
+
+      context 'with enable_old_sentry_clientside_integration and enable_new_sentry_clientside_integration enabled' do
+        before do
+          stub_feature_flags(
+            enable_old_sentry_clientside_integration: true,
+            enable_new_sentry_clientside_integration: true
+          )
+
+          stub_config(sentry: { enabled: true, clientside_dsn: legacy_clientside_dsn, environment: environment })
+
+          stub_application_setting(sentry_enabled: true)
+          stub_application_setting(sentry_clientside_dsn: clientside_dsn)
+          stub_application_setting(sentry_environment: environment)
+        end
+
+        it 'sets sentry dsn and environment from application settings' do
+          expect(gon).to receive(:sentry_dsn=).with(clientside_dsn)
+          expect(gon).to receive(:sentry_environment=).with(environment)
+
+          helper.add_gon_variables
+        end
+      end
+    end
   end
 
   describe '#push_frontend_feature_flag' do