Merge branch '276011_remove_store_security_findings_feature_flag' into 'master'

Remove `store_security_findings` feature flag related code

See merge request gitlab-org/gitlab!48357

ee/app/finders/security/findings_finder.rb

@@ -29,7 +29,7 @@ module Security
     end
 
     def execute
-      return unless can_use_security_findings?
+      return unless has_security_findings?
 
       ResultSet.new(security_findings, findings)
     end
@@ -39,10 +39,6 @@ module Security
     attr_reader :pipeline, :params
     delegate :project, :has_security_findings?, to: :pipeline, private: true
 
-    def can_use_security_findings?
-      Feature.enabled?(:store_security_findings, project) && has_security_findings?
-    end
-
     def findings
       security_findings.map(&method(:build_vulnerability_finding))
     end

ee/app/services/security/store_scan_service.rb

@@ -19,8 +19,6 @@ module Security
     end
 
     def execute
-      return security_scan unless Feature.enabled?(:store_security_findings, project)
-
       StoreFindingsMetadataService.execute(security_scan, security_report)
       deduplicate_findings? ? update_deduplicated_findings : register_finding_keys
 

ee/changelogs/unreleased/276011_remove_store_security_findings_feature_flag.yml

+---
+title: Remove `store_security_findings` feature flag
+merge_request: 48357
+author:
+type: changed

ee/config/feature_flags/development/store_security_findings.yml

----
-name: store_security_findings
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44312
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276011
-milestone: '13.6'
-type: development
-group: group::threat insights
-default_enabled: false

ee/spec/finders/security/findings_finder_spec.rb

@@ -30,21 +30,6 @@ RSpec.describe Security::FindingsFinder do
   end
 
   describe '#execute' do
-    context 'when the feature is not available' do
-      before do
-        stub_feature_flags(store_security_findings: false)
-      end
-
-      subject { service_object.execute }
-
-      it { is_expected.to be_nil }
-    end
-
-    context 'when the feature is available' do
-      before do
-        stub_feature_flags(store_security_findings: true)
-      end
-
     context 'when the pipeline does not have security findings' do
       subject { service_object.execute }
 
@@ -362,5 +347,4 @@ RSpec.describe Security::FindingsFinder do
       end
     end
   end
-  end
 end

ee/spec/services/security/store_scan_service_spec.rb

@@ -41,37 +41,6 @@ RSpec.describe Security::StoreScanService do
       known_keys.add(finding_key)
     end
 
-    context 'when the `store_security_findings` feature is not enabled' do
-      before do
-        stub_feature_flags(store_security_findings: false)
-      end
-
-      it 'does not call the `Security::StoreFindingsMetadataService`' do
-        store_scan
-
-        expect(Security::StoreFindingsMetadataService).not_to have_received(:execute)
-      end
-
-      context 'when the security scan already exists for the artifact' do
-        let_it_be(:security_scan) { create(:security_scan, build: artifact.job, scan_type: :sast) }
-
-        it 'does not create a new security scan' do
-          expect { store_scan }.not_to change { artifact.job.security_scans.count }
-        end
-      end
-
-      context 'when the security scan does not exist for the artifact' do
-        it 'creates a new security scan' do
-          expect { store_scan }.to change { artifact.job.security_scans.sast.count }.by(1)
-        end
-      end
-    end
-
-    context 'when the `store_security_findings` feature is enabled' do
-      before do
-        stub_feature_flags(store_security_findings: artifact.project)
-      end
-
     it 'calls the `Security::StoreFindingsMetadataService` to store findings' do
       store_scan
 
@@ -159,5 +128,4 @@ RSpec.describe Security::StoreScanService do
       end
     end
   end
-  end
 end