Merge branch '26574-rename-license-report-comparer' into 'master'

Rename LicenseManagement classes

See merge request gitlab-org/gitlab!18122

ee/app/controllers/ee/projects/pipelines_controller.rb

@@ -31,7 +31,7 @@ module EE
           if report_exists
             format.html { render_show }
             format.json do
-              data = LicenseManagementReportsSerializer.new(project: project, current_user: current_user).represent(pipeline&.license_scanning_report&.licenses)
+              data = LicenseScanningReportsSerializer.new(project: project, current_user: current_user).represent(pipeline&.license_scanning_report&.licenses)
               render json: data, status: :ok
             end
           else

ee/app/models/ee/merge_request.rb

@@ -159,7 +159,7 @@ module EE
         return { status: :error, status_reason: 'This merge request does not have license management reports' }
       end
 
-      compare_reports(::Ci::CompareLicenseManagementReportsService, current_user)
+      compare_reports(::Ci::CompareLicenseScanningReportsService, current_user)
     end
 
     def has_metrics_reports?

ee/app/serializers/ee/license_management_reports_serializer.rb

-# frozen_string_literal: true
-class LicenseManagementReportsSerializer < BaseSerializer
-  entity LicenseManagementReportLicenseEntity
-end

ee/app/serializers/ee/license_scanning_reports_serializer.rb

+# frozen_string_literal: true
+
+class LicenseScanningReportsSerializer < BaseSerializer
+  entity LicenseScanningReportLicenseEntity
+end

ee/app/serializers/license_management_reports_comparer_entity.rb

-# frozen_string_literal: true
-
-class LicenseManagementReportsComparerEntity < Grape::Entity
-  expose :new_licenses, using: LicenseManagementReportLicenseEntity
-  expose :existing_licenses, using: LicenseManagementReportLicenseEntity
-  expose :removed_licenses, using: LicenseManagementReportLicenseEntity
-end

ee/app/serializers/license_management_reports_comparer_serializer.rb

-# frozen_string_literal: true
-
-class LicenseManagementReportsComparerSerializer < BaseSerializer
-  entity LicenseManagementReportsComparerEntity
-end

ee/app/serializers/license_management_report_dependency_entity.rb → ee/app/serializers/license_scanning_report_dependency_entity.rb

 # frozen_string_literal: true
 
-class LicenseManagementReportDependencyEntity < Grape::Entity
+class LicenseScanningReportDependencyEntity < Grape::Entity
   expose :name
 end

ee/app/serializers/license_management_report_license_entity.rb → ee/app/serializers/license_scanning_report_license_entity.rb

 # frozen_string_literal: true
 
-class LicenseManagementReportLicenseEntity < Grape::Entity
+class LicenseScanningReportLicenseEntity < Grape::Entity
   include RequestAwareEntity
 
   expose :name
   expose :classification
-  expose :dependencies, using: LicenseManagementReportDependencyEntity
+  expose :dependencies, using: LicenseScanningReportDependencyEntity
   expose :count
   expose :url
 

ee/app/serializers/license_scanning_reports_comparer_entity.rb

+# frozen_string_literal: true
+
+class LicenseScanningReportsComparerEntity < Grape::Entity
+  expose :new_licenses, using: LicenseScanningReportLicenseEntity
+  expose :existing_licenses, using: LicenseScanningReportLicenseEntity
+  expose :removed_licenses, using: LicenseScanningReportLicenseEntity
+end

ee/app/serializers/license_scanning_reports_comparer_serializer.rb

+# frozen_string_literal: true
+
+class LicenseScanningReportsComparerSerializer < BaseSerializer
+  entity LicenseScanningReportsComparerEntity
+end

ee/app/services/ci/compare_license_management_reports_service.rb → ee/app/services/ci/compare_license_scanning_reports_service.rb

 # frozen_string_literal: true
 
 module Ci
-  class CompareLicenseManagementReportsService < ::Ci::CompareReportsBaseService
+  class CompareLicenseScanningReportsService < ::Ci::CompareReportsBaseService
     def comparer_class
-      Gitlab::Ci::Reports::LicenseManagement::ReportsComparer
+      Gitlab::Ci::Reports::LicenseScanning::ReportsComparer
     end
 
     def serializer_class
-      LicenseManagementReportsComparerSerializer
+      LicenseScanningReportsComparerSerializer
     end
 
     def get_report(pipeline)

ee/lib/gitlab/ci/reports/license_management/reports_comparer.rb → ee/lib/gitlab/ci/reports/license_scanning/reports_comparer.rb

@@ -3,7 +3,7 @@
 module Gitlab
   module Ci
     module Reports
-      module LicenseManagement
+      module LicenseScanning
         class ReportsComparer
           include Gitlab::Utils::StrongMemoize
 

ee/spec/controllers/projects/merge_requests_controller_spec.rb

@@ -709,7 +709,7 @@ describe Projects::MergeRequestsController do
 
     before do
       allow_any_instance_of(::MergeRequest).to receive(:compare_reports)
-        .with(::Ci::CompareLicenseManagementReportsService, project.users.first).and_return(comparison_status)
+        .with(::Ci::CompareLicenseScanningReportsService, project.users.first).and_return(comparison_status)
     end
 
     context 'when comparison is being processed' do
@@ -746,7 +746,7 @@ describe Projects::MergeRequestsController do
     end
 
     context 'when user created corrupted test reports' do
-      let(:comparison_status) { { status: :error, status_reason: 'Failed to parse license management reports' } }
+      let(:comparison_status) { { status: :error, status_reason: 'Failed to parse license scanning reports' } }
 
       it 'does not send polling interval' do
         expect(::Gitlab::PollingInterval).not_to receive(:set_header)
@@ -758,7 +758,7 @@ describe Projects::MergeRequestsController do
         subject
 
         expect(response).to have_gitlab_http_status(:bad_request)
-        expect(json_response).to eq({ 'status_reason' => 'Failed to parse license management reports' })
+        expect(json_response).to eq({ 'status_reason' => 'Failed to parse license scanning reports' })
       end
     end
 

ee/spec/lib/gitlab/ci/reports/license_management/reports_comparer_spec.rb → ee/spec/lib/gitlab/ci/reports/license_scanning/reports_comparer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Ci::Reports::LicenseManagement::ReportsComparer do
+describe Gitlab::Ci::Reports::LicenseScanning::ReportsComparer do
   let(:report_1) { build :ci_reports_license_management_report, :report_1 }
   let(:report_2) { build :ci_reports_license_management_report, :report_2 }
   let(:report_comparer) { described_class.new(report_1, report_2) }

ee/spec/models/merge_request_spec.rb

@@ -400,7 +400,7 @@ describe MergeRequest do
         end
 
         it 'returns status and data' do
-          expect_any_instance_of(Ci::CompareLicenseManagementReportsService)
+          expect_any_instance_of(Ci::CompareLicenseScanningReportsService)
               .to receive(:execute).with(base_pipeline, head_pipeline).and_call_original
 
           subject
@@ -408,7 +408,7 @@ describe MergeRequest do
 
         context 'when cached results is not latest' do
           before do
-            allow_any_instance_of(Ci::CompareLicenseManagementReportsService)
+            allow_any_instance_of(Ci::CompareLicenseScanningReportsService)
                 .to receive(:latest?).and_return(false)
           end
 

ee/spec/serializers/license_management_report_dependency_entity_spec.rb → ee/spec/serializers/license_scanning_report_dependency_entity_spec.rb

@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-describe LicenseManagementReportDependencyEntity do
-  include LicenseManagementReportHelper
+describe LicenseScanningReportDependencyEntity do
+  include LicenseScanningReportHelper
 
   let(:dependency) { create_dependency }
   let(:entity) { described_class.new(dependency) }

ee/spec/serializers/license_management_report_license_entity_spec.rb → ee/spec/serializers/license_scanning_report_license_entity_spec.rb

@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-describe LicenseManagementReportLicenseEntity do
-  include LicenseManagementReportHelper
+describe LicenseScanningReportLicenseEntity do
+  include LicenseScanningReportHelper
 
   let(:user) { build(:user) }
   let(:project) { build(:project, :repository) }

ee/spec/serializers/license_management_reports_comparer_entity_spec.rb → ee/spec/serializers/license_scanning_reports_comparer_entity_spec.rb

@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-describe LicenseManagementReportsComparerEntity do
-  include LicenseManagementReportHelper
+describe LicenseScanningReportsComparerEntity do
+  include LicenseScanningReportHelper
 
   let(:user) { build(:user) }
   let(:project) { build(:project, :repository) }

ee/spec/services/ci/compare_license_management_reports_service_spec.rb → ee/spec/services/ci/compare_license_scanning_reports_service_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::CompareLicenseManagementReportsService do
+describe Ci::CompareLicenseScanningReportsService do
   let(:current_user) { project.users.take }
   let(:service) { described_class.new(project, current_user) }
   let(:project) { create(:project, :repository) }
@@ -14,7 +14,7 @@ describe Ci::CompareLicenseManagementReportsService do
   describe '#execute' do
     subject { service.execute(base_pipeline, head_pipeline) }
 
-    context 'when head pipeline has license management reports' do
+    context 'when head pipeline has license scanning reports' do
       let!(:base_pipeline) { nil }
       let!(:head_pipeline) { create(:ee_ci_pipeline, :with_license_management_report, project: project) }
 
@@ -49,7 +49,7 @@ describe Ci::CompareLicenseManagementReportsService do
       end
     end
 
-    context 'when head pipeline has corrupted license management reports' do
+    context 'when head pipeline has corrupted license scanning reports' do
       let!(:base_pipeline) { create(:ee_ci_pipeline, :with_corrupted_license_management_report, project: project) }
       let!(:head_pipeline) { create(:ee_ci_pipeline, :with_corrupted_license_management_report, project: project) }
 

ee/spec/support/license_management_reports/license_management_report_helper.rb → ee/spec/support/license_scanning_reports/license_scanning_report_helper.rb

 # frozen_string_literal: true
 
-module LicenseManagementReportHelper
+module LicenseScanningReportHelper
   def create_report(dependencies)
     Gitlab::Ci::Reports::LicenseScanning::Report.new.tap do |report|
       dependencies.each do |license_name, dependencies|
@@ -28,7 +28,7 @@ module LicenseManagementReportHelper
   end
 
   def create_comparer
-    Gitlab::Ci::Reports::LicenseManagement::ReportsComparer.new(create_report1, create_report2)
+    Gitlab::Ci::Reports::LicenseScanning::ReportsComparer.new(create_report1, create_report2)
   end
 
   def create_license