From cfb26157baddf5fbd33ff60c5dde8808f965af81 Mon Sep 17 00:00:00 2001
From: Frerik Andriessen <frederik.dionysus.andriessen@alliander.com>
Date: Sat, 22 Oct 2022 09:17:34 +0200
Subject: [PATCH 1/2] Make yq task more accepting of whatever is put in SCRIPT

---
 task/yq/0.4/yq.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/task/yq/0.4/yq.yaml b/task/yq/0.4/yq.yaml
index 53957b1079..8a32e0f722 100644
--- a/task/yq/0.4/yq.yaml
+++ b/task/yq/0.4/yq.yaml
@@ -45,8 +45,14 @@ spec:
         /usr/bin/env sh
         set -e
 
+        SCRIPT=$(cat <<EOF
+        $(params.SCRIPT)
+
+        EOF
+        )
+
         # For backwards compatibility with previous versions
-        if [ "$(params.SCRIPT)" = "" ]; then
+        if [ -z "$SCRIPT" ]; then
           for var in "$@"
           do
               /usr/bin/yq eval -i "$(params.expression)" "$var"
@@ -54,4 +60,4 @@ spec:
           exit $?
         fi
 
-        $(params.SCRIPT)
+        eval "$SCRIPT"

From 588d30af14ee29e914838271e71feff900d9fa9f Mon Sep 17 00:00:00 2001
From: "frerik.andriessen" <frederik.dionysus.andriessen@alliander.com>
Date: Mon, 15 May 2023 10:50:17 +0200
Subject: [PATCH 2/2] Quote 'EOF' to prevent variable expansion

---
 task/yq/0.4/yq.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/task/yq/0.4/yq.yaml b/task/yq/0.4/yq.yaml
index 8a32e0f722..9a383c3cdb 100644
--- a/task/yq/0.4/yq.yaml
+++ b/task/yq/0.4/yq.yaml
@@ -45,7 +45,7 @@ spec:
         /usr/bin/env sh
         set -e
 
-        SCRIPT=$(cat <<EOF
+        SCRIPT=$(cat <<'EOF'
         $(params.SCRIPT)
 
         EOF