Merge branch...

Merge branch '293843-expand-filtering-functionality-of-vulnerabilities-graphql-endpoint-to-support-vendor-graphql' into 'master'

GraphQL field for Scanner ID

See merge request gitlab-org/gitlab!56041

doc/api/graphql/reference/index.md

@@ -376,6 +376,7 @@ Returns [`VulnerabilityConnection`](#vulnerabilityconnection).
 | `projectId` | [`[ID!]`](#id) | Filter vulnerabilities by project. |
 | `reportType` | [`[VulnerabilityReportType!]`](#vulnerabilityreporttype) | Filter vulnerabilities by report type. |
 | `scanner` | [`[String!]`](#string) | Filter vulnerabilities by VulnerabilityScanner.externalId. |
+| `scannerId` | [`[Int!]`](#int) | Filter vulnerabilities by scanner ID. |
 | `severity` | [`[VulnerabilitySeverity!]`](#vulnerabilityseverity) | Filter vulnerabilities by severity. |
 | `sort` | [`VulnerabilitySort`](#vulnerabilitysort) | List vulnerabilities by sort order. |
 | `state` | [`[VulnerabilityState!]`](#vulnerabilitystate) | Filter vulnerabilities by state. |

ee/app/assets/javascripts/security_dashboard/graphql/queries/instance_vulnerabilities.query.graphql

@@ -8,6 +8,7 @@ query instance(
   $severity: [VulnerabilitySeverity!]
   $reportType: [VulnerabilityReportType!]
   $scanner: [String!]
+  $scannerId: [Int!]
   $state: [VulnerabilityState!]
   $sort: VulnerabilitySort
   $hasIssues: Boolean
@@ -21,6 +22,7 @@ query instance(
     state: $state
     projectId: $projectId
     scanner: $scanner
+    scannerId: $scannerId
     sort: $sort
     hasIssues: $hasIssues
     hasResolution: $hasResolution

ee/app/finders/security/vulnerabilities_finder.rb

@@ -67,8 +67,8 @@ module Security
     end
 
     def filter_by_scanner_ids
-      if params[:scanner_ids].present?
-        @vulnerabilities = vulnerabilities.by_scanner_ids(params[:scanner_ids])
+      if params[:scanner_id].present?
+        @vulnerabilities = vulnerabilities.by_scanner_ids(params[:scanner_id])
       end
     end
 

ee/app/graphql/resolvers/vulnerabilities_resolver.rb

@@ -26,6 +26,10 @@ module Resolvers
              required: false,
              description: 'Filter vulnerabilities by VulnerabilityScanner.externalId.'
 
+    argument :scanner_id, [GraphQL::INT_TYPE],
+             required: false,
+             description: 'Filter vulnerabilities by scanner ID.'
+
     argument :sort, Types::VulnerabilitySortEnum,
              required: false,
              default_value: 'severity_desc',

ee/changelogs/unreleased/293843-expand-filtering-functionality-of-vulnerabilities-graphql-end-1.yml

+---
+title: Add GraphQL field for vulnerability scanner ID
+merge_request: 56041
+author:
+type: changed

ee/spec/finders/security/vulnerabilities_finder_spec.rb

@@ -67,7 +67,7 @@ RSpec.describe Security::VulnerabilitiesFinder do
   end
 
   context 'when filtered by scanner_id' do
-    let(:filters) { { scanner_ids: [vulnerability1.finding_scanner_id, vulnerability3.finding_scanner_id] } }
+    let(:filters) { { scanner_id: [vulnerability1.finding_scanner_id, vulnerability3.finding_scanner_id] } }
 
     it 'only returns vulnerabilities matching the given scanner IDs' do
       is_expected.to contain_exactly(vulnerability1, vulnerability3)

ee/spec/graphql/resolvers/vulnerabilities_resolver_spec.rb

@@ -69,10 +69,18 @@ RSpec.describe Resolvers::VulnerabilitiesResolver do
       end
     end
 
-    context 'when given scanner' do
+    context 'when given scanner external IDs' do
       let(:params) { { scanner: [high_vulnerability.finding_scanner_external_id] } }
 
-      it 'only returns vulnerabilities of the given scanner' do
+      it 'only returns vulnerabilities of the given scanner external IDs' do
+        is_expected.to contain_exactly(high_vulnerability)
+      end
+    end
+
+    context 'when given scanner ID' do
+      let(:params) { { scanner_id: [high_vulnerability.finding_scanner_id] } }
+
+      it 'only returns vulnerabilities of the given scanner IDs' do
         is_expected.to contain_exactly(high_vulnerability)
       end
     end