fix: pre-empt linker modules with already resolved modules

OpenFn · Jan 14, 2025 · 57bb401 · 57bb401
1 parent c9afba0
commit 57bb401
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/cli/src/execute/execute.ts b/packages/cli/src/execute/execute.ts
@@ -28,7 +28,7 @@ export default async (
       jobLogger: createLogger(JOB, opts),
       linker: {
         repo: opts.repoDir,
-        modules: parseAdaptors(plan),
+        modules: parseAdaptors(plan, opts.adaptors), // considering already resolved adaptors
       },
       callbacks: {
         notify: async (eventName, payload) => {
@@ -49,7 +49,10 @@ export default async (
 };
 
 // TODO we should throw if the adaptor strings are invalid for any reason
-export function parseAdaptors(plan: ExecutionPlan) {
+export function parseAdaptors(
+  plan: ExecutionPlan,
+  resolvedAdaptors: string[] = []
+) {
   const extractInfo = (specifier: string) => {
     const [module, path] = specifier.split('=');
     const { name, version } = getNameAndVersion(module);
@@ -73,7 +76,8 @@ export function parseAdaptors(plan: ExecutionPlan) {
     // But there are a couple of cases mostly in test, when validation is skipped,
     // when the array may not be set
     // It's mostly redundant nbut harmless to optionally chain here
-    job.adaptors?.forEach((adaptor) => {
+    const jobAdaptors = (job.adaptors || []).concat(resolvedAdaptors);
+    jobAdaptors.forEach((adaptor) => {
       const { name, ...maybeVersionAndPath } = extractInfo(adaptor);
       adaptors[name] = maybeVersionAndPath;
     });

diff --git a/packages/runtime/src/execute/step.ts b/packages/runtime/src/execute/step.ts
@@ -146,6 +146,9 @@ const executeStep = async (
       plan.workflow?.credentials
     );
 
+    // this ensures that already resolved modules coming from opts pre-empt the ones coming from step
+    const moduleInfo = { ...step.linker, ...opts.linker?.modules };
+
     notify(NOTIFY_INIT_COMPLETE, {
       jobId,
       duration: Date.now() - duration,
@@ -167,7 +170,7 @@ const executeStep = async (
         ctx,
         job.expression,
         state,
-        step.linker,
+        moduleInfo,
         job.sourceMap
       );
     } catch (e: any) {