From d57c13708fd3b6094abd9a1ea380e89791e16968 Mon Sep 17 00:00:00 2001 From: Albert Salim Date: Tue, 7 Feb 2023 15:34:03 +0800 Subject: [PATCH] Change `type` to `file_type` in log entry - `type` is used by Application::Context and cannot be overridden - `file_type` is a more accurate term to use as it is consistent with the record attribute --- lib/gitlab/ci/artifacts/logger.rb | 4 ++-- spec/lib/gitlab/ci/artifacts/logger_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/gitlab/ci/artifacts/logger.rb b/lib/gitlab/ci/artifacts/logger.rb index 73f0409f8b1720..630641182324d3 100644 --- a/lib/gitlab/ci/artifacts/logger.rb +++ b/lib/gitlab/ci/artifacts/logger.rb @@ -35,7 +35,7 @@ def self.log_created(job_artifacts) message: 'Artifact created', job_artifact_id: artifact.id, size: artifact.size, - type: artifact.file_type, + file_type: artifact.file_type, build_id: artifact.job_id, project_id: artifact.project_id ) @@ -51,7 +51,7 @@ def self.log_deleted(job_artifacts, method) job_artifact_id: artifact.id, expire_at: artifact.expire_at, size: artifact.size, - type: artifact.file_type, + file_type: artifact.file_type, build_id: artifact.job_id, project_id: artifact.project_id, method: method diff --git a/spec/lib/gitlab/ci/artifacts/logger_spec.rb b/spec/lib/gitlab/ci/artifacts/logger_spec.rb index 09d8a549640c3a..7a2f8b6ea37a26 100644 --- a/spec/lib/gitlab/ci/artifacts/logger_spec.rb +++ b/spec/lib/gitlab/ci/artifacts/logger_spec.rb @@ -19,7 +19,7 @@ message: 'Artifact created', job_artifact_id: artifact.id, size: artifact.size, - type: artifact.file_type, + file_type: artifact.file_type, build_id: artifact.job_id, project_id: artifact.project_id, 'correlation_id' => an_instance_of(String), @@ -47,7 +47,7 @@ job_artifact_id: artifact.id, expire_at: artifact.expire_at, size: artifact.size, - type: artifact.file_type, + file_type: artifact.file_type, build_id: artifact.job_id, project_id: artifact.project_id, method: method, -- GitLab