Merge branch 'mo-remove-artifacts-from-pipeline-entity' into 'master'

Remove artifacts from pipeline details entity

See merge request gitlab-org/gitlab!61253

app/controllers/projects/pipelines_controller.rb

@@ -223,7 +223,7 @@ class Projects::PipelinesController < Projects::ApplicationController
     PipelineSerializer
       .new(project: @project, current_user: @current_user)
       .with_pagination(request, response)
-      .represent(@pipelines, disable_coverage: true, preload: true, disable_artifacts: true)
+      .represent(@pipelines, disable_coverage: true, preload: true)
   end
 
   def render_show

app/serializers/pipeline_details_entity.rb

@@ -8,15 +8,6 @@ class PipelineDetailsEntity < Ci::PipelineEntity
   end
 
   expose :details do
-    expose :artifacts, unless: proc { options[:disable_artifacts] } do |pipeline, options|
-      rel = pipeline.downloadable_artifacts
-
-      if Feature.enabled?(:non_public_artifacts, type: :development)
-        rel = rel.select { |artifact| can?(request.current_user, :read_job_artifacts, artifact.job) }
-      end
-
-      BuildArtifactEntity.represent(rel, options.merge(project: pipeline.project))
-    end
     expose :manual_actions, using: BuildActionEntity
     expose :scheduled_actions, using: BuildActionEntity
   end

app/serializers/pipeline_serializer.rb

@@ -49,10 +49,6 @@ class PipelineSerializer < BaseSerializer
       {
         manual_actions: :metadata,
         scheduled_actions: :metadata,
-        downloadable_artifacts: {
-          project: [:route, { namespace: :route }],
-          job: []
-        },
         failed_builds: %i(project metadata),
         merge_request: {
           source_project: [:route, { namespace: :route }],

changelogs/unreleased/mo-remove-artifacts-from-pipeline-entity.yml

+---
+title: Stop exposing artifacts in pipelines.json
+merge_request: 61253
+author:
+type: performance

spec/serializers/merge_requests/pipeline_entity_spec.rb

@@ -42,6 +42,4 @@ RSpec.describe MergeRequests::PipelineEntity do
       expect(entity.as_json).not_to include(:coverage)
     end
   end
-
-  it_behaves_like 'public artifacts'
 end

spec/serializers/pipeline_details_entity_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe PipelineDetailsEntity do
         expect(subject[:details])
           .to include :duration, :finished_at
         expect(subject[:details])
-          .to include :stages, :artifacts, :manual_actions, :scheduled_actions
+          .to include :stages, :manual_actions, :scheduled_actions
         expect(subject[:details][:status]).to include :icon, :favicon, :text, :label
       end
 
@@ -184,7 +184,5 @@ RSpec.describe PipelineDetailsEntity do
         expect(source_jobs[child_pipeline.id][:name]).to eq('child')
       end
     end
-
-    it_behaves_like 'public artifacts'
   end
 end

spec/serializers/pipeline_serializer_spec.rb

@@ -155,7 +155,7 @@ RSpec.describe PipelineSerializer do
 
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
-          expected_queries = Gitlab.ee? ? 39 : 36
+          expected_queries = Gitlab.ee? ? 33 : 30
 
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
@@ -176,7 +176,7 @@ RSpec.describe PipelineSerializer do
           # pipeline. With the same ref this check is cached but if refs are
           # different then there is an extra query per ref
           # https://gitlab.com/gitlab-org/gitlab-foss/issues/46368
-          expected_queries = Gitlab.ee? ? 42 : 39
+          expected_queries = Gitlab.ee? ? 36 : 33
 
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
@@ -202,7 +202,7 @@ RSpec.describe PipelineSerializer do
           # Existing numbers are high and require performance optimization
           # Ongoing issue:
           # https://gitlab.com/gitlab-org/gitlab/-/issues/225156
-          expected_queries = Gitlab.ee? ? 82 : 76
+          expected_queries = Gitlab.ee? ? 77 : 70
 
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
@@ -221,8 +221,7 @@ RSpec.describe PipelineSerializer do
           create(:ci_build, :scheduled, project: project, environment: env.name)
 
           recorded = ActiveRecord::QueryRecorder.new { subject }
-          expected_queries = Gitlab.ee? ? 61 : 57
-
+          expected_queries = Gitlab.ee? ? 56 : 52
           expect(recorded.count).to be_within(1).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
         end

spec/support/shared_examples/serializers/pipeline_artifacts_shared_example.rb

-# frozen_string_literal: true
-RSpec.shared_examples 'public artifacts' do
-  let_it_be(:project) { create(:project, :public) }
-  let(:pipeline) { create(:ci_empty_pipeline, status: :success, project: project) }
-
-  context 'that has artifacts' do
-    let!(:build) { create(:ci_build, :success, :artifacts, pipeline: pipeline) }
-
-    it 'contains information about artifacts' do
-      expect(subject[:details][:artifacts].length).to eq(1)
-    end
-  end
-
-  context 'that has non public artifacts' do
-    let!(:build) { create(:ci_build, :success, :artifacts, :non_public_artifacts, pipeline: pipeline) }
-
-    it 'does not contain information about artifacts' do
-      expect(subject[:details][:artifacts].length).to eq(0)
-    end
-  end
-end