Merge branch '213574-remove-lm-feature' into 'master'

Remove license_management licensed feature

See merge request gitlab-org/gitlab!30861

ee/app/controllers/ee/projects/settings/ci_cd_controller.rb

@@ -15,7 +15,7 @@ module EE
         # 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
 

ee/app/models/ee/ci/build.rb

@@ -81,7 +81,7 @@ module EE
         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

ee/app/models/ee/ci/pipeline.rb

@@ -45,8 +45,8 @@ module EE
           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
 

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

ee/app/policies/ee/project_policy.rb

@@ -97,7 +97,7 @@ module EE
 
       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

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)}'

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)

ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml

-- 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' } }

ee/spec/policies/project_policy_spec.rb

@@ -660,7 +660,7 @@ describe ProjectPolicy do
   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 @@ describe ProjectPolicy do
   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

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