Merge branch...

Merge branch '214563-rename-vulnerabilities-occurrencepipeline-to-vulnerabilities-findingpipeline' into 'master'

Rename OccurrencePipeline to FindingPipeline

See merge request gitlab-org/gitlab!35611

ee/app/models/ee/ci/pipeline.rb

@@ -14,8 +14,8 @@ module EE
       prepended do
         include UsageStatistics
 
-        has_many :vulnerabilities_occurrence_pipelines, class_name: 'Vulnerabilities::OccurrencePipeline'
-        has_many :vulnerability_findings, source: :occurrence, through: :vulnerabilities_occurrence_pipelines, class_name: 'Vulnerabilities::Occurrence'
+        has_many :vulnerabilities_finding_pipelines, class_name: 'Vulnerabilities::FindingPipeline'
+        has_many :vulnerability_findings, source: :occurrence, through: :vulnerabilities_finding_pipelines, class_name: 'Vulnerabilities::Occurrence'
 
         has_many :auto_canceled_pipelines, class_name: 'Ci::Pipeline', foreign_key: 'auto_canceled_by_id'
         has_many :auto_canceled_jobs, class_name: 'CommitStatus', foreign_key: 'auto_canceled_by_id'
@@ -32,7 +32,7 @@ module EE
         end
 
         scope :with_vulnerabilities, -> do
-          where('EXISTS (?)', ::Vulnerabilities::OccurrencePipeline.where('ci_pipelines.id=vulnerability_occurrence_pipelines.pipeline_id').select(1))
+          where('EXISTS (?)', ::Vulnerabilities::FindingPipeline.where('ci_pipelines.id=vulnerability_occurrence_pipelines.pipeline_id').select(1))
         end
 
         # This structure describes feature levels

ee/app/models/vulnerabilities/occurrence_pipeline.rb → ee/app/models/vulnerabilities/finding_pipeline.rb

 # frozen_string_literal: true
 
 module Vulnerabilities
-  class OccurrencePipeline < ApplicationRecord
+  class FindingPipeline < ApplicationRecord
     self.table_name = "vulnerability_occurrence_pipelines"
 
     belongs_to :occurrence, class_name: 'Vulnerabilities::Occurrence'

ee/app/models/vulnerabilities/occurrence.rb

@@ -22,8 +22,8 @@ module Vulnerabilities
 
     has_many :occurrence_identifiers, class_name: 'Vulnerabilities::OccurrenceIdentifier'
     has_many :identifiers, through: :occurrence_identifiers, class_name: 'Vulnerabilities::Identifier'
-    has_many :occurrence_pipelines, class_name: 'Vulnerabilities::OccurrencePipeline'
-    has_many :pipelines, through: :occurrence_pipelines, class_name: 'Ci::Pipeline'
+    has_many :finding_pipelines, class_name: 'Vulnerabilities::FindingPipeline'
+    has_many :pipelines, through: :finding_pipelines, class_name: 'Ci::Pipeline'
 
     attr_writer :sha
 
@@ -103,12 +103,12 @@ module Vulnerabilities
     end
 
     def self.for_pipelines(pipelines)
-      joins(:occurrence_pipelines)
+      joins(:finding_pipelines)
         .where(vulnerability_occurrence_pipelines: { pipeline_id: pipelines })
     end
 
     def self.count_by_day_and_severity(period)
-      joins(:occurrence_pipelines)
+      joins(:finding_pipelines)
         .select('CAST(vulnerability_occurrence_pipelines.created_at AS DATE) AS day', :severity, 'COUNT(distinct vulnerability_occurrences.id) as count')
         .where(['vulnerability_occurrence_pipelines.created_at >= ?', Time.zone.now.beginning_of_day - period])
         .group(:day, :severity)

ee/app/services/security/store_report_service.rb

@@ -89,7 +89,7 @@ module Security
     end
 
     def create_vulnerability_pipeline_object(vulnerability_finding, pipeline)
-      vulnerability_finding.occurrence_pipelines.find_or_create_by!(pipeline: pipeline)
+      vulnerability_finding.finding_pipelines.find_or_create_by!(pipeline: pipeline)
     rescue ActiveRecord::RecordNotUnique
     end
     # rubocop: enable CodeReuse/ActiveRecord

ee/db/fixtures/development/20_vulnerabilities.rb

@@ -16,7 +16,7 @@ class Gitlab::Seeder::Vulnerabilities
       primary_identifier = create_identifier(rank)
       vulnerability = create_vulnerability
       occurrence = create_occurrence(vulnerability, rank, primary_identifier)
-      # Create occurrence_pipeline join model
+      # Create finding_pipeline join model
       occurrence.pipelines << pipeline
       # Create occurrence_identifier join models
       occurrence.identifiers << primary_identifier

ee/spec/factories/vulnerabilities/occurrence_pipelines.rb → ee/spec/factories/vulnerabilities/finding_pipelines.rb

 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :vulnerabilities_occurrence_pipeline, class: 'Vulnerabilities::OccurrencePipeline' do
+  factory :vulnerabilities_finding_pipeline, class: 'Vulnerabilities::FindingPipeline' do
     occurrence factory: :vulnerabilities_occurrence
     pipeline factory: :ci_pipeline
   end

ee/spec/models/ci/pipeline_spec.rb

@@ -14,8 +14,8 @@ RSpec.describe Ci::Pipeline do
 
   it { is_expected.to have_many(:security_scans).through(:builds).class_name('Security::Scan') }
   it { is_expected.to have_many(:downstream_bridges) }
-  it { is_expected.to have_many(:vulnerability_findings).through(:vulnerabilities_occurrence_pipelines).class_name('Vulnerabilities::Occurrence') }
-  it { is_expected.to have_many(:vulnerabilities_occurrence_pipelines).class_name('Vulnerabilities::OccurrencePipeline') }
+  it { is_expected.to have_many(:vulnerability_findings).through(:vulnerabilities_finding_pipelines).class_name('Vulnerabilities::Occurrence') }
+  it { is_expected.to have_many(:vulnerabilities_finding_pipelines).class_name('Vulnerabilities::FindingPipeline') }
 
   describe '.failure_reasons' do
     it 'contains failure reasons about exceeded limits' do

ee/spec/models/vulnerabilities/occurrence_pipeline_spec.rb → ee/spec/models/vulnerabilities/finding_pipeline_spec.rb

@@ -2,14 +2,14 @@
 
 require 'spec_helper'
 
-RSpec.describe Vulnerabilities::OccurrencePipeline do
+RSpec.describe Vulnerabilities::FindingPipeline do
   describe 'associations' do
     it { is_expected.to belong_to(:pipeline).class_name('Ci::Pipeline') }
     it { is_expected.to belong_to(:occurrence).class_name('Vulnerabilities::Occurrence') }
   end
 
   describe 'validations' do
-    let!(:occurrence_pipeline) { create(:vulnerabilities_occurrence_pipeline) }
+    let!(:finding_pipeline) { create(:vulnerabilities_finding_pipeline) }
 
     it { is_expected.to validate_presence_of(:occurrence) }
     it { is_expected.to validate_presence_of(:pipeline) }

ee/spec/models/vulnerabilities/occurrence_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Vulnerabilities::Occurrence do
     it { is_expected.to belong_to(:scanner).class_name('Vulnerabilities::Scanner') }
     it { is_expected.to belong_to(:vulnerability).inverse_of(:findings) }
     it { is_expected.to have_many(:pipelines).class_name('Ci::Pipeline') }
-    it { is_expected.to have_many(:occurrence_pipelines).class_name('Vulnerabilities::OccurrencePipeline') }
+    it { is_expected.to have_many(:finding_pipelines).class_name('Vulnerabilities::FindingPipeline') }
     it { is_expected.to have_many(:identifiers).class_name('Vulnerabilities::Identifier') }
     it { is_expected.to have_many(:occurrence_identifiers).class_name('Vulnerabilities::OccurrenceIdentifier') }
   end

ee/spec/services/security/store_report_service_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Security::StoreReportService, '#execute' do
 
     using RSpec::Parameterized::TableSyntax
 
-    where(:case_name, :report_type, :scanners, :identifiers, :occurrences, :occurrence_identifiers, :occurrence_pipelines) do
+    where(:case_name, :report_type, :scanners, :identifiers, :occurrences, :occurrence_identifiers, :finding_pipelines) do
       'with SAST report'                | :sast                | 3 | 17 | 33 | 39 | 33
       'with Dependency Scanning report' | :dependency_scanning | 2 | 7  | 4  | 7  | 4
       'with Container Scanning report'  | :container_scanning  | 1 | 8  | 8  | 8  | 8
@@ -46,8 +46,8 @@ RSpec.describe Security::StoreReportService, '#execute' do
         expect { subject }.to change { Vulnerabilities::OccurrenceIdentifier.count }.by(occurrence_identifiers)
       end
 
-      it 'inserts all occurrence pipelines (join model)' do
-        expect { subject }.to change { Vulnerabilities::OccurrencePipeline.count }.by(occurrence_pipelines)
+      it 'inserts all finding pipelines (join model)' do
+        expect { subject }.to change { Vulnerabilities::FindingPipeline.count }.by(finding_pipelines)
       end
 
       it 'inserts all vulnerabilties' do
@@ -119,7 +119,7 @@ RSpec.describe Security::StoreReportService, '#execute' do
     end
 
     it 'inserts all occurrence pipelines (join model) for this new pipeline' do
-      expect { subject }.to change { Vulnerabilities::OccurrencePipeline.where(pipeline: new_pipeline).count }.by(33)
+      expect { subject }.to change { Vulnerabilities::FindingPipeline.where(pipeline: new_pipeline).count }.by(33)
     end
 
     it 'inserts new vulnerabilities with data from findings from this new pipeline' do

spec/lib/gitlab/import_export/all_models.yml

@@ -220,7 +220,7 @@ ci_pipelines:
 - parent_pipeline
 - downstream_bridges
 - job_artifacts
-- vulnerabilities_occurrence_pipelines
+- vulnerabilities_finding_pipelines
 - vulnerability_findings
 - pipeline_config
 - security_scans