Commit 87345e04 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'refactoring-update-lm-naming' into 'master'

Rename Security:LicenseComplianceJobsFinder

See merge request gitlab-org/gitlab!28765
parents 0d8c98d6 7fa5f413
# frozen_string_literal: true # frozen_string_literal: true
# Security::LicenseManagementJobsFinder # Security::LicenseScanningJobsFinder
# #
# Used to find jobs (builds) that are related to the License Management. # Used to find jobs (builds) that are related to the License Management.
# #
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# job_types: required, array of job types that should be returned, defaults to all job types # job_types: required, array of job types that should be returned, defaults to all job types
module Security module Security
class LicenseManagementJobsFinder < JobsFinder class LicenseComplianceJobsFinder < JobsFinder
def self.allowed_job_types def self.allowed_job_types
[:license_management, :license_scanning] [:license_management, :license_scanning]
end end
......
...@@ -77,7 +77,7 @@ module Projects ...@@ -77,7 +77,7 @@ module Projects
return [] unless latest_default_branch_pipeline return [] unless latest_default_branch_pipeline
::Security::SecurityJobsFinder.new(pipeline: latest_default_branch_pipeline).execute + ::Security::SecurityJobsFinder.new(pipeline: latest_default_branch_pipeline).execute +
::Security::LicenseManagementJobsFinder.new(pipeline: latest_default_branch_pipeline).execute ::Security::LicenseComplianceJobsFinder.new(pipeline: latest_default_branch_pipeline).execute
end end
def latest_default_branch_pipeline def latest_default_branch_pipeline
...@@ -123,7 +123,7 @@ module Projects ...@@ -123,7 +123,7 @@ module Projects
end end
def scan_types def scan_types
::Security::SecurityJobsFinder.allowed_job_types + ::Security::LicenseManagementJobsFinder.allowed_job_types ::Security::SecurityJobsFinder.allowed_job_types + ::Security::LicenseComplianceJobsFinder.allowed_job_types
end end
end end
end end
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'spec_helper' require 'spec_helper'
describe Security::LicenseManagementJobsFinder do describe Security::LicenseComplianceJobsFinder do
it_behaves_like ::Security::JobsFinder, described_class.allowed_job_types it_behaves_like ::Security::JobsFinder, described_class.allowed_job_types
describe "#execute" do describe "#execute" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment