diff --git a/ee/app/models/ee/ci/build.rb b/ee/app/models/ee/ci/build.rb
index a8ec7074d2648bc61ff4e205b1072a273554570f..579c25fe46ed545152eb4c3d8024581c199fa873 100644
--- a/ee/app/models/ee/ci/build.rb
+++ b/ee/app/models/ee/ci/build.rb
@@ -73,7 +73,7 @@ def collect_license_scanning_reports!(license_scanning_report)
each_report(::Ci::JobArtifact::LICENSE_SCANNING_REPORT_FILE_TYPES) do |file_type, blob|
next if ::Feature.disabled?(:parse_license_management_reports, default_enabled: true)
- next unless project.feature_available?(:license_management)
+ next unless project.feature_available?(:license_scanning) || project.feature_available?(:license_management)
::Gitlab::Ci::Parsers.fabricate!(file_type).parse!(blob, license_scanning_report)
end
diff --git a/ee/app/models/ee/ci/pipeline.rb b/ee/app/models/ee/ci/pipeline.rb
index dd97e3672f31329699f616ee0f09cd5842373ad3..bd4ba25ad5105fc6adb834be2aa921a9e8e7c146 100644
--- a/ee/app/models/ee/ci/pipeline.rb
+++ b/ee/app/models/ee/ci/pipeline.rb
@@ -45,8 +45,8 @@ module Pipeline
container_scanning: %i[container_scanning sast_container],
dast: %i[dast],
performance: %i[merge_request_performance_metrics],
- license_management: %i[license_management],
- license_scanning: %i[license_management],
+ license_management: %i[license_scanning license_management],
+ license_scanning: %i[license_scanning license_management],
metrics: %i[metrics_reports]
}.freeze
diff --git a/ee/spec/controllers/projects/dependencies_controller_spec.rb b/ee/spec/controllers/projects/dependencies_controller_spec.rb
index 04cf629948c2eef090def555629400adbd36f21f..7e55a61004d718179d49c4f565f25fb020559640 100644
--- a/ee/spec/controllers/projects/dependencies_controller_spec.rb
+++ b/ee/spec/controllers/projects/dependencies_controller_spec.rb
@@ -22,7 +22,7 @@
context 'when feature is available' do
before do
- stub_licensed_features(dependency_scanning: true, license_management: true, security_dashboard: true)
+ stub_licensed_features(dependency_scanning: true, license_scanning: true, security_dashboard: true)
end
context 'when requesting HTML' do
diff --git a/ee/spec/controllers/projects/licenses_controller_spec.rb b/ee/spec/controllers/projects/licenses_controller_spec.rb
index 212e3a6c659f7d3d58807d065658ef098d5ae49b..bf242532694f81e491a0b28991be8722a84073f6 100644
--- a/ee/spec/controllers/projects/licenses_controller_spec.rb
+++ b/ee/spec/controllers/projects/licenses_controller_spec.rb
@@ -16,7 +16,7 @@
context 'with authorized user' do
context 'when feature is available' do
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
context 'with reporter' do
@@ -280,7 +280,7 @@
context 'with unauthorized user' do
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
get_licenses
end
@@ -309,7 +309,7 @@
let(:current_user) { create(:user) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
sign_in(current_user)
end
@@ -427,7 +427,7 @@
let(:current_user) { create(:user) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
sign_in(current_user)
end
diff --git a/ee/spec/controllers/projects/pipelines_controller_spec.rb b/ee/spec/controllers/projects/pipelines_controller_spec.rb
index 804740eff4801c725ff15d19b68495c97d2e5be5..74bd0988f054c61cf7c4e3e6fcd689e18ee7288b 100644
--- a/ee/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/ee/spec/controllers/projects/pipelines_controller_spec.rb
@@ -84,7 +84,7 @@
context 'with feature enabled' do
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
licenses_with_html
end
@@ -96,7 +96,7 @@
context 'with feature enabled json' do
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
it 'will return license management report in json format' do
@@ -141,7 +141,7 @@
context 'without license management artifact' do
context 'with feature enabled' do
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
licenses_with_html
end
@@ -152,7 +152,7 @@
context 'with feature enabled json' do
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
licenses_with_json
end
diff --git a/ee/spec/features/projects/licenses/maintainer_views_policies_spec.rb b/ee/spec/features/projects/licenses/maintainer_views_policies_spec.rb
index d907545c65d85e3b9c15bde2b7d46389bb1ec109..c5c0d86b238a8047284bfc2ba3c8dce516d5e23e 100644
--- a/ee/spec/features/projects/licenses/maintainer_views_policies_spec.rb
+++ b/ee/spec/features/projects/licenses/maintainer_views_policies_spec.rb
@@ -11,7 +11,7 @@
end
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
sign_in(maintainer)
visit(project_licenses_path(project))
diff --git a/ee/spec/features/projects/pipelines/pipeline_spec.rb b/ee/spec/features/projects/pipelines/pipeline_spec.rb
index db822ffed7a9a9da4fee756005050c4121b230cd..057e951c64d89bd0832ebae6da741c4317b1ee7a 100644
--- a/ee/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/ee/spec/features/projects/pipelines/pipeline_spec.rb
@@ -131,7 +131,7 @@
let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
context 'with a License Compliance artifact' do
diff --git a/ee/spec/finders/software_license_policies_finder_spec.rb b/ee/spec/finders/software_license_policies_finder_spec.rb
index 595b45c10754b468971a25f002367259ef47e82b..0d62c3d37c48504e9be6ce31e40aaf0d9d9de28b 100644
--- a/ee/spec/finders/software_license_policies_finder_spec.rb
+++ b/ee/spec/finders/software_license_policies_finder_spec.rb
@@ -15,7 +15,7 @@
let(:finder) { described_class.new(user, project, params) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
context 'searched by name' do
diff --git a/ee/spec/models/approval_merge_request_rule_spec.rb b/ee/spec/models/approval_merge_request_rule_spec.rb
index 14bdfbaefb835cbc4553ef419146c3fd0c8773fa..548301b3b60e74fdf35cdb8074c0eabde627a5ee 100644
--- a/ee/spec/models/approval_merge_request_rule_spec.rb
+++ b/ee/spec/models/approval_merge_request_rule_spec.rb
@@ -369,7 +369,7 @@
describe "#refresh_required_approvals!" do
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
context "when the rule is a `#{ApprovalRuleLike::DEFAULT_NAME_FOR_LICENSE_REPORT}` rule" do
diff --git a/ee/spec/models/ci/build_spec.rb b/ee/spec/models/ci/build_spec.rb
index b487ac8d4c50914de512cd03fdd72dbb84c57828..70d3101e5a599de3fa7439a8ed2225237c03f2d5 100644
--- a/ee/spec/models/ci/build_spec.rb
+++ b/ee/spec/models/ci/build_spec.rb
@@ -198,7 +198,7 @@
let(:license_scanning_report) { Gitlab::Ci::Reports::LicenseScanning::Report.new }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
it { expect(license_scanning_report.licenses.count).to eq(0) }
@@ -243,7 +243,7 @@
context 'when the license management feature is disabled' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
create(:ee_ci_job_artifact, :license_management, job: job, project: job.project)
end
@@ -344,7 +344,7 @@
context 'when license does not have metrics_reports' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
it 'does not parse metrics report' do
diff --git a/ee/spec/models/ci/pipeline_spec.rb b/ee/spec/models/ci/pipeline_spec.rb
index f9003bd4baccf3ef3811273085ae192fc92fb927..e9d1c390779b289899454eeee68b0519c5ad55a6 100644
--- a/ee/spec/models/ci/pipeline_spec.rb
+++ b/ee/spec/models/ci/pipeline_spec.rb
@@ -91,7 +91,7 @@
context 'with license compliance artifact' do
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
[:license_management, :license_scanning].each do |artifact_type|
@@ -120,7 +120,7 @@
subject { pipeline.expose_license_scanning_data? }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
[:license_scanning, :license_management].each do |artifact_type|
@@ -247,7 +247,7 @@
subject { pipeline.license_scanning_report }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
context 'when pipeline has multiple builds with license management reports' do
diff --git a/ee/spec/models/sca/license_compliance_spec.rb b/ee/spec/models/sca/license_compliance_spec.rb
index 2f9099483da070e5d6bd5513434e5880b6ea3830..288b63d535fd7b1ee2832e04864a83c4385cbb2c 100644
--- a/ee/spec/models/sca/license_compliance_spec.rb
+++ b/ee/spec/models/sca/license_compliance_spec.rb
@@ -10,7 +10,7 @@
let(:other_license) { create(:software_license, spdx_identifier: "Other-Id") }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
describe "#policies" do
diff --git a/ee/spec/policies/project_policy_spec.rb b/ee/spec/policies/project_policy_spec.rb
index b2852d3afa7a3c1b48b603ea03c9207ae0eb896a..6ba45354f03f86ff86982c092f8f78a83c30829d 100644
--- a/ee/spec/policies/project_policy_spec.rb
+++ b/ee/spec/policies/project_policy_spec.rb
@@ -21,7 +21,7 @@
project.add_developer(developer)
project.add_reporter(reporter)
project.add_guest(guest)
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
context 'basic permissions' do
@@ -68,7 +68,7 @@
let(:current_user) { create(:user, :auditor) }
before do
- stub_licensed_features(security_dashboard: true, license_management: true, threat_monitoring: true)
+ stub_licensed_features(security_dashboard: true, license_scanning: true, threat_monitoring: true)
end
context 'who is not a team member' do
@@ -696,7 +696,7 @@
describe 'admin_license_management' do
context 'without license management feature available' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
let(:current_user) { admin }
@@ -756,7 +756,7 @@
describe 'read_software_license_policy' do
context 'without license management feature available' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
let(:current_user) { admin }
@@ -890,7 +890,7 @@
context 'when license management feature in not available' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
let(:current_user) { admin }
diff --git a/ee/spec/presenters/ci/pipeline_presenter_spec.rb b/ee/spec/presenters/ci/pipeline_presenter_spec.rb
index 249f6943d26a8f6006011b3eb0ca3a979ed9821d..6aa33fb902fe425243a8d26fd82701e0d076376d 100644
--- a/ee/spec/presenters/ci/pipeline_presenter_spec.rb
+++ b/ee/spec/presenters/ci/pipeline_presenter_spec.rb
@@ -30,7 +30,7 @@
context 'when features are available' do
before do
- stub_licensed_features(dependency_scanning: true, license_management: true)
+ stub_licensed_features(dependency_scanning: true, license_scanning: true)
end
context 'when there is an artifact of a right type' do
diff --git a/ee/spec/requests/api/managed_licenses_spec.rb b/ee/spec/requests/api/managed_licenses_spec.rb
index afe1c19968b535f0f92a308c540bfd8ef3ab31b3..20e224ab28a0ff4f7374e33c4083f2d7c829494e 100644
--- a/ee/spec/requests/api/managed_licenses_spec.rb
+++ b/ee/spec/requests/api/managed_licenses_spec.rb
@@ -10,7 +10,7 @@
let_it_be(:software_license_policy) { create(:software_license_policy, project: project) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
project.add_maintainer(maintainer_user)
project.add_developer(dev_user)
project.add_reporter(reporter_user)
@@ -19,7 +19,7 @@
describe 'GET /projects/:id/managed_licenses' do
context 'with license management not available' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
it 'returns a forbidden status' do
diff --git a/ee/spec/serializers/dependency_entity_spec.rb b/ee/spec/serializers/dependency_entity_spec.rb
index 07e981013f49868106123cd3fae71bb9193d741a..0c5988dcea254e6deca504c4a367f08300e1871b 100644
--- a/ee/spec/serializers/dependency_entity_spec.rb
+++ b/ee/spec/serializers/dependency_entity_spec.rb
@@ -18,7 +18,7 @@
context 'when all required features available' do
before do
- stub_licensed_features(security_dashboard: true, license_management: true)
+ stub_licensed_features(security_dashboard: true, license_scanning: true)
allow(request).to receive(:project).and_return(project)
allow(request).to receive(:user).and_return(user)
end
diff --git a/ee/spec/serializers/dependency_list_serializer_spec.rb b/ee/spec/serializers/dependency_list_serializer_spec.rb
index 6ecd0044975efe937b707e80338209ca1fea2722..f8f827bd9a484d57685c24c5d7a123754b73947e 100644
--- a/ee/spec/serializers/dependency_list_serializer_spec.rb
+++ b/ee/spec/serializers/dependency_list_serializer_spec.rb
@@ -13,7 +13,7 @@
end
before do
- stub_licensed_features(security_dashboard: true, license_management: true)
+ stub_licensed_features(security_dashboard: true, license_scanning: true)
project.add_developer(user)
end
diff --git a/ee/spec/serializers/licenses_list_entity_spec.rb b/ee/spec/serializers/licenses_list_entity_spec.rb
index 91339764e9c50fb6f5e17945759e681eac9a9b46..d8551c336a45f61d224f38c6ed80a73df1b57d94 100644
--- a/ee/spec/serializers/licenses_list_entity_spec.rb
+++ b/ee/spec/serializers/licenses_list_entity_spec.rb
@@ -7,7 +7,7 @@
let(:license_compliance) { ::SCA::LicenseCompliance.new(project) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
it_behaves_like 'report list' do
diff --git a/ee/spec/serializers/licenses_list_serializer_spec.rb b/ee/spec/serializers/licenses_list_serializer_spec.rb
index 09aeba6cfa54747b0ad5c3db7fa00e378fc290ac..337b4f3414beee3762bf29b287d2d73505f90b27 100644
--- a/ee/spec/serializers/licenses_list_serializer_spec.rb
+++ b/ee/spec/serializers/licenses_list_serializer_spec.rb
@@ -18,7 +18,7 @@
before do
project.add_guest(user)
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
it { is_expected.to match_schema('licenses_list', dir: 'ee') }
diff --git a/ee/spec/serializers/merge_request_widget_entity_spec.rb b/ee/spec/serializers/merge_request_widget_entity_spec.rb
index c1bd6dc90f590026e9117673cb3b1f5e8e9cdf91..56ee47c40efe672285bddfbf9f886d7f0e8a27a6 100644
--- a/ee/spec/serializers/merge_request_widget_entity_spec.rb
+++ b/ee/spec/serializers/merge_request_widget_entity_spec.rb
@@ -124,7 +124,7 @@ def create_all_artifacts
context 'when feature is not licensed' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
it 'is not included' do
@@ -178,7 +178,7 @@ def create_all_artifacts
describe '#license_scanning', :request_store do
before do
allow(merge_request).to receive_messages(head_pipeline: pipeline, target_project: project)
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
it 'is not included, if missing artifacts' do
@@ -201,7 +201,7 @@ def create_all_artifacts
context 'when feature is not licensed' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
it 'is not included' do
@@ -238,7 +238,7 @@ def create_all_artifacts
before do
allow(fork_merge_request).to receive_messages(head_pipeline: pipeline)
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
it 'is a path for target project' do
diff --git a/ee/spec/services/ci/compare_license_scanning_reports_service_spec.rb b/ee/spec/services/ci/compare_license_scanning_reports_service_spec.rb
index d895ccca85822b61b0e159533d75b6631af6817a..8f45ebce5b203766f519d677e7f9d636637704f7 100644
--- a/ee/spec/services/ci/compare_license_scanning_reports_service_spec.rb
+++ b/ee/spec/services/ci/compare_license_scanning_reports_service_spec.rb
@@ -8,7 +8,7 @@
let(:project) { create(:project, :repository) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
describe '#execute' do
diff --git a/ee/spec/services/projects/licenses/update_policy_service_spec.rb b/ee/spec/services/projects/licenses/update_policy_service_spec.rb
index a3d9c09ede80648dcf5b6038a38b4e747ed411d3..37ca9c38eedffbc20911192f0f92aca94631d074 100644
--- a/ee/spec/services/projects/licenses/update_policy_service_spec.rb
+++ b/ee/spec/services/projects/licenses/update_policy_service_spec.rb
@@ -15,7 +15,7 @@
context "when the user is authorized" do
before do
allow(RefreshLicenseComplianceChecksWorker).to receive(:perform_async)
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
project.add_maintainer(user)
end
diff --git a/ee/spec/services/security/sync_reports_to_approval_rules_service_spec.rb b/ee/spec/services/security/sync_reports_to_approval_rules_service_spec.rb
index 6e362911e0a158d4314c956a8e4ee69fd1867d16..d9137860753592c62d60385a667b9f00ebfb9855 100644
--- a/ee/spec/services/security/sync_reports_to_approval_rules_service_spec.rb
+++ b/ee/spec/services/security/sync_reports_to_approval_rules_service_spec.rb
@@ -13,7 +13,7 @@
before do
allow(Ci::Pipeline).to receive(:find).with(pipeline.id) { pipeline }
- stub_licensed_features(dependency_scanning: true, dast: true, license_management: true)
+ stub_licensed_features(dependency_scanning: true, dast: true, license_scanning: true)
end
context 'when there are reports' do
diff --git a/ee/spec/services/software_license_policies/create_service_spec.rb b/ee/spec/services/software_license_policies/create_service_spec.rb
index 8f4f513b2d683a27200e8c706d145d49a3437a30..17e139c039a0816a40df6d8a66c84ff686581e89 100644
--- a/ee/spec/services/software_license_policies/create_service_spec.rb
+++ b/ee/spec/services/software_license_policies/create_service_spec.rb
@@ -13,7 +13,7 @@
end
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
subject { described_class.new(project, user, params) }
@@ -21,7 +21,7 @@
describe '#execute' do
context 'with license management unavailable' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
it 'does not creates a software license policy' do
diff --git a/ee/spec/services/software_license_policies/update_service_spec.rb b/ee/spec/services/software_license_policies/update_service_spec.rb
index 636f7c845aa2ad94ed118db0ddf7659b9480b5ca..0a20ab48a8356b92ef5a48e1d3bde989df5bffb5 100644
--- a/ee/spec/services/software_license_policies/update_service_spec.rb
+++ b/ee/spec/services/software_license_policies/update_service_spec.rb
@@ -14,7 +14,7 @@
let(:software_license_policy) { create(:software_license_policy, :denied) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
describe '#execute' do
@@ -29,7 +29,7 @@ def update_software_license_policy(opts)
context 'with license management unavailable' do
before do
- stub_licensed_features(license_management: false)
+ stub_licensed_features(license_scanning: false)
end
it 'does not update the software license policy' do
diff --git a/ee/spec/workers/refresh_license_compliance_checks_worker_spec.rb b/ee/spec/workers/refresh_license_compliance_checks_worker_spec.rb
index e14f9a4c166b4e155258e7a06053a5e445db97a7..d3447464433181611be36093a1b4a2a9b68a3955 100644
--- a/ee/spec/workers/refresh_license_compliance_checks_worker_spec.rb
+++ b/ee/spec/workers/refresh_license_compliance_checks_worker_spec.rb
@@ -9,7 +9,7 @@
let(:project) { create(:project) }
before do
- stub_licensed_features(license_management: true)
+ stub_licensed_features(license_scanning: true)
end
context "when there are merge requests associated with the project" do