Skip to content

Commit 7732d9f

Browse files
committed
Fix i/o between pipelines
1 parent 27ecd02 commit 7732d9f

File tree

7 files changed

+10
-17
lines changed

7 files changed

+10
-17
lines changed

backend/pipelines/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ require (
4141
github.com/russross/blackfriday/v2 v2.0.1 // indirect
4242
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
4343
github.com/syndtr/goleveldb v1.0.0 // indirect
44-
github.com/ylem-co/shared-messaging v0.0.0-20240906192118-7b8fffc71211 // indirect
44+
github.com/ylem-co/shared-messaging v0.0.0-20250212095619-4155f4bd1124 // indirect
4545
go.uber.org/atomic v1.6.0 // indirect
4646
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
4747
golang.org/x/net v0.0.0-20211029224645-99673261e6eb // indirect

backend/pipelines/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,8 @@ github.com/ylem-co/shared-messaging v0.0.0-20240902171028-26da5a197fd4 h1:EMlJO+
971971
github.com/ylem-co/shared-messaging v0.0.0-20240902171028-26da5a197fd4/go.mod h1:OAQr4N1aBobOY7KC4D4bRXWmdMl4SHxsKSs8yBniIoM=
972972
github.com/ylem-co/shared-messaging v0.0.0-20240906192118-7b8fffc71211 h1:80cVDw/cJjxYz3DbnjrfXoKTwJD9Rahfzncsk0tQJgw=
973973
github.com/ylem-co/shared-messaging v0.0.0-20240906192118-7b8fffc71211/go.mod h1:OAQr4N1aBobOY7KC4D4bRXWmdMl4SHxsKSs8yBniIoM=
974+
github.com/ylem-co/shared-messaging v0.0.0-20250212095619-4155f4bd1124 h1:gf42BLiDeMQP3EH6EQ7UmvCLSOsOIlJ2wmTMwNV3mdo=
975+
github.com/ylem-co/shared-messaging v0.0.0-20250212095619-4155f4bd1124/go.mod h1:OAQr4N1aBobOY7KC4D4bRXWmdMl4SHxsKSs8yBniIoM=
974976
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
975977
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
976978
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

backend/pipelines/services/taskrunner/pipeline_run_initiator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/sirupsen/logrus"
1717
)
1818

19-
func InitiatePipelineRun(tx *sql.Tx, trc msgsrv.TaskRunContext, prevOutputBytes []byte, prewPipelineRunUuid uuid.UUID) error {
19+
func InitiatePipelineRun(tx *sql.Tx, trc msgsrv.TaskRunContext, prevOutputBytes []byte, prewPipelineRunUuid uuid.UUID, prevPipelineOutputBytes []byte) error {
2020
sysVars, err := envvariable.GetEnvVariablesByOrganizationUuidTx(tx, trc.Task.OrganizationUuid)
2121
if err != nil {
2222
return err
@@ -49,7 +49,7 @@ func InitiatePipelineRun(tx *sql.Tx, trc msgsrv.TaskRunContext, prevOutputBytes
4949
sr := schedule.ScheduledRun{
5050
PipelineRunUuid: wrUuid,
5151
PipelineId: wf.Id,
52-
Input: make([]byte, 0),
52+
Input: prevPipelineOutputBytes,
5353
EnvVars: envVars,
5454
ExecuteAt: &executeAt,
5555
}

backend/pipelines/services/trigger/listener/trigger_listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (l *TriggerListener) OnTaskRunResult(ctx goka.Context, envelope interface{}
7474
} else {
7575
err = taskrunner.InitiatePipelineRun(tx, msgsrv.TaskRunContext{
7676
Task: t,
77-
}, []byte{}, uuid.Nil)
77+
}, []byte{}, uuid.Nil, trr.Output)
7878

7979
if err != nil {
8080
_ = tx.Rollback()

processor/taskrunner/domain/runner/run_pipeline.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package runner
22

33
import (
4-
"encoding/json"
5-
"ylem_taskrunner/helpers/kafka"
6-
74
messaging "github.com/ylem-co/shared-messaging"
85
)
96

@@ -22,15 +19,7 @@ func RunPipelineTaskRunner(t *messaging.RunPipelineTask) *messaging.TaskRunResul
2219
tr.IsInitialTask = t.IsInitialTask
2320
tr.IsFinalTask = t.IsFinalTask
2421
tr.Meta = t.Meta
25-
26-
result, err := json.Marshal(t.PipelineToRunUuid)
27-
if err != nil {
28-
kafka.HandleBadRequestError(t.TaskUuid, messaging.TaskRunPipelineMessageName, err, tr)
29-
30-
return tr
31-
}
32-
33-
tr.Output = result
22+
tr.Output = t.Input
3423

3524
return tr
3625
})

processor/taskrunner/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/ylem-co/hubspot-client v0.0.0-20240902164341-00f6a99cfdd1 // indirect
4646
github.com/ylem-co/opsgenie-client v0.0.0-20240902173345-eb25eabd0214 // indirect
4747
github.com/ylem-co/salesforce-client v0.0.0-20240902165912-6a570283e8d5 // indirect
48-
github.com/ylem-co/shared-messaging v0.0.0-20240902171028-26da5a197fd4 // indirect
48+
github.com/ylem-co/shared-messaging v0.0.0-20250212095619-4155f4bd1124 // indirect
4949
golang.org/x/sys v0.15.0 // indirect
5050
)
5151

processor/taskrunner/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,8 @@ github.com/ylem-co/shared-messaging v0.0.0-20240717175742-c78b09b209c0 h1:MxPzTV
519519
github.com/ylem-co/shared-messaging v0.0.0-20240717175742-c78b09b209c0/go.mod h1:mMMhSSerLwzVnqWs+gwfcbVBaEx66FzBBhq4HOlO4Iw=
520520
github.com/ylem-co/shared-messaging v0.0.0-20240902171028-26da5a197fd4 h1:EMlJO+cJp5mC+bNGeq/leKaRNPXMnN/LESGKTIpr+FQ=
521521
github.com/ylem-co/shared-messaging v0.0.0-20240902171028-26da5a197fd4/go.mod h1:OAQr4N1aBobOY7KC4D4bRXWmdMl4SHxsKSs8yBniIoM=
522+
github.com/ylem-co/shared-messaging v0.0.0-20250212095619-4155f4bd1124 h1:gf42BLiDeMQP3EH6EQ7UmvCLSOsOIlJ2wmTMwNV3mdo=
523+
github.com/ylem-co/shared-messaging v0.0.0-20250212095619-4155f4bd1124/go.mod h1:OAQr4N1aBobOY7KC4D4bRXWmdMl4SHxsKSs8yBniIoM=
522524
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
523525
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
524526
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

0 commit comments

Comments
 (0)