(openserverless-task) branch fix-deploy2 updated: fix: no env expansion in action parameters

[bsalzano]

This is an automated email from the ASF dual-hosted git repository.

bsalzano pushed a commit to branch fix-deploy2
in repository https://gitbox.apache.org/repos/asf/openserverless-task.git


The following commit(s) were added to refs/heads/fix-deploy2 by this push:
     new d19d743  fix: no env expansion in action parameters
d19d743 is described below

commit d19d7430759647df5ce62b0c5630faf9a328a679
Author: Bruno Salzano <d4rks...@gmail.com>
AuthorDate: Thu Aug 14 16:14:36 2025 +0200

    fix: no env expansion in action parameters
    
    Bun.spawn is not performing env expansion. Added a function in env_utils to 
perform expansion before Bun.spawn
---
 ide/deploy/client.js    |  6 +++--
 ide/deploy/deploy.js    |  2 ++
 ide/deploy/env_utils.js | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/ide/deploy/client.js b/ide/deploy/client.js
index 51930aa..307f7ed 100644
--- a/ide/deploy/client.js
+++ b/ide/deploy/client.js
@@ -19,7 +19,8 @@ import {readFile} from 'fs/promises';
 import {resolve} from 'path';
 import process from 'process';
 import {createInterface} from 'readline';
-import {globalWatcher} from "./watch";
+import {globalWatcher} from './watch';
+import {expandEnv} from './env_utils';
 const { parse } = await import('shell-quote');
 export let globalProc = undefined;
 
@@ -103,7 +104,8 @@ async function signalHandler() {
  * through `getOpenServerlessConfig` mechanism
  */
 export async function build() {
-    const deploy = await getOpenServerlessConfig('deploy', 'true');
+    let deploy = await getOpenServerlessConfig('deploy', 'true');
+    deploy = expandEnv(deploy);
 
     const deployArgs = parse(deploy).filter(arg => typeof arg === "string");
 
diff --git a/ide/deploy/deploy.js b/ide/deploy/deploy.js
index 50d629c..293ed50 100644
--- a/ide/deploy/deploy.js
+++ b/ide/deploy/deploy.js
@@ -16,6 +16,7 @@
 // under the License.
 
 import fs from 'fs/promises';
+import { expandEnv } from './env_utils';
 const { parse } = await import('shell-quote');
 
 const MAINS = ["__main__.py", "index.js", "index.php", "main.go"];
@@ -31,6 +32,7 @@ export function setDryRun(b) {
 
 async function exec(cmd) {
   console.log("$", cmd);
+  cmd = expandEnv(cmd);
   const cmdArgs = parse(cmd).filter(arg => typeof arg === "string");
   
   const proc = Bun.spawn(cmdArgs, {
diff --git a/ide/deploy/env_utils.js b/ide/deploy/env_utils.js
new file mode 100644
index 0000000..e793551
--- /dev/null
+++ b/ide/deploy/env_utils.js
@@ -0,0 +1,67 @@
+export function expandEnv(str, env = process.env) {
+  // Stato per sapere se siamo dentro apici singoli
+  let inSingleQuotes = false;
+  let result = "";
+  let i = 0;
+
+  while (i < str.length) {
+    const ch = str[i];
+
+    // Toggle apici singoli (niente espansione all'interno)
+    if (ch === "'") {
+      inSingleQuotes = !inSingleQuotes;
+      result += ch;
+      i++;
+      continue;
+    }
+
+    // Espansione variabile
+    if (ch === "$" && !inSingleQuotes) {
+      if (str[i + 1] === "{") {
+        // Forma ${...}
+        const end = str.indexOf("}", i + 2);
+        if (end === -1) {
+          result += ch; // niente chiusura, lasciamo così
+          i++;
+          continue;
+        }
+        const expr = str.slice(i + 2, end);
+        const match = expr.match(/^([A-Za-z_][A-Za-z0-9_]*)(?:(:-|:=)(.*))?$/);
+
+        if (match) {
+          const [, name, op, def] = match;
+          let val = env[name];
+          if ((op === ":-" && (!val || val === "")) || (op === ":=" && (!val 
|| val === ""))) {
+            val = def ?? "";
+            if (op === ":=") env[name] = val; // assegna
+          }
+          result += val ?? "";
+        } else {
+          result += "${" + expr + "}";
+        }
+        i = end + 1;
+      } else {
+        // Forma $VAR o variabili speciali
+        const varMatch = str.slice(i + 
1).match(/^([A-Za-z_][A-Za-z0-9_]*|[0-9@#?$*!-])/);
+        if (varMatch) {
+          const name = varMatch[1];
+          let val;
+          if (name === "$") val = process.pid;
+          else if (name === "?") val = "0"; // impossibile sapere senza 
contesto
+          else if (name === "#") val = "0";
+          else if (name === "!") val = "";
+          else val = env[name] ?? "";
+          result += val;
+          i += 1 + name.length;
+        } else {
+          result += ch;
+          i++;
+        }
+      }
+    } else {
+      result += ch;
+      i++;
+    }
+  }
+  return result;
+}