refactor: customer workflow executor loading from yaml (#88)

* refactor: error matcher * refactor: step execution error * refactor: step execution error * refactor: step execution error * refactor: customer workflow executor loading from yaml Now executor loading will leaverage bindings instead of loading separately.
rudderlabs · Aug 31, 2023 · a1cfb6c · a1cfb6c
1 parent 4db8f5f
commit a1cfb6c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/src/workflow/factory.ts b/src/workflow/factory.ts
@@ -19,9 +19,9 @@ export class WorkflowEngineFactory {
     try {
       this.prepareWorkflow(workflow, options);
       const optionsInteranl = options as WorkflowOptionsInternal;
-      const executor = await WorkflowUtils.getExecutor(workflow, optionsInteranl);
       const bindings = await this.prepareBindings(workflow.bindings || [], optionsInteranl);
       optionsInteranl.currentBindings = bindings;
+      const executor = await WorkflowUtils.getExecutor(workflow, optionsInteranl);
       const stepExecutors = await this.createStepExecutors(workflow.steps, optionsInteranl);
       return new WorkflowEngine(workflow.name, executor, bindings, stepExecutors);
     } catch (error: any) {

diff --git a/src/workflow/types.ts b/src/workflow/types.ts
@@ -37,10 +37,8 @@ export type Workflow = {
   bindings?: Binding[];
   steps: Step[];
   templateType?: TemplateType;
-  executor?: {
-    name: string;
-    path: string;
-  };
+  // Executor name will be searched in the bindings
+  executor?: string;
 };
 
 export type WorkflowOutput = {

diff --git a/src/workflow/utils.ts b/src/workflow/utils.ts
@@ -136,17 +136,12 @@ export class WorkflowUtils {
     workflow: Workflow,
     options: WorkflowOptionsInternal,
   ): Promise<WorkflowExecutor> {
-    if (workflow?.executor?.path) {
-      let executor = await this.getModuleExportsFromAllPaths(workflow.executor.path, options);
-
-      if (
-        !executor ||
-        !executor[workflow.executor.name] ||
-        !executor[workflow.executor.name].execute
-      ) {
-        throw new WorkflowCreationError('Workflow executor not found', workflow.name);
+    if (workflow?.executor) {
+      let executor = options.currentBindings[workflow.executor];
+      if (!executor?.execute) {
+        throw new WorkflowCreationError('Workflow executor not found', workflow.executor);
       }
-      return executor[workflow.executor.name];
+      return executor;
     }
     return options.executor || DefaultWorkflowExecutor.INSTANCE;
   }

diff --git a/test/scenarios/custom_executor/bad_executor.yaml b/test/scenarios/custom_executor/bad_executor.yaml
@@ -1,6 +1,5 @@
-executor:
-  path: ./custom_executors
-  name: invalidExecutor
+executor: invalidExecutor
+
 steps:
   - name: dummy
     template: |

diff --git a/test/scenarios/custom_executor/workflow.yaml b/test/scenarios/custom_executor/workflow.yaml
@@ -1,6 +1,8 @@
-executor:
-  path: ./custom_executors
-  name: customWorkflowExecutor
+bindings:
+  - path: ./custom_executors
+    name: customWorkflowExecutor
+
+executor: customWorkflowExecutor
 steps:
   - name: dummy
     template: |