Merge pull request #1210 from OpenFn/release/next

Release: CLI 1.22.0, worker 1.21.0

Author: josephjclark

integration-tests/cli/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @openfn/integration-tests-cli
 
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies [f089f8d]
+  - @openfn/project@0.10.1
+  - @openfn/lightning-mock@2.4.1
+
 ## 1.0.7
 
 ### Patch Changes

integration-tests/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openfn/integration-tests-cli",
   "private": true,
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "CLI integration tests",
   "author": "Open Function Group <admin@openfn.org>",
   "license": "ISC",

integration-tests/cli/test/project-v1.test.ts

@@ -138,7 +138,7 @@ steps:
     next:
       transform-data:
         disabled: false
-        condition: true
+        condition: always
   - id: transform-data
     name: Transform data
     adaptor: "@openfn/language-common@latest"

integration-tests/worker/src/factories.ts

@@ -19,7 +19,7 @@ export const createTrigger = () => ({
   id: crypto.randomUUID(),
 });
 
-export const createEdge = (a: any, b: any, condition?: string) => {
+export const createEdge = (a: any, b: any, extra?: any) => {
   const edge: any = {
     id: crypto.randomUUID(),
     target_job_id: b.id,
@@ -29,6 +29,7 @@ export const createEdge = (a: any, b: any, condition?: string) => {
   } else {
     edge.source_job_id = a.id;
   }
+  Object.assign(edge, extra);
   return edge;
 };
 

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

@@ -283,3 +283,24 @@ test.serial('Run with collections', async (t) => {
     { key: 'c', value: { id: 'c' } },
   ]);
 });
+
+test.serial('Run with edge conditions', async (t) => {
+  const job1 = createJob({
+    body: `fn((s) => s)`,
+  });
+  const job2 = createJob({
+    body: `fn((s) => {
+      s.didExecuteStep2 = true
+      return s;
+    })`,
+  });
+  const edge = createEdge(job1, job2, {
+    // I would prefer this ran  on failure, but that's a lot
+    // harder to do the way these tests are set up
+    condition: 'on_job_success',
+  });
+  const attempt = createRun([], [job1, job2], [edge]);
+
+  const state = await run(t, attempt);
+  t.true(state.didExecuteStep2);
+});

packages/cli/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @openfn/cli
 
+## 1.22.0
+
+### Minor Changes
+
+- f089f8d: Fix edge conditions in pulled workflows
+
+### Patch Changes
+
+- Updated dependencies [f089f8d]
+- Updated dependencies [f089f8d]
+- Updated dependencies [064933d]
+  - @openfn/runtime@1.8.0
+  - @openfn/project@0.10.1
+
 ## 1.21.0
 
 ### Minor Changes

packages/cli/package.json

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

packages/cli/test/projects/checkout.test.ts

@@ -457,7 +457,7 @@ workspace:
         next: {
           'transform-data-to-fhir-standard': {
             disabled: false,
-            condition: true,
+            condition: 'always',
           },
         },
       },

packages/cli/test/projects/fetch.test.ts

@@ -442,7 +442,7 @@ test.serial(
               next: {
                 'transform-data': {
                   disabled: false,
-                  condition: true,
+                  condition: 'always',
                   openfn: {
                     uuid: 'a9a3adef-b394-4405-814d-3ac4323f4b4b',
                   },

packages/cli/test/projects/fixtures.ts

@@ -90,7 +90,7 @@ workflows:
         next:
           transform-data:
             disabled: false
-            condition: true
+            condition: always
             openfn:
               uuid: a9a3adef-b394-4405-814d-3ac4323f4b4b
     history: