Commit 11b57243 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch '277332-ignore-position' into 'master'

Ignore position column from the security_findings table

See merge request gitlab-org/gitlab!76311
parents 22613480 9f7517d2
......@@ -9,8 +9,12 @@
# calculate which report artifact to download and parse.
module Security
class Finding < ApplicationRecord
include IgnorableColumns
self.table_name = 'security_findings'
ignore_column :position, remove_with: '14.8', remove_after: '2022-02-22'
belongs_to :scan, inverse_of: :findings, optional: false
belongs_to :scanner, class_name: 'Vulnerabilities::Scanner', inverse_of: :security_findings, optional: false
......
......@@ -57,7 +57,6 @@ RSpec.describe Security::FindingsFinder do
project_fingerprint: finding.project_fingerprint,
uuid: finding.uuid,
deduplicated: true,
position: index,
scan: scan)
end
end
......@@ -330,7 +329,6 @@ RSpec.describe Security::FindingsFinder do
project_fingerprint: finding.project_fingerprint,
uuid: finding.uuid,
deduplicated: true,
position: index,
scan: scan)
end
end
......@@ -381,7 +379,6 @@ RSpec.describe Security::FindingsFinder do
project_fingerprint: finding.project_fingerprint,
uuid: finding.uuid,
deduplicated: true,
position: index,
scan: scan)
end
end
......
......@@ -34,7 +34,6 @@ RSpec.describe 'Query.project(fullPath).pipeline(iid).securityReportSummary' do
confidence: finding.confidence,
project_fingerprint: finding.project_fingerprint,
deduplicated: true,
position: index,
scan: scan)
end
end
......
......@@ -52,7 +52,6 @@ RSpec.describe Security::VulnerabilityCountingService, '#execute' do
confidence: finding.confidence,
project_fingerprint: finding.project_fingerprint,
deduplicated: true,
position: index,
scan: scan)
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment