diff --git a/ee/app/controllers/ee/projects/settings/ci_cd_controller.rb b/ee/app/controllers/ee/projects/settings/ci_cd_controller.rb
index 1f13f09ba4b6452e7a03dbf614413dc218f4cb7d..c258a2c5c219195f22d999bb1ef83e6d5dc069a5 100644
--- a/ee/app/controllers/ee/projects/settings/ci_cd_controller.rb
+++ b/ee/app/controllers/ee/projects/settings/ci_cd_controller.rb
@@ -15,7 +15,7 @@ module CiCdController
# rubocop:disable Gitlab/ModuleWithInstanceVariables
override :show
def show
- if project.feature_available?(:license_management)
+ if project.feature_available?(:license_scanning)
@license_management_url = expose_url(api_v4_projects_managed_licenses_path(id: @project.id))
end
diff --git a/ee/app/models/ee/ci/build.rb b/ee/app/models/ee/ci/build.rb
index 3c29ebf95d7f8117a2ace860bfbe1d71f70fb615..8de08be94a538223c392cc466b3a455b65b5fcfd 100644
--- a/ee/app/models/ee/ci/build.rb
+++ b/ee/app/models/ee/ci/build.rb
@@ -81,7 +81,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_scanning) || project.feature_available?(:license_management)
+ next unless project.feature_available?(:license_scanning)
::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 7bd4c12bb634cf67bcbd00c702a9d3fbc912cc3d..385995ee283126c5eb44a42dc4b0534fd8e48a45 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],
dast: %i[dast],
performance: %i[merge_request_performance_metrics],
- license_management: %i[license_scanning license_management],
- license_scanning: %i[license_scanning license_management],
+ license_management: %i[license_scanning],
+ license_scanning: %i[license_scanning],
metrics: %i[metrics_reports]
}.freeze
diff --git a/ee/app/models/license.rb b/ee/app/models/license.rb
index 78d35d02c6e93dfd672dab6df5d5ef1355759d66..e44d63d61228bc3e6652165819f5b3d87a6642d7 100644
--- a/ee/app/models/license.rb
+++ b/ee/app/models/license.rb
@@ -120,7 +120,6 @@ class License < ApplicationRecord
incident_management
insights
issuable_health_status
- license_management
license_scanning
personal_access_token_expiration_policy
prometheus_alerts
diff --git a/ee/app/policies/ee/project_policy.rb b/ee/app/policies/ee/project_policy.rb
index d3fdc5e8093b0b8c11a5c9827693265cf1f38aca..8bcd454f496b32943faa3c2c48482130b88ba5dc 100644
--- a/ee/app/policies/ee/project_policy.rb
+++ b/ee/app/policies/ee/project_policy.rb
@@ -97,7 +97,7 @@ module ProjectPolicy
with_scope :subject
condition(:license_scanning_enabled) do
- @subject.feature_available?(:license_scanning) || @subject.feature_available?(:license_management)
+ @subject.feature_available?(:license_scanning)
end
with_scope :subject
diff --git a/ee/app/views/projects/merge_requests/show.html.haml b/ee/app/views/projects/merge_requests/show.html.haml
index d86351046214594b2faba1abd7a8ba317a446803..35b2fa909879665e06a43dce85fffb03692a2964 100644
--- a/ee/app/views/projects/merge_requests/show.html.haml
+++ b/ee/app/views/projects/merge_requests/show.html.haml
@@ -18,7 +18,7 @@
window.gl.mrWidgetData.approvals_help_path = '#{help_page_path("user/project/merge_requests/merge_request_approvals")}';
window.gl.mrWidgetData.codequality_help_path = '#{help_page_path("user/project/merge_requests/code_quality", anchor: "code-quality-reports")}';
window.gl.mrWidgetData.visual_review_app_available = '#{@project.feature_available?(:visual_review_app)}' === 'true';
- window.gl.mrWidgetData.license_scanning_comparison_path = '#{license_scanning_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:license_management)}'
+ window.gl.mrWidgetData.license_scanning_comparison_path = '#{license_scanning_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:license_scanning)}'
window.gl.mrWidgetData.container_scanning_comparison_path = '#{container_scanning_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:container_scanning)}'
window.gl.mrWidgetData.dependency_scanning_comparison_path = '#{dependency_scanning_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:dependency_scanning)}'
window.gl.mrWidgetData.sast_comparison_path = '#{sast_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:sast)}'
diff --git a/ee/app/views/projects/pipelines/_tabs_content.html.haml b/ee/app/views/projects/pipelines/_tabs_content.html.haml
index 9e0258e4c1761eb9827c2bbee22fa55fe1a32c84..44b087c3c0dfae896a3c0b9867d318923a3f04d5 100644
--- a/ee/app/views/projects/pipelines/_tabs_content.html.haml
+++ b/ee/app/views/projects/pipelines/_tabs_content.html.haml
@@ -2,7 +2,7 @@
- project = local_assigns.fetch(:project)
- license_management_settings_path = can?(current_user, :admin_software_license_policy, project) ? license_management_settings_path(project) : nil
-- licenses_api_path = licenses_project_pipeline_path(project, pipeline) if project.feature_available?(:license_management)
+- licenses_api_path = licenses_project_pipeline_path(project, pipeline) if project.feature_available?(:license_scanning)
- vulnerabilities_endpoint_path = expose_path(api_v4_projects_vulnerability_findings_path(id: project.id, params: { pipeline_id: pipeline.id, scope: 'dismissed' }))
- vulnerability_exports_endpoint_path = expose_path(api_v4_security_projects_vulnerability_exports_path(id: project.id))
- codequality_report_download_path = pipeline.downloadable_path_for_report_type(:codequality)
diff --git a/ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml b/ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml
index 591f0f1ad4045c8549cbe9c52e968e70ed778ced..ac4a0ce6276df2bb9347c52f18dccf201ffff075 100644
--- a/ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml
+++ b/ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml
@@ -1,4 +1,4 @@
-- return unless @project.feature_available?(:license_management)
+- return unless @project.feature_available?(:license_scanning)
- expanded = expanded_by_default?
%section.settings.no-animate#js-license-management{ class: ('expanded' if expanded), data: { qa_selector: 'license_compliance_settings_content' } }
diff --git a/ee/spec/policies/project_policy_spec.rb b/ee/spec/policies/project_policy_spec.rb
index 5b14b0e23437bfa7db06ca35d59d4660ce64b459..0d5b576bed5dac8a59cecd736afde1be016c6014 100644
--- a/ee/spec/policies/project_policy_spec.rb
+++ b/ee/spec/policies/project_policy_spec.rb
@@ -660,7 +660,7 @@
end
describe 'admin_license_management' do
- context 'without license management feature available' do
+ context 'without license scanning feature available' do
before do
stub_licensed_features(license_scanning: false)
end
@@ -720,7 +720,7 @@
end
describe 'read_software_license_policy' do
- context 'without license management feature available' do
+ context 'without license scanning feature available' do
before do
stub_licensed_features(license_scanning: false)
end
diff --git a/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml
index f2096d1eb8f47e3460c249b5df8c49cf17dd5102..b235a184a9fdb818062edf21f68cd5a88a8caf16 100644
--- a/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml
@@ -17,7 +17,7 @@ license_management:
refs:
- branches
variables:
- - $GITLAB_FEATURES =~ /\blicense_management\b/
+ - $GITLAB_FEATURES =~ /\blicense_scanning\b/
except:
refs:
- master