Skip to content

Commit 3b06a44

Browse files
committed
FIX: correct next configuration on flow jobs
Re: OpenFn/microservice#35
1 parent 361bf50 commit 3b06a44

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

lib/engine/run_broadcaster.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ defmodule Engine.RunBroadcaster do
131131
%{}
132132
end
133133

134-
next_state = %{"configuration" => Config.credential_body_for(config, job)}
134+
next_state = %{"configuration" => Config.credential_body_for(config, triggered_job)}
135135

136136
initial_state = merge_states([source_state, next_state])
137137

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defmodule Engine.MixProject do
22
use Mix.Project
33

4-
@version "0.7.2"
4+
@version "0.7.3"
55
@source_url "https://github.com/OpenFn/engine"
66

77
def project do

test/engine/run_broadcaster_test.exs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ defmodule Engine.RunBroadcaster.UnitTest do
3333
cron_job =
3434
Job.new(name: "cron-job", trigger: "cron-trigger", adaptor: "@openfn/language-http"),
3535
success_flow_job =
36-
Job.new(name: "flow-job", trigger: "after-test-job", adaptor: "@openfn/language-http"),
36+
Job.new(
37+
name: "flow-job",
38+
trigger: "after-test-job",
39+
adaptor: "@openfn/language-http",
40+
credential: "test-credential"
41+
),
3742
failure_flow_job =
3843
Job.new(
3944
name: "flow-job-failure",
@@ -61,7 +66,7 @@ defmodule Engine.RunBroadcaster.UnitTest do
6166
start_supervised!(
6267
{Engine.Adaptor.Service,
6368
[
64-
adaptors_path: adaptors_path = "./priv/openfn/lib",
69+
adaptors_path: "./priv/openfn/lib",
6570
repo: TestRepo,
6671
name: :test_adaptor_service
6772
]}
@@ -190,7 +195,7 @@ defmodule Engine.RunBroadcaster.UnitTest do
190195
%Run{
191196
trigger: ^failure_flow_trigger,
192197
job: ^failure_flow_job,
193-
initial_state: %{"foo" => "bar"}
198+
initial_state: %{"foo" => "bar", "configuration" => nil}
194199
}
195200
}
196201

test/fixtures/project_config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
expression: none
1212
adaptor: "@openfn/language-common"
1313
trigger: trigger-3
14+
credential: credential-1
1415
job-3:
1516
expression: >
1617
alterState((state) => {
@@ -19,6 +20,7 @@ jobs:
1920
})
2021
adaptor: "@openfn/language-common"
2122
trigger: trigger-4
23+
credential: credential-1
2224

2325
triggers:
2426
trigger-2:
@@ -34,3 +36,6 @@ credentials:
3436
credential-1:
3537
username: "[email protected]"
3638
password: "shhh"
39+
credential-2:
40+
username: "[email protected]"
41+
password: "password"

0 commit comments

Comments
 (0)