Merge branch...

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

Expose Vulnerability Scanner ID through GraphQL query

See merge request gitlab-org/gitlab!58595

doc/api/graphql/reference/index.md

@@ -7492,6 +7492,7 @@ Represents a vulnerability scanner.
 | Field | Type | Description |
 | ----- | ---- | ----------- |
 | `externalId` | [`String`](#string) | External ID of the vulnerability scanner. |
+| `id` | [`ID`](#id) | ID of the scanner. |
 | `name` | [`String`](#string) | Name of the vulnerability scanner. |
 | `reportType` | [`VulnerabilityReportType`](#vulnerabilityreporttype) | Type of the vulnerability report. |
 | `vendor` | [`String`](#string) | Vendor of the vulnerability scanner. |

ee/app/graphql/types/vulnerability_scanner_type.rb

@@ -7,6 +7,9 @@ module Types
 
     authorize :read_vulnerability_scanner
 
+    field :id, GraphQL::ID_TYPE, null: true,
+          description: 'ID of the scanner.'
+
     field :name, GraphQL::STRING_TYPE, null: true,
           description: 'Name of the vulnerability scanner.'
 

ee/changelogs/unreleased/293843-expand-filtering-functionality-of-vulnerabilities-graphql-scanner-id.yml

+---
+title: Expose vulnerability Scanner ID through GraphQL query
+merge_request: 58595
+author:
+type: changed

ee/spec/graphql/types/vulnerability_scanner_type_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe GitlabSchema.types['VulnerabilityScanner'] do
   let_it_be(:user) { create(:user) }
 
   let(:fields) do
-    %i[name external_id vendor report_type]
+    %i[id name external_id vendor report_type]
   end
 
   before do