From e7ef336dd1d0376dad1a29902a9da19b77be2ff7 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 30 Mar 2024 20:18:48 -0400
Subject: [PATCH] safer part of obfuscated_public upload using separate set of
 secrets

---
 .github/workflows/build-firmware.yaml            | 2 +-
 .github/workflows/custom-board-build/action.yaml | 2 +-
 firmware/bin/upload_bundle.sh                    | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index 7fecaa5b9a..1b5719ae94 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -264,7 +264,7 @@ jobs:
       working-directory: ./artifacts
       run: |
         source ../firmware/config/boards/common_script_read_meta_env.inc ../firmware/${{ env.BOARD_META_PATH }}
-        bash ../firmware/bin/upload_bundle.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }}
+        bash ../firmware/bin/upload_bundle.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }} ${BUNDLE_NAME}
 
     - name: Add Bundles to Release
       if: ${{ env.full == 'true' && env.upload == 'release' }}
diff --git a/.github/workflows/custom-board-build/action.yaml b/.github/workflows/custom-board-build/action.yaml
index e0b7b52d39..acdb3929c0 100644
--- a/.github/workflows/custom-board-build/action.yaml
+++ b/.github/workflows/custom-board-build/action.yaml
@@ -207,7 +207,7 @@ runs:
       if: ${{ contains(inputs.uploads, 'bundles') }}
       working-directory: ${{inputs.rusefi_dir}}/artifacts
       shell: bash
-      run: bash ../firmware/bin/upload_bundle.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }}
+      run: bash ../firmware/bin/upload_bundle.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }} ${{ env.BUNDLE_NAME }}
 
     - name: Run Simulator
       if: ${{ inputs.run_simulator == 'true' }}
diff --git a/firmware/bin/upload_bundle.sh b/firmware/bin/upload_bundle.sh
index 120689711c..bdde3bdd4e 100755
--- a/firmware/bin/upload_bundle.sh
+++ b/firmware/bin/upload_bundle.sh
@@ -3,6 +3,13 @@
 USER=$1
 PASS=$2
 HOST=$3
+BUNDLE_FILE_NAME=$4
+
+if [ -n "${BUNDLE_FILE_NAME}" ]; then
+  echo "BUNDLE_FILE_NAME is ${BUNDLE_FILE_NAME}"
+else
+  echo "BUNDLE_FILE_NAME argument not specified"
+fi
 
 SCRIPT_NAME=$(basename "$0")
 # technical debt: more than one file uses magic 'rusefi_bundle_' constant, can we extract constant?