@@ -74,9 +74,8 @@ func NewDefinition(rep *DefinitionRep) (def *Definition, err error) {
74
74
for _ , taskRep := range rep .Tasks {
75
75
76
76
task , err := createTask (def , taskRep , ef )
77
-
78
77
if err != nil {
79
- return nil , fmt .Errorf ("create task [%s] error : %s" , taskRep .ID , err .Error ())
78
+ return nil , fmt .Errorf ("error creating task [%s] in flow [%s] : %s" , taskRep .ID , rep . Name , err .Error ())
80
79
}
81
80
def .tasks [task .id ] = task
82
81
}
@@ -88,7 +87,7 @@ func NewDefinition(rep *DefinitionRep) (def *Definition, err error) {
88
87
89
88
link , err := createLink (def .tasks , linkRep , id , ef )
90
89
if err != nil {
91
- return nil , err
90
+ return nil , fmt . Errorf ( "error creating link [%s] in flow [%s]: %s" , linkRep . Name , rep . Name , err . Error ())
92
91
}
93
92
94
93
def .links [link .id ] = link
@@ -107,9 +106,8 @@ func NewDefinition(rep *DefinitionRep) (def *Definition, err error) {
107
106
for _ , taskRep := range rep .ErrorHandler .Tasks {
108
107
109
108
task , err := createTask (def , taskRep , ef )
110
-
111
109
if err != nil {
112
- return nil , err
110
+ return nil , fmt . Errorf ( "error creating task [%s] in flow [%s]'s error handler:%s" , taskRep . ID , rep . Name , err . Error ())
113
111
}
114
112
errorHandler .tasks [task .id ] = task
115
113
}
@@ -123,7 +121,7 @@ func NewDefinition(rep *DefinitionRep) (def *Definition, err error) {
123
121
124
122
link , err := createLink (errorHandler .tasks , linkRep , id + idOffset , ef )
125
123
if err != nil {
126
- return nil , err
124
+ return nil , fmt . Errorf ( "error creating link [%s] in flow [%s]'s error handler:%s" , linkRep . Name , rep . Name , err . Error ())
127
125
}
128
126
errorHandler .links [link .id ] = link
129
127
}
@@ -228,7 +226,7 @@ func createActivityConfig(task *Task, rep *activity.Config, ef expression.Factor
228
226
for name , value := range rep .Settings {
229
227
activityCfg .settings [name ], err = metadata .ResolveSettingValue (name , value , mdSettings , ef )
230
228
if err != nil {
231
- return nil , err
229
+ return nil , fmt . Errorf ( "unable to resolve setting [%s]'s value [%s]:%s" , name , value , err . Error ())
232
230
}
233
231
}
234
232
}
@@ -266,7 +264,7 @@ func createActivityConfig(task *Task, rep *activity.Config, ef expression.Factor
266
264
}
267
265
}
268
266
}
269
- return nil , fmt .Errorf ("convert value [%+v ] to type [%s] error: %s" , v , fieldMetaddata .Type (), err .Error ())
267
+ return nil , fmt .Errorf ("unable to convert input [%s]'s value [%s ] to type [%s]: %s" , k , v , fieldMetaddata .Type (), err .Error ())
270
268
}
271
269
input [k ] = newVal
272
270
} else {
@@ -291,7 +289,7 @@ func createActivityConfig(task *Task, rep *activity.Config, ef expression.Factor
291
289
if ok {
292
290
v , err = coerce .ToType (v , fieldMetaddata .Type ())
293
291
if err != nil {
294
- return nil , fmt .Errorf ("convert value [%+v ] to type [%s] error: %s" , v , fieldMetaddata .Type (), err .Error ())
292
+ return nil , fmt .Errorf ("unable to convert output [%s]'s value [%s ] to type [%s]: %s" , k , v , fieldMetaddata .Type (), err .Error ())
295
293
}
296
294
output [k ] = v
297
295
} else {
@@ -329,7 +327,7 @@ func createActivityConfig(task *Task, rep *activity.Config, ef expression.Factor
329
327
for name , def := range in {
330
328
s , err := schema .FindOrCreate (def )
331
329
if err != nil {
332
- return nil , err
330
+ return nil , fmt . Errorf ( "unable to find/create input [%s]'s schema [%+v]:%s" , name , def , err . Error ())
333
331
}
334
332
activityCfg .inputSchemas [name ] = s
335
333
}
@@ -340,7 +338,7 @@ func createActivityConfig(task *Task, rep *activity.Config, ef expression.Factor
340
338
for name , def := range out {
341
339
s , err := schema .FindOrCreate (def )
342
340
if err != nil {
343
- return nil , err
341
+ return nil , fmt . Errorf ( "unable to find/create output [%s]'s schema [%+v]:%s" , name , def , err . Error ())
344
342
}
345
343
activityCfg .outputSchemas [name ] = s
346
344
}
@@ -476,7 +474,7 @@ func getLoopCfg(settings map[string]interface{}, taskType string, ef expression.
476
474
lcd , err = getLoopCfgDef (setting )
477
475
} else if setting , ok := settings ["doWhile" ]; ok {
478
476
lcd , err = getLoopCfgDef (setting )
479
- if accum ,ok := settings ["accumulate" ]; lcd != nil && ok {
477
+ if accum , ok := settings ["accumulate" ]; lcd != nil && ok {
480
478
lcd .Accumulate , _ = coerce .ToBool (accum )
481
479
}
482
480
} else {
@@ -511,7 +509,7 @@ func getLoopCfgDef(setting interface{}) (*loopCfgDef, error) {
511
509
lcd .IterateOn = lcd .Iterate
512
510
}
513
511
514
- if lcd .Condition == "" && lcd .IterateOn == "" {
512
+ if lcd .Condition == "" && lcd .IterateOn == "" {
515
513
return nil , nil
516
514
}
517
515
0 commit comments