Merge branch 'bwill/fix-update-vuln-reads-archived-via-event-ff' into 'master'

Ensure Event#data has indifferent access

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145585



Merged-by: Javiera Tapia <jtapia@gitlab.com>
Approved-by: Javiera Tapia <jtapia@gitlab.com>
Co-authored-by: Brian Williams <bwilliams@gitlab.com>

ee/spec/workers/vulnerabilities/process_archived_events_worker_spec.rb

@@ -17,6 +17,10 @@
     })
   end
 
+  before do
+    stub_feature_flags(update_vuln_reads_archived_via_event: [project, other_project, project_without_vulnerabilities])
+  end
+
   it_behaves_like 'worker with data consistency', described_class, data_consistency: :sticky
 
   subject(:use_event) { consume_event(subscriber: described_class, event: event) }

ee/spec/workers/vulnerabilities/process_transfer_events_worker_spec.rb

@@ -27,6 +27,11 @@
     })
   end
 
+  before do
+    stub_feature_flags(update_vuln_reads_traversal_ids_via_event: [project, other_project,
+      project_without_vulnerabilities, group])
+  end
+
   it_behaves_like 'worker with data consistency', described_class, data_consistency: :always
 
   subject(:use_event) { consume_event(subscriber: described_class, event: event) }

lib/gitlab/event_store/event.rb

@@ -36,7 +36,7 @@ class << self
       def initialize(data:)
         validate_schema!
         validate_data!(data)
-        @data = data
+        @data = data.with_indifferent_access
       end
 
       def schema

lib/gitlab/event_store/subscriber.rb

@@ -43,7 +43,7 @@ def handle_event(event)
       private
 
       def construct_event(event_type, event_data)
-        event_type.new(data: event_data.with_indifferent_access)
+        event_type.new(data: event_data)
       end
     end
   end

spec/lib/gitlab/event_store/event_spec.rb

@@ -7,7 +7,7 @@
 RSpec.describe Gitlab::EventStore::Event, feature_category: :shared do
   let(:event_class) { stub_const('TestEvent', Class.new(described_class)) }
   let(:event) { event_class.new(data: data) }
-  let(:data) { { project_id: 123, project_path: 'org/the-project' } }
+  let(:data) { { 'project_id' => 123, 'project_path' => 'org/the-project' } }
 
   context 'when schema is not defined' do
     it 'raises an error on initialization' do
@@ -31,6 +31,11 @@ def schema
       end
     end
 
+    it 'returns data with indifferent access' do
+      expect(event.data[:project_id]).to eq(123)
+      expect(event.data['project_id']).to eq(123)
+    end
+
     describe 'schema validation' do
       context 'when data matches the schema' do
         it 'initializes the event correctly' do
@@ -39,7 +44,7 @@ def schema
       end
 
       context 'when required properties are present as well as unknown properties' do
-        let(:data) { { project_id: 123, unknown_key: 'unknown_value' } }
+        let(:data) { { 'project_id' => 123, 'unknown_key' => 'unknown_value' } }
 
         it 'initializes the event correctly' do
           expect(event.data).to eq(data)

spec/support/matchers/event_store.rb

@@ -31,7 +31,7 @@ def match_data?(actual, expected)
   end
 
   chain :with do |expected_data|
-    @expected_data = expected_data
+    @expected_data = expected_data.with_indifferent_access
   end
 
   failure_message do