diff --git a/ee/config/feature_flags/gitlab_com_derisk/sync_project_archival_status_to_sbom_occurrences.yml b/ee/config/feature_flags/gitlab_com_derisk/sync_project_archival_status_to_sbom_occurrences.yml deleted file mode 100644 index f7d15342a58120e080419406f4bc0ea12e1249f2..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/gitlab_com_derisk/sync_project_archival_status_to_sbom_occurrences.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: sync_project_archival_status_to_sbom_occurrences -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437636 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143874 -rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17572 -milestone: '16.10' -group: group::threat insights -type: gitlab_com_derisk -default_enabled: false diff --git a/ee/lib/ee/gitlab/event_store.rb b/ee/lib/ee/gitlab/event_store.rb index 34b5d4a2741d9565e8964ae594c2c8286e313175..9020fcc612ad53585eccb58d126904cfc6e4bba4 100644 --- a/ee/lib/ee/gitlab/event_store.rb +++ b/ee/lib/ee/gitlab/event_store.rb @@ -63,11 +63,7 @@ def configure!(store) ::Feature.enabled?(:update_vuln_reads_traversal_ids_via_event, ::Group.find_by_id(event.data['group_id']), type: :gitlab_com_derisk) } - store.subscribe ::Sbom::SyncArchivedStatusWorker, to: ::Projects::ProjectArchivedEvent, - if: ->(event) do - project = ::Project.find_by_id(event.data['project_id']) - ::Feature.enabled?(:sync_project_archival_status_to_sbom_occurrences, project) - end + store.subscribe ::Sbom::SyncArchivedStatusWorker, to: ::Projects::ProjectArchivedEvent store.subscribe ::Vulnerabilities::ProcessArchivedEventsWorker, to: ::Projects::ProjectArchivedEvent, if: ->(event) { diff --git a/ee/spec/workers/sbom/sync_archived_status_worker_spec.rb b/ee/spec/workers/sbom/sync_archived_status_worker_spec.rb index 758ebda1b5eb4f7ab6f1a5ff3f9d7f6bf773e704..3ad45f05a37bc1566c45a54d860350236edf7ae3 100644 --- a/ee/spec/workers/sbom/sync_archived_status_worker_spec.rb +++ b/ee/spec/workers/sbom/sync_archived_status_worker_spec.rb @@ -26,12 +26,4 @@ expect { use_event }.to change { sbom_occurrence.reload.archived }.from(false).to(true) .and not_change { sbom_occurrence_outside_project.reload.archived } end - - context 'when sync_project_archival_status_to_sbom_occurrences is disabled' do - before do - stub_feature_flags(sync_project_archival_status_to_sbom_occurrences: false) - end - - it_behaves_like 'ignores the published event' - end end