diff --git a/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml b/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml new file mode 100644 index 0000000000000000000000000000000000000000..ac3fc1f39c860de8db982876bdbdaf690bd46aec --- /dev/null +++ b/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml @@ -0,0 +1,10 @@ +--- +name: AddPolicyAutoDismissedFieldToVulnerability +version: '20251211130305' +description: Adds policy_auto_dismissed field to the Vulnerability index. +group: group::security policies +milestone: '18.8' +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/216336 +obsolete: false +marked_obsolete_by_url: +marked_obsolete_in_milestone: diff --git a/ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb b/ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb new file mode 100644 index 0000000000000000000000000000000000000000..9d59e591d011175915c1815ef3f7397bceb97822 --- /dev/null +++ b/ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddPolicyAutoDismissedFieldToVulnerability < Elastic::Migration + include ::Search::Elastic::MigrationUpdateMappingsHelper + + DOCUMENT_TYPE = Vulnerability + + private + + def new_mappings + { + policy_auto_dismissed: { + type: 'boolean' + } + } + end +end diff --git a/ee/lib/search/elastic/types/vulnerability.rb b/ee/lib/search/elastic/types/vulnerability.rb index 6db841d26860786610b36ab32a91419ae028444e..c1249048bff84964852717a15bfb3ced203c3387 100644 --- a/ee/lib/search/elastic/types/vulnerability.rb +++ b/ee/lib/search/elastic/types/vulnerability.rb @@ -78,7 +78,8 @@ def base_mappings false_positive: { type: 'boolean' }, schema_version: { type: 'short' }, security_project_tracked_context_id: { type: 'long' }, - undetected_since: { type: 'date' } + undetected_since: { type: 'date' }, + policy_auto_dismissed: { type: 'boolean' } } end diff --git a/ee/spec/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability_spec.rb b/ee/spec/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability_spec.rb new file mode 100644 index 0000000000000000000000000000000000000000..3d34d19d0f7fc7dd93e604f58ba8dd8ee8d25438 --- /dev/null +++ b/ee/spec/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability_spec.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +require 'spec_helper' +require File.expand_path('ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb') + +RSpec.describe AddPolicyAutoDismissedFieldToVulnerability, :elastic, feature_category: :security_policy_management do + let(:version) { 20251211130305 } + + include_examples 'migration adds mapping' +end