feat(api): add tag in event for heatmap (#3848)

yesnault · bnjjj · commit f1a668ceb9c1 · 2019-01-14T09:31:47.000+01:00
Signed-off-by: Yvonnick Esnault &lt;yvonnick.esnault@corp.ovh.com&gt;
diff --git a/engine/api/event/publish.go b/engine/api/event/publish.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/fatih/structs"
-	"github.com/go-gorp/gorp"
 
 	"github.com/ovh/cds/engine/api/cache"
 	"github.com/ovh/cds/sdk"
@@ -82,55 +81,3 @@ func Publish(payload interface{}, u *sdk.User) {
 	}
 	publishEvent(event)
 }
-
-// PublishActionBuild sends a actionBuild event
-func PublishActionBuild(pb *sdk.PipelineBuild, pbJob *sdk.PipelineBuildJob) {
-	e := sdk.EventJob{
-		Version:         pb.Version,
-		JobName:         pbJob.Job.Action.Name,
-		JobID:           pbJob.Job.PipelineActionID,
-		Status:          sdk.StatusFromString(pbJob.Status),
-		Queued:          pbJob.Queued.Unix(),
-		Start:           pbJob.Start.Unix(),
-		Done:            pbJob.Done.Unix(),
-		ModelName:       pbJob.Model,
-		PipelineName:    pb.Pipeline.Name,
-		PipelineType:    pb.Pipeline.Type,
-		ProjectKey:      pb.Pipeline.ProjectKey,
-		ApplicationName: pb.Application.Name,
-		EnvironmentName: pb.Environment.Name,
-		BranchName:      pb.Trigger.VCSChangesBranch,
-		Hash:            pb.Trigger.VCSChangesHash,
-	}
-
-	Publish(e, nil)
-}
-
-// PublishPipelineBuild sends a pipelineBuild event
-func PublishPipelineBuild(db gorp.SqlExecutor, pb *sdk.PipelineBuild, previous *sdk.PipelineBuild) {
-	rmn := ""
-	rfn := ""
-	if pb.Application.VCSServer != "" {
-		rmn = pb.Application.VCSServer
-		rfn = pb.Application.RepositoryFullname
-	}
-
-	e := sdk.EventPipelineBuild{
-		Version:               pb.Version,
-		BuildNumber:           pb.BuildNumber,
-		Status:                pb.Status,
-		Start:                 pb.Start.Unix(),
-		Done:                  pb.Done.Unix(),
-		RepositoryManagerName: rmn,
-		RepositoryFullname:    rfn,
-		PipelineName:          pb.Pipeline.Name,
-		PipelineType:          pb.Pipeline.Type,
-		ProjectKey:            pb.Pipeline.ProjectKey,
-		ApplicationName:       pb.Application.Name,
-		EnvironmentName:       pb.Environment.Name,
-		BranchName:            pb.Trigger.VCSChangesBranch,
-		Hash:                  pb.Trigger.VCSChangesHash,
-	}
-
-	Publish(e, nil)
-}
diff --git a/engine/api/event/publish_workflow_run.go b/engine/api/event/publish_workflow_run.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ovh/cds/sdk/log"
 )
 
-func publishRunWorkflow(payload interface{}, key, workflowName, appName, pipName, envName string, num int64, sub int64, status string) {
+func publishRunWorkflow(payload interface{}, key, workflowName, appName, pipName, envName string, num int64, sub int64, status string, tags []sdk.WorkflowRunTag) {
 	event := sdk.Event{
 		Timestamp:         time.Now(),
 		Hostname:          hostname,
@@ -27,6 +27,7 @@ func publishRunWorkflow(payload interface{}, key, workflowName, appName, pipName
 		WorkflowRunNum:    num,
 		WorkflowRunNumSub: sub,
 		Status:            status,
+		Tags:              tags,
 	}
 	publishEvent(event)
 }
@@ -42,7 +43,7 @@ func PublishWorkflowRun(wr sdk.WorkflowRun, projectKey string) {
 		LastModified:  wr.LastModified.Unix(),
 		Tags:          wr.Tags,
 	}
-	publishRunWorkflow(e, projectKey, wr.Workflow.Name, "", "", "", wr.Number, wr.LastSubNumber, wr.Status)
+	publishRunWorkflow(e, projectKey, wr.Workflow.Name, "", "", "", wr.Number, wr.LastSubNumber, wr.Status, wr.Tags)
 }
 
 // PublishWorkflowNodeRun publish event on a workflow node run
@@ -126,7 +127,7 @@ func PublishWorkflowNodeRun(db gorp.SqlExecutor, nr sdk.WorkflowNodeRun, w sdk.W
 	if sdk.StatusIsTerminated(nr.Status) {
 		e.Done = nr.Done.Unix()
 	}
-	publishRunWorkflow(e, w.ProjectKey, w.Name, appName, pipName, envName, nr.Number, nr.SubNumber, nr.Status)
+	publishRunWorkflow(e, w.ProjectKey, w.Name, appName, pipName, envName, nr.Number, nr.SubNumber, nr.Status, nil)
 }
 
 // PublishWorkflowNodeJobRun publish a WorkflowNodeJobRun
@@ -140,5 +141,5 @@ func PublishWorkflowNodeJobRun(db gorp.SqlExecutor, pkey, wname string, jr sdk.W
 	if sdk.StatusIsTerminated(jr.Status) {
 		e.Done = jr.Done.Unix()
 	}
-	publishRunWorkflow(e, pkey, wname, "", "", "", 0, 0, jr.Status)
+	publishRunWorkflow(e, pkey, wname, "", "", "", 0, 0, jr.Status, nil)
 }
diff --git a/engine/api/pipeline/pipeline_build.go b/engine/api/pipeline/pipeline_build.go
@@ -10,7 +10,6 @@ import (
 	"github.com/go-gorp/gorp"
 	"github.com/lib/pq"
 
-	"github.com/ovh/cds/engine/api/event"
 	"github.com/ovh/cds/sdk"
 	"github.com/ovh/cds/sdk/log"
 )
@@ -464,8 +463,6 @@ func UpdatePipelineBuildStatusAndStage(db gorp.SqlExecutor, pb *sdk.PipelineBuil
 				}
 			}
 		}
-
-		event.PublishPipelineBuild(db, pb, previous)
 	}
 
 	pb.Status = newStatus
diff --git a/sdk/event.go b/sdk/event.go
@@ -31,6 +31,7 @@ type Event struct {
 	WorkflowRunNum    int64                  `json:"workflow_run_num,omitempty"`
 	WorkflowRunNumSub int64                  `json:"workflow_run_num_sub,omitempty"`
 	Status            string                 `json:"status,omitempty"`
+	Tags              []WorkflowRunTag       `json:"tag,omitempty"`
 }
 
 // EventFilter represents filters when getting events

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/ovh/cds/sdk/log"`
`13`	`13`	`)`
`14`	`14`
`15`		`-func publishRunWorkflow(payload interface{}, key, workflowName, appName, pipName, envName string, num int64, sub int64, status string) {`
	`15`	`+func publishRunWorkflow(payload interface{}, key, workflowName, appName, pipName, envName string, num int64, sub int64, status string, tags []sdk.WorkflowRunTag) {`
`16`	`16`	`event := sdk.Event{`
`17`	`17`	`Timestamp: time.Now(),`
`18`	`18`	`Hostname: hostname,`
`@@ -27,6 +27,7 @@ func publishRunWorkflow(payload interface{}, key, workflowName, appName, pipName`
`27`	`27`	`WorkflowRunNum: num,`
`28`	`28`	`WorkflowRunNumSub: sub,`
`29`	`29`	`Status: status,`
	`30`	`+ Tags: tags,`
`30`	`31`	`}`
`31`	`32`	`publishEvent(event)`
`32`	`33`	`}`
`@@ -42,7 +43,7 @@ func PublishWorkflowRun(wr sdk.WorkflowRun, projectKey string) {`
`42`	`43`	`LastModified: wr.LastModified.Unix(),`
`43`	`44`	`Tags: wr.Tags,`
`44`	`45`	`}`
`45`		`- publishRunWorkflow(e, projectKey, wr.Workflow.Name, "", "", "", wr.Number, wr.LastSubNumber, wr.Status)`
	`46`	`+ publishRunWorkflow(e, projectKey, wr.Workflow.Name, "", "", "", wr.Number, wr.LastSubNumber, wr.Status, wr.Tags)`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`// PublishWorkflowNodeRun publish event on a workflow node run`
`@@ -126,7 +127,7 @@ func PublishWorkflowNodeRun(db gorp.SqlExecutor, nr sdk.WorkflowNodeRun, w sdk.W`
`126`	`127`	`if sdk.StatusIsTerminated(nr.Status) {`
`127`	`128`	`e.Done = nr.Done.Unix()`
`128`	`129`	`}`
`129`		`- publishRunWorkflow(e, w.ProjectKey, w.Name, appName, pipName, envName, nr.Number, nr.SubNumber, nr.Status)`
	`130`	`+ publishRunWorkflow(e, w.ProjectKey, w.Name, appName, pipName, envName, nr.Number, nr.SubNumber, nr.Status, nil)`
`130`	`131`	`}`
`131`	`132`
`132`	`133`	`// PublishWorkflowNodeJobRun publish a WorkflowNodeJobRun`
`@@ -140,5 +141,5 @@ func PublishWorkflowNodeJobRun(db gorp.SqlExecutor, pkey, wname string, jr sdk.W`
`140`	`141`	`if sdk.StatusIsTerminated(jr.Status) {`
`141`	`142`	`e.Done = jr.Done.Unix()`
`142`	`143`	`}`
`143`		`- publishRunWorkflow(e, pkey, wname, "", "", "", 0, 0, jr.Status)`
	`144`	`+ publishRunWorkflow(e, pkey, wname, "", "", "", 0, 0, jr.Status, nil)`
`144`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"github.com/go-gorp/gorp"`
`11`	`11`	`"github.com/lib/pq"`
`12`	`12`
`13`		`- "github.com/ovh/cds/engine/api/event"`
`14`	`13`	`"github.com/ovh/cds/sdk"`
`15`	`14`	`"github.com/ovh/cds/sdk/log"`
`16`	`15`	`)`
`@@ -464,8 +463,6 @@ func UpdatePipelineBuildStatusAndStage(db gorp.SqlExecutor, pb *sdk.PipelineBuil`
`464`	`463`	`}`
`465`	`464`	`}`
`466`	`465`	`}`
`467`		`-`
`468`		`- event.PublishPipelineBuild(db, pb, previous)`
`469`	`466`	`}`
`470`	`467`
`471`	`468`	`pb.Status = newStatus`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type Event struct {`
`31`	`31`	WorkflowRunNum int64 `json:"workflow_run_num,omitempty"`
`32`	`32`	WorkflowRunNumSub int64 `json:"workflow_run_num_sub,omitempty"`
`33`	`33`	Status string `json:"status,omitempty"`
	`34`	+ Tags []WorkflowRunTag `json:"tag,omitempty"`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`// EventFilter represents filters when getting events`