diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /lib/gitlab/data_builder | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'lib/gitlab/data_builder')
-rw-r--r-- | lib/gitlab/data_builder/deployment.rb | 1 | ||||
-rw-r--r-- | lib/gitlab/data_builder/pipeline.rb | 51 |
2 files changed, 45 insertions, 7 deletions
diff --git a/lib/gitlab/data_builder/deployment.rb b/lib/gitlab/data_builder/deployment.rb index f50ca5119b7..267c2d32ca9 100644 --- a/lib/gitlab/data_builder/deployment.rb +++ b/lib/gitlab/data_builder/deployment.rb @@ -16,6 +16,7 @@ module Gitlab object_kind: 'deployment', status: deployment.status, status_changed_at: status_changed_at, + deployment_id: deployment.id, deployable_id: deployment.deployable_id, deployable_url: deployable_url, environment: deployment.environment.name, diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb index 4d70e3949dd..385f1e57705 100644 --- a/lib/gitlab/data_builder/pipeline.rb +++ b/lib/gitlab/data_builder/pipeline.rb @@ -2,20 +2,56 @@ module Gitlab module DataBuilder - module Pipeline - extend self + # Some callers want to include retried builds, so we wrap the payload hash + # in a SimpleDelegator with additional methods. + class Pipeline < SimpleDelegator + def self.build(pipeline) + new(pipeline) + end - def build(pipeline) - { + def initialize(pipeline) + @pipeline = pipeline + + super( object_kind: 'pipeline', object_attributes: hook_attrs(pipeline), merge_request: pipeline.merge_request && merge_request_attrs(pipeline.merge_request), user: pipeline.user.try(:hook_attrs), project: pipeline.project.hook_attrs(backward: false), commit: pipeline.commit.try(:hook_attrs), - builds: pipeline.builds.latest.map(&method(:build_hook_attrs)) - } + builds: Gitlab::Lazy.new do + preload_builds(pipeline, :latest_builds) + pipeline.latest_builds.map(&method(:build_hook_attrs)) + end + ) + end + + def with_retried_builds + merge( + builds: Gitlab::Lazy.new do + preload_builds(@pipeline, :builds) + @pipeline.builds.map(&method(:build_hook_attrs)) + end + ) + end + + private + + # rubocop: disable CodeReuse/ActiveRecord + def preload_builds(pipeline, association) + ActiveRecord::Associations::Preloader.new.preload(pipeline, + { + association => { + **::Ci::Pipeline::PROJECT_ROUTE_AND_NAMESPACE_ROUTE, + runner: :tags, + job_artifacts_archive: [], + user: [], + metadata: [] + } + } + ) end + # rubocop: enable CodeReuse/ActiveRecord def hook_attrs(pipeline) { @@ -91,7 +127,8 @@ module Gitlab { name: build.expanded_environment_name, - action: build.environment_action + action: build.environment_action, + deployment_tier: build.persisted_environment.try(:tier) } end end |