Skip to content

Commit ec393fa

Browse files
spoorvipsharma8Dean Karn
authored
added support for queued duration in payload (#166)
This PR adds queuedDuration field in gitlab jobevent payload. Co-authored-by: psharma8 <poorvi.sharma@booking.com> Co-authored-by: Dean Karn <Dean.Karn@gmail.com>
1 parent 336e0a0 commit ec393fa

File tree

3 files changed

+44
-41
lines changed

3 files changed

+44
-41
lines changed

gitlab/payload.go

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -133,51 +133,52 @@ type CommentEventPayload struct {
133133

134134
// BuildEventPayload contains the information for GitLab's build status change event
135135
type BuildEventPayload struct {
136-
ObjectKind string `json:"object_kind"`
137-
Ref string `json:"ref"`
138-
Tag bool `json:"tag"`
139-
BeforeSHA string `json:"before_sha"`
140-
SHA string `json:"sha"`
141-
BuildID int64 `json:"build_id"`
142-
BuildName string `json:"build_name"`
143-
BuildStage string `json:"build_stage"`
144-
BuildStatus string `json:"build_status"`
145-
BuildStartedAt customTime `json:"build_started_at"`
146-
BuildFinishedAt customTime `json:"build_finished_at"`
147-
BuildDuration float64 `json:"build_duration"`
148-
BuildAllowFailure bool `json:"build_allow_failure"`
149-
BuildFailureReason string `json:"build_failure_reason"`
150-
ProjectID int64 `json:"project_id"`
151-
ProjectName string `json:"project_name"`
152-
User User `json:"user"`
153-
Commit BuildCommit `json:"commit"`
154-
Repository Repository `json:"repository"`
155-
Runner Runner `json:"runner"`
136+
ObjectKind string `json:"object_kind"`
137+
Ref string `json:"ref"`
138+
Tag bool `json:"tag"`
139+
BeforeSHA string `json:"before_sha"`
140+
SHA string `json:"sha"`
141+
BuildID int64 `json:"build_id"`
142+
BuildName string `json:"build_name"`
143+
BuildStage string `json:"build_stage"`
144+
BuildStatus string `json:"build_status"`
145+
BuildStartedAt customTime `json:"build_started_at"`
146+
BuildFinishedAt customTime `json:"build_finished_at"`
147+
BuildQueuedDuration float64 `json:"build_queued_duration"`
148+
BuildDuration float64 `json:"build_duration"`
149+
BuildAllowFailure bool `json:"build_allow_failure"`
150+
ProjectID int64 `json:"project_id"`
151+
ProjectName string `json:"project_name"`
152+
User User `json:"user"`
153+
Commit BuildCommit `json:"commit"`
154+
Repository Repository `json:"repository"`
155+
Runner Runner `json:"runner"`
156156
}
157157

158158
// JobEventPayload contains the information for GitLab's Job status change
159159
type JobEventPayload struct {
160-
ObjectKind string `json:"object_kind"`
161-
Ref string `json:"ref"`
162-
Tag bool `json:"tag"`
163-
BeforeSHA string `json:"before_sha"`
164-
SHA string `json:"sha"`
165-
BuildID int64 `json:"build_id"`
166-
BuildName string `json:"build_name"`
167-
BuildStage string `json:"build_stage"`
168-
BuildStatus string `json:"build_status"`
169-
BuildStartedAt customTime `json:"build_started_at"`
170-
BuildFinishedAt customTime `json:"build_finished_at"`
171-
BuildDuration float64 `json:"build_duration"`
172-
BuildAllowFailure bool `json:"build_allow_failure"`
173-
BuildFailureReason string `json:"build_failure_reason"`
174-
PipelineID int64 `json:"pipeline_id"`
175-
ProjectID int64 `json:"project_id"`
176-
ProjectName string `json:"project_name"`
177-
User User `json:"user"`
178-
Commit BuildCommit `json:"commit"`
179-
Repository Repository `json:"repository"`
180-
Runner Runner `json:"runner"`
160+
ObjectKind string `json:"object_kind"`
161+
Ref string `json:"ref"`
162+
Tag bool `json:"tag"`
163+
BeforeSHA string `json:"before_sha"`
164+
SHA string `json:"sha"`
165+
BuildID int64 `json:"build_id"`
166+
BuildName string `json:"build_name"`
167+
BuildStage string `json:"build_stage"`
168+
BuildStatus string `json:"build_status"`
169+
BuildStartedAt customTime `json:"build_started_at"`
170+
BuildFinishedAt customTime `json:"build_finished_at"`
171+
BuildQueuedDuration float64 `json:"build_queued_duration"`
172+
BuildDuration float64 `json:"build_duration"`
173+
BuildAllowFailure bool `json:"build_allow_failure"`
174+
BuildFailureReason string `json:"build_failure_reason"`
175+
PipelineID int64 `json:"pipeline_id"`
176+
ProjectID int64 `json:"project_id"`
177+
ProjectName string `json:"project_name"`
178+
User User `json:"user"`
179+
Commit BuildCommit `json:"commit"`
180+
Repository Repository `json:"repository"`
181+
Runner Runner `json:"runner"`
181182
}
182183

183184
// SystemHookPayload contains the ObjectKind to match with real hook events

testdata/gitlab/build-event.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"build_status": "created",
1111
"build_started_at": null,
1212
"build_finished_at": null,
13+
"build_queued_duration": 0.9678,
1314
"build_duration": null,
1415
"build_allow_failure": false,
1516
"project_id": 380,

testdata/gitlab/job-event.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"build_status": "created",
1111
"build_started_at": null,
1212
"build_finished_at": null,
13+
"build_queued_duration": 0.9678,
1314
"build_duration": null,
1415
"build_allow_failure": false,
1516
"build_failure_reason": "script_failure",

0 commit comments

Comments
 (0)