Merge branch '231026-rename-scanner-csv-export' into 'master'

Vulnerabilities CSV: Rename "scanner" to "tool"

See merge request gitlab-org/gitlab!68238

doc/api/vulnerability_exports.md

@@ -198,7 +198,7 @@ The response is `404 Not Found` if the vulnerability export is not finished yet
 Example response:
 
 ```csv
-Group Name,Project Name,Scanner Type,Scanner Name,Status,Vulnerability,Details,Additional Info,Severity,CVE,CWE,Other Identifiers
+Group Name,Project Name,Tool,Scanner Name,Status,Vulnerability,Details,Additional Info,Severity,CVE,CWE,Other Identifiers
 Gitlab.org,Defend,container_scanning,Trivy,detected,CVE-2017-16997 in glibc,,CVE-2017-16997 in glibc,critical,CVE-2017-16997
 Gitlab.org,Defend,container_scanning,Trivy,detected,CVE-2017-18269 in glibc,,CVE-2017-18269 in glibc,critical,CVE-2017-18269
 Gitlab.org,Defend,container_scanning,Trivy,detected,CVE-2018-1000001 in glibc,,CVE-2018-1000001 in glibc,high,CVE-2018-1000001

ee/app/services/vulnerability_exports/exporters/csv_service.rb

@@ -8,7 +8,7 @@ module VulnerabilityExports
       MAPPING = {
         'Group Name' => 'group_name',
         'Project Name' => 'project_name',
-        'Scanner Type' => 'report_type',
+        'Tool' => 'report_type',
         'Scanner Name' => 'finding_scanner_name',
         'Status' => 'state',
         'Vulnerability' => 'title',

ee/spec/services/vulnerability_exports/exporters/csv_service_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe VulnerabilityExports::Exporters::CsvService do
   end
 
   it 'includes the columns required for import' do
-    expect(csv.headers).to contain_exactly('Group Name', 'Project Name', 'Scanner Type', 'Scanner Name', 'Status',
+    expect(csv.headers).to contain_exactly('Group Name', 'Project Name', 'Tool', 'Scanner Name', 'Status',
                                            'Vulnerability', 'Details', 'Additional Info', 'Severity', 'CVE', 'CWE', 'Other Identifiers')
   end
 
@@ -39,7 +39,7 @@ RSpec.describe VulnerabilityExports::Exporters::CsvService do
         it 'includes proper values for each column type', :aggregate_failures do
           expect(csv[0]['Group Name']).to eq group.name
           expect(csv[0]['Project Name']).to eq project.name
-          expect(csv[0]['Scanner Type']).to eq vulnerability.report_type
+          expect(csv[0]['Tool']).to eq vulnerability.report_type
           expect(csv[0]['Scanner Name']).to eq vulnerability.finding_scanner_name
           expect(csv[0]['Status']).to eq vulnerability.state
           expect(csv[0]['Vulnerability']).to eq vulnerability.title
@@ -60,7 +60,7 @@ RSpec.describe VulnerabilityExports::Exporters::CsvService do
         it 'includes proper values for each column except group name' do
           expect(csv[0]['Group Name']).to be_nil
           expect(csv[0]['Project Name']).to eq project.name
-          expect(csv[0]['Scanner Type']).to eq vulnerability.report_type
+          expect(csv[0]['Tool']).to eq vulnerability.report_type
           expect(csv[0]['Scanner Name']).to eq vulnerability.finding_scanner_name
           expect(csv[0]['Status']).to eq vulnerability.state
           expect(csv[0]['Vulnerability']).to eq vulnerability.title
@@ -82,7 +82,7 @@ RSpec.describe VulnerabilityExports::Exporters::CsvService do
       it 'includes proper values for each column except Other Identifiers' do
         expect(csv[0]['Group Name']).to eq group.name
         expect(csv[0]['Project Name']).to eq project.name
-        expect(csv[0]['Scanner Type']).to eq vulnerability.report_type
+        expect(csv[0]['Tool']).to eq vulnerability.report_type
         expect(csv[0]['Scanner Name']).to eq vulnerability.finding_scanner_name
         expect(csv[0]['Status']).to eq vulnerability.state
         expect(csv[0]['Vulnerability']).to eq vulnerability.title