From 007a418b6b65a6eb668d73c4bf8ec4aee1fbe527 Mon Sep 17 00:00:00 2001
From: Ruben Fonseca <rubefons@amazon.com>
Date: Tue, 2 Jan 2024 14:25:51 +0100
Subject: [PATCH 1/5] fix(ci): fail dispatch analytics job when Lambda fails

---
 .github/workflows/dispatch_analytics.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dispatch_analytics.yml b/.github/workflows/dispatch_analytics.yml
index b94c7439f7b..f3f90501532 100644
--- a/.github/workflows/dispatch_analytics.yml
+++ b/.github/workflows/dispatch_analytics.yml
@@ -51,7 +51,14 @@ jobs:
       - name: Invoke Lambda function
         run: |
           payload=$(echo -n '{"githubToken": "${{ secrets.GITHUB_TOKEN }}"}' | base64)
-          aws lambda invoke \
-            --function-name ${{ secrets.AWS_ANALYTICS_DISPATCHER_ARN }} \
-            --payload "$payload" response.json
-          cat response.json
+          response=$(aws lambda invoke \
+            --function-name "${{ secrets.AWS_ANALYTICS_DISPATCHER_ARN }}" \
+            --payload "$payload" \
+            response.json \
+            --query 'FunctionError' \
+            --output text)
+
+          if [ "$response" != "None" ]; then
+            echo "Error invoking lambda function, aborting."
+            exit 1
+          fi

From 787c34880beae5fba87559c257d7f8331d10b722 Mon Sep 17 00:00:00 2001
From: Ruben Fonseca <rubefons@amazon.com>
Date: Tue, 2 Jan 2024 14:29:04 +0100
Subject: [PATCH 2/5] fix: better message

---
 .github/workflows/dispatch_analytics.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dispatch_analytics.yml b/.github/workflows/dispatch_analytics.yml
index f3f90501532..bc2e925d325 100644
--- a/.github/workflows/dispatch_analytics.yml
+++ b/.github/workflows/dispatch_analytics.yml
@@ -59,6 +59,6 @@ jobs:
             --output text)
 
           if [ "$response" != "None" ]; then
-            echo "Error invoking lambda function, aborting."
+            echo "Error invoking lambda function: $response. Aborting."
             exit 1
           fi

From 5db27ea414372167c5e78f7f4dda007235958070 Mon Sep 17 00:00:00 2001
From: Ruben Fonseca <rubefons@amazon.com>
Date: Tue, 2 Jan 2024 14:31:54 +0100
Subject: [PATCH 3/5] fix: reprint response

---
 .github/workflows/dispatch_analytics.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/dispatch_analytics.yml b/.github/workflows/dispatch_analytics.yml
index bc2e925d325..0c0855557eb 100644
--- a/.github/workflows/dispatch_analytics.yml
+++ b/.github/workflows/dispatch_analytics.yml
@@ -58,6 +58,8 @@ jobs:
             --query 'FunctionError' \
             --output text)
 
+          jq -C response.json
+
           if [ "$response" != "None" ]; then
             echo "Error invoking lambda function: $response. Aborting."
             exit 1

From fbfaa84e4a9ab24889a78d6ac68c46058afdbb2f Mon Sep 17 00:00:00 2001
From: Ruben Fonseca <rubefons@amazon.com>
Date: Tue, 2 Jan 2024 14:33:05 +0100
Subject: [PATCH 4/5] fix: back to cat

---
 .github/workflows/dispatch_analytics.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dispatch_analytics.yml b/.github/workflows/dispatch_analytics.yml
index 0c0855557eb..11dc676895d 100644
--- a/.github/workflows/dispatch_analytics.yml
+++ b/.github/workflows/dispatch_analytics.yml
@@ -58,7 +58,7 @@ jobs:
             --query 'FunctionError' \
             --output text)
 
-          jq -C response.json
+          cat response.json
 
           if [ "$response" != "None" ]; then
             echo "Error invoking lambda function: $response. Aborting."

From b3f28eb89f17bb24eddf6174715fd9ca579fc1cc Mon Sep 17 00:00:00 2001
From: Ruben Fonseca <rubefons@amazon.com>
Date: Tue, 2 Jan 2024 14:34:30 +0100
Subject: [PATCH 5/5] fix: pretty

---
 .github/workflows/dispatch_analytics.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dispatch_analytics.yml b/.github/workflows/dispatch_analytics.yml
index 11dc676895d..3f4d75a0249 100644
--- a/.github/workflows/dispatch_analytics.yml
+++ b/.github/workflows/dispatch_analytics.yml
@@ -58,7 +58,7 @@ jobs:
             --query 'FunctionError' \
             --output text)
 
-          cat response.json
+          cat response.json ; echo # add newline at the end
 
           if [ "$response" != "None" ]; then
             echo "Error invoking lambda function: $response. Aborting."