From c6b48ccb0c34b5c2a80ced7dff3edf1576660313 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zhengyu.gu@datadoghq.com>
Date: Tue, 1 Sep 2026 18:04:13 +0000
Subject: [PATCH 1/2] Fix

---
 utils/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/release.sh b/utils/release.sh
index 73a1f76b5d..93288f47cf 100755
--- a/utils/release.sh
+++ b/utils/release.sh
@@ -664,7 +664,7 @@ if gh workflow run release-validated.yml \
     --field dry_run="$DRY_RUN" \
     --field skip_tests="$SKIP_TESTS" \
     --field request_id="$REQUEST_ID" \
-    ${SOURCE_SHA_FIELD:-} > "$WORKFLOW_OUTPUT" 2> "$WORKFLOW_ERROR"; then
+    "${SOURCE_SHA_FIELD:-}" > "$WORKFLOW_OUTPUT" 2> "$WORKFLOW_ERROR"; then
 
     WORKFLOW_SUCCESS=true
     echo ""

From e309c964a38d4fcc9c3544ac778510e19509e2d9 Mon Sep 17 00:00:00 2001
From: zhengyu123 <zhengyu.gu@datadoghq.com>
Date: Tue, 1 Sep 2026 15:08:49 -0400
Subject: [PATCH 2/2] Review

---
 utils/release.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/utils/release.sh b/utils/release.sh
index 93288f47cf..ac5e1597a2 100755
--- a/utils/release.sh
+++ b/utils/release.sh
@@ -648,10 +648,14 @@ REQUEST_ID="release-$(date -u +%Y%m%dT%H%M%SZ)-$$-$RANDOM"
 
 # In retry mode, don't pass source_sha — the branch HEAD may have moved since
 # the original run, and the workflow rejects SHA mismatches.
-if [ -n "$RETRY_RUN_ID" ]; then
-    SOURCE_SHA_FIELD=""
-else
-    SOURCE_SHA_FIELD="--field source_sha=$COMMIT_SHA"
+#
+# This must stay an array. A quoted scalar collapses "--field" and its
+# key=value argument into one argv token, which gh rejects with
+# "unknown flag: --field source_sha"; an unquoted scalar would silently
+# word-split and also emit a stray empty argument in retry mode.
+SOURCE_SHA_ARGS=()
+if [ -z "$RETRY_RUN_ID" ]; then
+    SOURCE_SHA_ARGS=(--field "source_sha=$COMMIT_SHA")
 fi
 
 # Trigger the workflow
@@ -664,7 +668,7 @@ if gh workflow run release-validated.yml \
     --field dry_run="$DRY_RUN" \
     --field skip_tests="$SKIP_TESTS" \
     --field request_id="$REQUEST_ID" \
-    "${SOURCE_SHA_FIELD:-}" > "$WORKFLOW_OUTPUT" 2> "$WORKFLOW_ERROR"; then
+    "${SOURCE_SHA_ARGS[@]}" > "$WORKFLOW_OUTPUT" 2> "$WORKFLOW_ERROR"; then
 
     WORKFLOW_SUCCESS=true
     echo ""