diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/serializers/ci | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/serializers/ci')
-rw-r--r-- | app/serializers/ci/job_entity.rb | 96 | ||||
-rw-r--r-- | app/serializers/ci/job_serializer.rb | 12 | ||||
-rw-r--r-- | app/serializers/ci/pipeline_entity.rb | 4 |
3 files changed, 110 insertions, 2 deletions
diff --git a/app/serializers/ci/job_entity.rb b/app/serializers/ci/job_entity.rb new file mode 100644 index 00000000000..fca3dec74d4 --- /dev/null +++ b/app/serializers/ci/job_entity.rb @@ -0,0 +1,96 @@ +# frozen_string_literal: true + +module Ci + class JobEntity < Grape::Entity + include RequestAwareEntity + + expose :id + expose :name + + expose :started?, as: :started + expose :complete?, as: :complete + expose :archived?, as: :archived + + # bridge jobs don't have build details pages + expose :build_path, if: ->(job) { !job.is_a?(Ci::Bridge) } do |job| + job_path(job) + end + + expose :retry_path, if: -> (*) { retryable? } do |job| + path_to(:retry_namespace_project_job, job) + end + + expose :cancel_path, if: -> (*) { cancelable? } do |job| + path_to( + :cancel_namespace_project_job, + job, + { continue: { to: job_path(job) } } + ) + end + + expose :play_path, if: -> (*) { playable? } do |job| + path_to(:play_namespace_project_job, job) + end + + expose :unschedule_path, if: -> (*) { scheduled? } do |job| + path_to(:unschedule_namespace_project_job, job) + end + + expose :playable?, as: :playable + expose :scheduled?, as: :scheduled + expose :scheduled_at, if: -> (*) { scheduled? } + expose :created_at + expose :updated_at + expose :detailed_status, as: :status, with: DetailedStatusEntity + expose :callout_message, if: -> (*) { failed? && !job.script_failure? } + expose :recoverable, if: -> (*) { failed? } + + private + + alias_method :job, :object + + def cancelable? + job.cancelable? && can?(request.current_user, :update_build, job) + end + + def retryable? + job.retryable? && can?(request.current_user, :update_build, job) + end + + def playable? + job.playable? && can?(request.current_user, :update_build, job) + end + + def scheduled? + job.scheduled? + end + + def detailed_status + job.detailed_status(request.current_user) + end + + def path_to(route, job, params = {}) + send("#{route}_path", job.project.namespace, job.project, job, params) # rubocop:disable GitlabSecurity/PublicSend + end + + def job_path(job) + job.target_url || path_to(:namespace_project_job, job) + end + + def failed? + job.failed? + end + + def callout_message + job_presenter.callout_failure_message + end + + def recoverable + job_presenter.recoverable? + end + + def job_presenter + @job_presenter ||= job.present + end + end +end diff --git a/app/serializers/ci/job_serializer.rb b/app/serializers/ci/job_serializer.rb new file mode 100644 index 00000000000..01f9e223943 --- /dev/null +++ b/app/serializers/ci/job_serializer.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +module Ci + class JobSerializer < BaseSerializer + entity Ci::JobEntity + + def represent_status(resource) + data = represent(resource, { only: [:status] }) + data.fetch(:status, {}) + end + end +end diff --git a/app/serializers/ci/pipeline_entity.rb b/app/serializers/ci/pipeline_entity.rb index a5af543f49f..20aeb978520 100644 --- a/app/serializers/ci/pipeline_entity.rb +++ b/app/serializers/ci/pipeline_entity.rb @@ -4,7 +4,7 @@ class Ci::PipelineEntity < Grape::Entity include RequestAwareEntity include Gitlab::Utils::StrongMemoize - delegate :name, :failure_reason, to: :presented_pipeline + delegate :name, :failure_reason, :coverage, to: :presented_pipeline expose :id expose :iid @@ -82,7 +82,7 @@ class Ci::PipelineEntity < Grape::Entity project_pipeline_path(pipeline.project, pipeline) end - expose :failed_builds, if: -> (*) { can_retry? }, using: JobEntity do |pipeline| + expose :failed_builds, if: -> (*) { can_retry? }, using: Ci::JobEntity do |pipeline| pipeline.failed_builds.each do |build| build.project = pipeline.project end |