Merge pull request #494 from OpenFn/release/next

Release: worker 0.2.8 & CLI 0.4.9

Dockerfile

@@ -24,7 +24,4 @@ WORKDIR /app/packages/ws-worker
 # ------------------------------------------------------------------------------
 
 EXPOSE 2222
-CMD [ "node", "dist/start.js"]
-
-# TODO: determine how to pass in the -l from `docker run` for running on mac m1
-# CMD [ "pnpm", "start", "-l", "ws://host.docker.internal:4000"]
+CMD [ "node", "./dist/start.js"]

integration-tests/worker/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @openfn/integration-tests-worker
 
+## 1.0.20
+
+### Patch Changes
+
+- Updated dependencies [6f78b7a]
+- Updated dependencies [4a17048]
+- Updated dependencies [54d0017]
+- Updated dependencies [6f78b7a]
+  - @openfn/engine-multi@0.2.0
+  - @openfn/ws-worker@0.2.9
+  - @openfn/lightning-mock@1.1.2
+
+## 1.0.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @openfn/ws-worker@0.2.8
+  - @openfn/lightning-mock@1.1.1
+
+## 1.0.18
+
+### Patch Changes
+
+- Updated dependencies [9bf94f8]
+  - @openfn/lightning-mock@1.1.0
+  - @openfn/ws-worker@0.2.7
+
 ## 1.0.17
 
 ### Patch Changes

integration-tests/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openfn/integration-tests-worker",
   "private": true,
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "Lightning WOrker integration tests",
   "author": "Open Function Group <[email protected]>",
   "license": "ISC",

integration-tests/worker/src/factories.ts

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 
-export const createAttempt = (triggers, jobs, edges, args) => ({
+export const createAttempt = (triggers, jobs, edges, args = {}) => ({
   id: crypto.randomUUID(),
   triggers,
   jobs,

integration-tests/worker/test/autoinstall.test.ts

@@ -0,0 +1,60 @@
+// stress test for autoinstall
+// this could evolve  into stress testing, benchmarking or artillery generally?
+// Also I may skip this in CI after the issue is fixed
+
+import test from 'ava';
+import path from 'node:path';
+
+import { initLightning, initWorker } from '../src/init';
+import { createAttempt, createJob } from '../src/factories';
+
+const generate = (adaptor, version) => {
+  const specifier = `@openfn/language-${adaptor}@${version}`;
+  const job = createJob({
+    body: `fn(() => ({ data: "${adaptor}" }))`,
+    adaptor: specifier,
+  });
+  return createAttempt([], [job], []);
+};
+
+let lightning;
+let worker;
+
+const run = async (attempt) => {
+  return new Promise<any>(async (done, reject) => {
+    lightning.on('attempt:complete', (evt) => {
+      if (attempt.id === evt.attemptId) {
+        done(lightning.getResult(attempt.id));
+      }
+    });
+
+    lightning.enqueueAttempt(attempt);
+  });
+};
+
+test.before(async () => {
+  const lightningPort = 4321;
+
+  lightning = initLightning(lightningPort);
+
+  ({ worker } = await initWorker(lightningPort, {
+    repoDir: path.resolve('tmp/repo/autoinstall'),
+  }));
+});
+
+test.after(async () => {
+  lightning.destroy();
+  await worker.destroy();
+});
+
+test('autoinstall three things at once', async (t) => {
+  const a = generate('common', '1.11.1');
+  const b = generate('http', '5.0.0');
+  const c = generate('googlesheets', '2.2.2');
+
+  const [ra, rb, rc] = await Promise.all([run(a), run(b), run(c)]);
+
+  t.is(ra.data, 'common');
+  t.is(rb.data, 'http');
+  t.is(rc.data, 'googlesheets');
+});

packages/cli/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @openfn/cli
 
+## 0.4.9
+
+### Patch Changes
+
+- Updated dependencies [3c2de85]
+  - @openfn/runtime@0.2.0
+  - @openfn/deploy@0.2.10
+
 ## 0.4.8
 
 ### Patch Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",

packages/deploy/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openfn/deploy
 
+## 0.2.10
+
+### Patch Changes
+
+- 3c2de85: Remove the `enabled` flag from Jobs, and add to Triggers and Edges
+
 ## 0.2.9
 
 ### Patch Changes

packages/deploy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/deploy",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Deploy projects to Lightning instances",
   "type": "module",
   "exports": {

packages/deploy/src/stateTransform.ts

@@ -33,7 +33,6 @@ function mergeJobs(
             name: specJob.name,
             adaptor: specJob.adaptor,
             body: specJob.body,
-            enabled: pickValue(specJob, stateJob || {}, 'enabled', true),
           },
         ];
       }
@@ -50,7 +49,6 @@ function mergeJobs(
             name: specJob.name,
             adaptor: specJob.adaptor,
             body: specJob.body,
-            enabled: pickValue(specJob, stateJob, 'enabled', true),
           },
         ];
       }
@@ -73,11 +71,11 @@ function pickValue(
   key: string,
   defaultValue: any
 ): any {
-  if (typeof first[key] !== 'undefined') {
+  if (key in first) {
     return first[key];
   }
 
-  if (second && typeof second[key] !== 'undefined') {
+  if (key in second) {
     return second[key];
   }
 
@@ -96,7 +94,7 @@ function mergeTriggers(
             triggerKey,
             {
               id: crypto.randomUUID(),
-              ...pickKeys(specTrigger, ['type']),
+              ...pickKeys(specTrigger, ['type', 'enabled']),
               ...(specTrigger.type === 'cron'
                 ? { cron_expression: specTrigger.cron_expression }
                 : {}),
@@ -115,6 +113,7 @@ function mergeTriggers(
             id: stateTrigger!.id,
             ...{
               type: pickValue(specTrigger!, stateTrigger!, 'type', 'webhook'),
+              enabled: pickValue(specTrigger!, stateTrigger!, 'enabled', true),
               ...(specTrigger!.type === 'cron'
                 ? { cron_expression: specTrigger!.cron_expression }
                 : {}),
@@ -146,6 +145,7 @@ function mergeEdges(
               id,
               condition: specEdge.condition ?? null,
               target_job_id: jobs[specEdge.target_job ?? -1]?.id ?? '',
+              enabled: pickValue(specEdge, stateEdge || {}, 'enabled', true),
             },
             {
               source_job_id: jobs[specEdge.source_job ?? -1]?.id,

packages/deploy/src/types.ts

@@ -2,7 +2,6 @@ export type Job = {
   id?: string;
   name: string;
   adaptor: string;
-  enabled?: boolean;
   body: string;
   delete?: boolean;
 };
@@ -12,6 +11,7 @@ export type Trigger = {
   type?: string;
   cron_expression?: string;
   delete?: boolean;
+  enabled?: boolean;
 };
 
 export type StateEdge = {
@@ -20,13 +20,15 @@ export type StateEdge = {
   source_job_id: string | null;
   source_trigger_id: string | null;
   target_job_id: string;
+  enabled?: boolean;
 };
 
 export type SpecEdge = {
   condition: string | null;
   source_job?: string | null;
   source_trigger?: string | null;
   target_job: string | null;
+  enabled?: boolean;
 };
 
 export type WorkflowSpec = {