Merge branch '244380_fix_populate_has_vulnerabilities_migration' into 'master'

Filter non-existing Project IDs while populating `has_vulnerabilities`

See merge request !47267

lib/gitlab/background_migration/populate_has_vulnerabilities.rb

@@ -9,10 +9,12 @@ class ProjectSetting < ActiveRecord::Base # rubocop:disable Style/Documentation
         self.table_name = 'project_settings'
 
         UPSERT_SQL = <<~SQL
+          WITH upsert_data (project_id, has_vulnerabilities, created_at, updated_at) AS (
+            SELECT projects.id, true, current_timestamp, current_timestamp FROM projects WHERE projects.id IN (%{project_ids})
+          )
           INSERT INTO project_settings
           (project_id, has_vulnerabilities, created_at, updated_at)
-          VALUES
-          %{values}
+          (SELECT * FROM upsert_data)
           ON CONFLICT (project_id)
           DO UPDATE SET
             has_vulnerabilities = true,
@@ -20,10 +22,7 @@ class ProjectSetting < ActiveRecord::Base # rubocop:disable Style/Documentation
         SQL
 
         def self.upsert_for(project_ids)
-          timestamp = connection.quote(Time.now)
-          values = project_ids.map { |project_id| "(#{project_id}, true, #{timestamp}, #{timestamp})" }.join(', ')
-
-          connection.execute(UPSERT_SQL % { values: values })
+          connection.execute(UPSERT_SQL % { project_ids: project_ids.join(', ') })
         end
       end
 

spec/lib/gitlab/background_migration/populate_has_vulnerabilities_spec.rb

@@ -39,6 +39,13 @@
                                                                                  count: 2)
     end
 
+    context 'when non-existing project_id is given' do
+      it 'populates only for the existing projects' do
+        expect { subject.perform(project_1.id, 0, project_3.id) }.to change { project_settings.count }.from(1).to(2)
+                                                                 .and change { project_settings.where(has_vulnerabilities: true).count }.from(0).to(2)
+      end
+    end
+
     context 'when an error happens' do
       before do
         allow(described_class::ProjectSetting).to receive(:upsert_for).and_raise('foo')

[🤖 GitLab Bot 🤖]

The package-and-qa job from pipeline https://gitlab.com/gitlab-org/gitlab/-/pipelines/214872061 triggered https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/-/pipelines/214893638 downstream.