Skip to content

Commit 1eacc70

Browse files
MasonMJoibel
authored andcommitted
fix: upgrade expr to bring in bugfix. Fixes #15093 (#15168)
(cherry picked from commit 4117a1e) Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com> Signed-off-by: Alan Clucas <alan@clucas.org>
1 parent 116b224 commit 1eacc70

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/coreos/go-oidc/v3 v3.9.0
2020
github.com/doublerebel/bellows v0.0.0-20160303004610-f177d92a03d3
2121
github.com/evanphx/json-patch v5.8.0+incompatible
22-
github.com/expr-lang/expr v1.17.0
22+
github.com/expr-lang/expr v1.17.7
2323
github.com/gavv/httpexpect/v2 v2.16.0
2424
github.com/go-git/go-git/v5 v5.14.0
2525
github.com/go-jose/go-jose/v3 v3.0.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ github.com/evilmonkeyinc/jsonpath v0.8.1 h1:W8K4t8u7aipkQE0hcTICGAdAN0Xph349Ltjg
249249
github.com/evilmonkeyinc/jsonpath v0.8.1/go.mod h1:EQhs0ZsoD4uD56ZJbO30gMTfHLQ6DEa0/5rT5Ymy42s=
250250
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4=
251251
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
252-
github.com/expr-lang/expr v1.17.0 h1:+vpszOyzKLQXC9VF+wA8cVA0tlA984/Wabc/1hF9Whg=
253-
github.com/expr-lang/expr v1.17.0/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
252+
github.com/expr-lang/expr v1.17.7 h1:Q0xY/e/2aCIp8g9s/LGvMDCC5PxYlvHgDZRQ4y16JX8=
253+
github.com/expr-lang/expr v1.17.7/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
254254
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
255255
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
256256
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=

util/template/replace_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ func Test_Replace(t *testing.T) {
4141
require.NoError(t, err)
4242
assert.Equal(t, toJsonString("bar"), r)
4343
})
44+
t.Run("Valid With Variadic Sprig Expression", func(t *testing.T) {
45+
r, err := Replace(ctx, toJSONString("{{=sprig.dig('status', nil, workflow)}}"), map[string]string{"workflow.status": "Succeeded"}, false)
46+
require.NoError(t, err)
47+
assert.Equal(t, toJSONString("Succeeded"), r)
48+
})
4449
t.Run("Valid WorkflowStatus", func(t *testing.T) {
4550
replaced, err := Replace(toJsonString(`{{=workflow.status == "Succeeded" ? "SUCCESSFUL" : "FAILED"}}`), map[string]string{"workflow.status": "Succeeded"}, false)
4651
require.NoError(t, err)

0 commit comments

Comments
 (0)