@@ -115,7 +115,7 @@ impl<RT: Runtime> TaskExecutor<RT> {
115
115
. await ?
116
116
} ,
117
117
None => {
118
- let reference = parse_name_or_reference ( name, reference) ?;
118
+ let reference = parse_name_or_reference ( "runQuery" , name, reference) ?;
119
119
self . resolve_function ( & reference) ?
120
120
} ,
121
121
} ;
@@ -160,7 +160,7 @@ impl<RT: Runtime> TaskExecutor<RT> {
160
160
. await ?
161
161
} ,
162
162
None => {
163
- let reference = parse_name_or_reference ( name, reference) ?;
163
+ let reference = parse_name_or_reference ( "runMutation" , name, reference) ?;
164
164
self . resolve_function ( & reference) ?
165
165
} ,
166
166
} ;
@@ -202,7 +202,7 @@ impl<RT: Runtime> TaskExecutor<RT> {
202
202
. await ?
203
203
} ,
204
204
None => {
205
- let reference = parse_name_or_reference ( name, reference) ?;
205
+ let reference = parse_name_or_reference ( "runAction" , name, reference) ?;
206
206
self . resolve_function ( & reference) ?
207
207
} ,
208
208
} ;
@@ -246,9 +246,7 @@ impl<RT: Runtime> TaskExecutor<RT> {
246
246
. await ?
247
247
} ,
248
248
None => {
249
- let reference = with_argument_error ( "scheduler" , || {
250
- parse_name_or_reference ( name, reference) . context ( ArgName ( "name" ) )
251
- } ) ?;
249
+ let reference = parse_name_or_reference ( "scheduler" , name, reference) ?;
252
250
self . resolve_function ( & reference) ?
253
251
} ,
254
252
} ;
@@ -425,7 +423,7 @@ impl<RT: Runtime> TaskExecutor<RT> {
425
423
return Ok ( serde_json:: to_value ( function_handle) ?) ;
426
424
} ,
427
425
None => {
428
- let reference = parse_name_or_reference ( name, reference) ?;
426
+ let reference = parse_name_or_reference ( "createFunctionHandle" , name, reference) ?;
429
427
self . resolve_function ( & reference) ?
430
428
} ,
431
429
} ;
@@ -441,12 +439,13 @@ impl<RT: Runtime> TaskExecutor<RT> {
441
439
}
442
440
443
441
pub fn parse_name_or_reference (
442
+ function_name : & str ,
444
443
name : Option < String > ,
445
444
reference : Option < String > ,
446
445
) -> anyhow:: Result < Reference > {
447
- match ( name, reference) {
446
+ with_argument_error ( function_name , || match ( name, reference) {
448
447
( Some ( name) , _) => Ok ( Reference :: Function ( name. parse ( ) ?) ) ,
449
448
( _, Some ( reference) ) => Ok ( reference. parse ( ) ?) ,
450
449
_ => anyhow:: bail!( "Missing required argument 'name'" ) ,
451
- }
450
+ } )
452
451
}
0 commit comments