From 9de315bd7b22dea7f2c690c5ffa6eb1bc07842a6 Mon Sep 17 00:00:00 2001
From: xZero707 <aleksandar@puharic.com>
Date: Mon, 2 Jun 2025 00:53:20 +0200
Subject: [PATCH] Pass --projectId if INFISICAL_PROJECT_ID env is present

---
 dist/scripts/src/fetch-secrets.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dist/scripts/src/fetch-secrets.sh b/dist/scripts/src/fetch-secrets.sh
index 1ec0a9c..4dc593b 100755
--- a/dist/scripts/src/fetch-secrets.sh
+++ b/dist/scripts/src/fetch-secrets.sh
@@ -16,12 +16,19 @@ fetch_secret() {
     local target_secret="${1:?Target secret local_secret is required}"
     local env="${2:?Environment is required}"
     local output_file="${3:?}"
+    declare -a args
+
+    if [[ -n "${INFISICAL_PROJECT_ID:-}" ]]; then
+        args+=("--projectId" "${INFISICAL_PROJECT_ID}")
+    fi
+
+    args+=("secrets" "--plain" "get" "${target_secret}" "--env" "${env}")
 
     if command -v infisical-dcli &>/dev/null; then
         # If infisical CLI command is available, use it directly
-        infisical-dcli secrets --plain get "${target_secret}" --env "${env}" >"${output_file}"
+        infisical-dcli "${args[@]}" >"${output_file}"
     else
-        if ! dc_infisical secrets --plain get "${target_secret}" --env "${env}" >"${output_file}"; then
+        if ! dc_infisical "${args[@]}" >"${output_file}"; then
             rm -f "${output_file}" # Clean up if fetch failed
             return 1
         fi