Skip to content
代码片段 群组 项目
提交 2e61a932 编辑于 作者: Felipe Artur's avatar Felipe Artur
浏览文件

Merge branch 'sh-log-artifacts-size-ui-download' into 'master'

Log CI artifact size when downloaded via UI

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103695



Merged-by: default avatarFelipe Artur <fcardozo@gitlab.com>
Approved-by: default avatarMax Orefice <morefice@gitlab.com>
Approved-by: default avatarFelipe Artur <fcardozo@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
No related branches found
No related tags found
无相关合并请求
......@@ -4,6 +4,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
include ExtractsPath
include RendersBlob
include SendFileUpload
include Gitlab::Ci::Artifacts::Logger
urgency :low, [:browse, :file, :latest_succeeded]
......@@ -41,6 +42,7 @@ def destroy
def download
return render_404 unless artifacts_file
log_artifacts_filesize(artifacts_file.model)
send_upload(artifacts_file, attachment: artifacts_file.filename, proxy: params[:proxy])
end
......
......@@ -158,9 +158,12 @@ def download_artifact(extra_params = {})
before do
stub_artifacts_object_storage(cdn: cdn_config)
create(:ci_job_artifact, :remote_store, :codequality, job: job)
allow(Gitlab::ApplicationContext).to receive(:push).and_call_original
end
it 'sends the codequality report' do
expect(Gitlab::ApplicationContext).to receive(:push).with(artifact: an_instance_of(Ci::JobArtifact)).and_call_original
expect(controller).to receive(:redirect_to).and_call_original
download_artifact(file_type: file_type)
......@@ -185,12 +188,12 @@ def download_artifact(extra_params = {})
end
before do
allow(Gitlab::ApplicationContext).to receive(:push).and_call_original
request.env['action_dispatch.remote_ip'] = '18.245.0.42'
end
context 'with use_cdn_with_job_artifacts_ui_downloads enabled' do
it 'redirects to a Google CDN request' do
expect(Gitlab::ApplicationContext).to receive(:push).with(artifact: an_instance_of(Ci::JobArtifact)).and_call_original
expect(Gitlab::ApplicationContext).to receive(:push).with(artifact_used_cdn: true).and_call_original
download_artifact(file_type: file_type)
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册