Skip to content

Commit b0227ae

Browse files
authored
fix(engine): resync vcs status v1 (#6843)
Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
1 parent 4b641a7 commit b0227ae

File tree

3 files changed

+5
-49
lines changed

3 files changed

+5
-49
lines changed

engine/api/workflow/workflow_run_event.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (e *VCSEventMessenger) SendVCSEvent(ctx context.Context, db *gorp.DbMap, st
116116
}
117117
e.commitsStatuses[ref] = statuses
118118
}
119-
expected := sdk.VCSCommitStatusDescription(proj.Key, wr.Workflow.Name, sdk.EventRunWorkflowNode{
119+
expected := sdk.VCSCommitStatusContextV1(proj.Key, wr.Workflow.Name, sdk.EventRunWorkflowNode{
120120
NodeName: nodeRun.WorkflowNodeName,
121121
})
122122
log.Info(ctx, "expected status description is %q", expected)
@@ -305,7 +305,7 @@ func (e *VCSEventMessenger) sendVCSEventStatus(ctx context.Context, db gorp.SqlE
305305
}
306306

307307
buildStatus := sdk.VCSBuildStatus{
308-
Title: fmt.Sprintf("%s-%s-%s", evt.ProjectKey, evt.WorkflowName, eventWNR.NodeName),
308+
Title: sdk.VCSCommitStatusContextV1(evt.ProjectKey, evt.WorkflowName, eventWNR),
309309
Description: eventWNR.NodeName + ": " + eventWNR.Status,
310310
URLCDS: fmt.Sprintf("%s/project/%s/workflow/%s/run/%d", cdsUIURL, evt.ProjectKey, evt.WorkflowName, eventWNR.Number),
311311
Context: fmt.Sprintf("%s-%s-%s", evt.ProjectKey, evt.WorkflowName, eventWNR.NodeName),

engine/vcs/github/client_status.go

-44
Original file line numberDiff line numberDiff line change
@@ -144,47 +144,3 @@ func processGithubState(s Status) string {
144144
return sdk.StatusDisabled
145145
}
146146
}
147-
148-
func processEventWorkflowNodeRun(event sdk.Event, cdsUIURL string, disabledStatusDetail bool) (statusData, error) {
149-
data := statusData{}
150-
var eventNR sdk.EventRunWorkflowNode
151-
if err := sdk.JSONUnmarshal(event.Payload, &eventNR); err != nil {
152-
return data, sdk.WrapError(err, "cannot unmarshal payload")
153-
}
154-
//We only manage status Success and Failure
155-
if eventNR.Status == sdk.StatusChecking ||
156-
eventNR.Status == sdk.StatusDisabled ||
157-
eventNR.Status == sdk.StatusNeverBuilt ||
158-
eventNR.Status == sdk.StatusSkipped ||
159-
eventNR.Status == sdk.StatusUnknown ||
160-
eventNR.Status == sdk.StatusWaiting {
161-
return data, nil
162-
}
163-
164-
switch eventNR.Status {
165-
case sdk.StatusFail:
166-
data.status = "error"
167-
case sdk.StatusSuccess:
168-
data.status = "success"
169-
default:
170-
data.status = "pending"
171-
}
172-
data.hash = eventNR.Hash
173-
data.repoFullName = eventNR.RepositoryFullName
174-
175-
if !disabledStatusDetail {
176-
data.urlPipeline = fmt.Sprintf("%s/project/%s/workflow/%s/run/%d",
177-
cdsUIURL,
178-
event.ProjectKey,
179-
event.WorkflowName,
180-
eventNR.Number,
181-
)
182-
} else {
183-
//CDS can avoid sending github targer url in status, if it's disable
184-
data.urlPipeline = ""
185-
}
186-
187-
data.context = sdk.VCSCommitStatusDescription(event.ProjectKey, event.WorkflowName, eventNR)
188-
data.desc = eventNR.NodeName + ": " + eventNR.Status
189-
return data, nil
190-
}

sdk/vcs.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -405,14 +405,14 @@ func GetDefaultBranch(branches []VCSBranch) VCSBranch {
405405
return VCSBranch{}
406406
}
407407

408-
// VCSCommitStatusDescription return a node formated status description
409-
func VCSCommitStatusDescription(projKey, workflowName string, evt EventRunWorkflowNode) string {
408+
// VCSCommitStatusContextV1 return a node formated status Context for workflow V1
409+
func VCSCommitStatusContextV1(projKey, workflowName string, evt EventRunWorkflowNode) string {
410410
key := fmt.Sprintf("%s-%s-%s",
411411
projKey,
412412
workflowName,
413413
evt.NodeName,
414414
)
415-
return fmt.Sprintf("CDS/%s", key)
415+
return fmt.Sprintf("%s", key)
416416
}
417417

418418
type VCSBuildStatus struct {

0 commit comments

Comments
 (0)