Skip to content

Commit 3481d4b

Browse files
authored
direct: Fix cycle error message (#3469)
1 parent f650be8 commit 3481d4b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
2-
Error: cycle detected: jobs.bar refers to jobs.foo via ${resources.jobs.bar.id} which refers to jobs.bar via ${resources.jobs.foo.id}
2+
Error: cycle detected: jobs.foo refers to jobs.bar via ${resources.jobs.bar.id} which refers to jobs.foo via ${resources.jobs.foo.id}
33

44

55
Exit code (musterr): 1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Error: cycle detected: jobs.bar refers to jobs.foo via ${resources.jobs.bar.id} which refers to jobs.bar via ${resources.jobs.foo.id}
1+
Error: cycle detected: jobs.foo refers to jobs.bar via ${resources.jobs.bar.id} which refers to jobs.foo via ${resources.jobs.foo.id}
22

33

44
Exit code (musterr): 1

libs/dagrun/dagrun.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ func (e *CycleError[N]) Error() string {
6565
return fmt.Sprintf("cycle detected: %v refers to itself via %s", e.Nodes[0], e.Edges[0])
6666
}
6767

68-
// Build "A refers to B via E1" pieces for every edge except the closing one.
68+
// Build "to refers to from via edge" pieces for every edge except the closing one.
6969
var parts []string
7070
for i := 1; i < len(e.Nodes); i++ {
71-
parts = append(parts, fmt.Sprintf("%v refers to %v via %s", e.Nodes[i-1], e.Nodes[i], e.Edges[i-1]))
71+
parts = append(parts, fmt.Sprintf("%v refers to %v via %s", e.Nodes[i], e.Nodes[i-1], e.Edges[i-1]))
7272
}
7373

7474
return fmt.Sprintf(
7575
"cycle detected: %s which refers to %v via %s",
7676
strings.Join(parts, " "),
77-
e.Nodes[0],
77+
e.Nodes[len(e.Nodes)-1],
7878
e.Edges[len(e.Edges)-1],
7979
)
8080
}

libs/dagrun/dagrun_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestRun_VariousGraphsAndPools(t *testing.T) {
7777
{"A", "B", "${A.id}"},
7878
{"B", "A", "${B.id}"},
7979
},
80-
cycle: "cycle detected: A refers to B via ${A.id} which refers to A via ${B.id}",
80+
cycle: "cycle detected: B refers to A via ${A.id} which refers to B via ${B.id}",
8181
},
8282
{
8383
name: "three-node cycle",
@@ -86,7 +86,7 @@ func TestRun_VariousGraphsAndPools(t *testing.T) {
8686
{"Y", "Z", "e2"},
8787
{"Z", "X", "e3"},
8888
},
89-
cycle: "cycle detected: X refers to Y via e1 Y refers to Z via e2 which refers to X via e3",
89+
cycle: "cycle detected: Y refers to X via e1 Z refers to Y via e2 which refers to Z via e3",
9090
},
9191
{
9292
name: "downstream runs with failed dependency",

0 commit comments

Comments
 (0)