From cb0a788d17422450e064539bfe36ea5838764637 Mon Sep 17 00:00:00 2001
From: Amr Bashir <amr.bashir2015@gmail.com>
Date: Tue, 21 May 2024 20:10:36 +0300
Subject: [PATCH] fix(shell): use serde `untagged` not `flatten` (#1328)

---
 .changes/shell-execute-return.md | 5 +++++
 plugins/shell/src/commands.rs    | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .changes/shell-execute-return.md

diff --git a/.changes/shell-execute-return.md b/.changes/shell-execute-return.md
new file mode 100644
index 00000000..6bc270f5
--- /dev/null
+++ b/.changes/shell-execute-return.md
@@ -0,0 +1,5 @@
+---
+"shell": "patch"
+---
+
+Fix a regression introduce in the last release where The JS API `Command.execute()` returned malformed response.
diff --git a/plugins/shell/src/commands.rs b/plugins/shell/src/commands.rs
index 77aee699..dce61ec5 100644
--- a/plugins/shell/src/commands.rs
+++ b/plugins/shell/src/commands.rs
@@ -170,6 +170,7 @@ fn prepare_cmd<R: Runtime>(
 }
 
 #[derive(Serialize)]
+#[serde(untagged)]
 enum Output {
     String(String),
     Raw(Vec<u8>),
@@ -179,9 +180,7 @@ enum Output {
 pub struct ChildProcessReturn {
     code: Option<i32>,
     signal: Option<i32>,
-    #[serde(flatten)]
     stdout: Output,
-    #[serde(flatten)]
     stderr: Output,
 }