From 3ca2983c685cecfbe2a6c1ec5a45b7271770d2ac Mon Sep 17 00:00:00 2001
From: Frank John Begornia <frank.begornia@yahoo.com>
Date: Tue, 16 Dec 2025 15:14:48 +0800
Subject: [PATCH] Refactor secrets debug step in deployment workflow for
 clarity and efficiency

---
 .gitea/workflows/deploy-dev.yml | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml
index af86e53..1ddbf7c 100644
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -28,33 +28,20 @@ jobs:
           docker build -t merchbay_admin:dev .
           docker save merchbay_admin:dev | gzip > merchbay_admin_dev.tar.gz
 
-      # 🔍 SAFE SECRET DEBUG (TEMPORARY – REMOVE LATER)
+      # 🔍 TEMP DEBUG (remove after verification)
       - name: Debug secrets (safe)
         shell: sh
         run: |
           echo "== Secrets presence check =="
-
-          if [ -z "${DEPLOY_SSH_KEY}" ]; then
-            echo "❌ DEPLOY_SSH_KEY is EMPTY or NOT SET"
-            exit 1
-          else
-            echo "✅ DEPLOY_SSH_KEY is SET"
-            echo "Length: ${#DEPLOY_SSH_KEY}"
-            echo "${DEPLOY_SSH_KEY}" | head -n 1
-            echo "${DEPLOY_SSH_KEY}" | tail -n 1
-          fi
-
+          [ -z "${DEPLOY_SSH_KEY}" ] && echo "❌ DEPLOY_SSH_KEY EMPTY" && exit 1
           [ -z "${DEPLOY_USER}" ] && echo "❌ DEPLOY_USER EMPTY" && exit 1
           [ -z "${DEPLOY_HOST}" ] && echo "❌ DEPLOY_HOST EMPTY" && exit 1
-
-          echo "DEPLOY_USER=${DEPLOY_USER}"
-          echo "DEPLOY_HOST=${DEPLOY_HOST}"
+          echo "✅ Secrets OK"
         env:
           DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
           DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
           DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
 
-      # 🔐 REQUIRED STEP (THIS WAS MISSING)
       - name: Setup SSH
         shell: sh
         run: |
@@ -65,14 +52,10 @@ jobs:
           chmod 600 ~/.ssh/id_ed25519
 
           ssh-keyscan -H ${DEPLOY_HOST} >> ~/.ssh/known_hosts
-
-          echo "SSH files:"
-          ls -l ~/.ssh
         env:
           DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
           DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
 
-      # 🧪 OPTIONAL BUT HIGHLY RECOMMENDED (run once)
       - name: SSH sanity check
         shell: sh
         run: |
@@ -84,6 +67,9 @@ jobs:
       # 🚀 DEPLOY
       - name: Deploy to Server
         shell: sh
+        env:
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
         run: |
           cd /workspace/repo
 
@@ -96,13 +82,13 @@ jobs:
 
             DEPLOY_DIR="/home/deploy/apps/merchbay_admin_dev"
 
-            mkdir -p $DEPLOY_DIR
+            mkdir -p "$DEPLOY_DIR"
             cd /tmp
 
             docker load < merchbay_admin_dev.tar.gz
-            cp docker-compose.yml $DEPLOY_DIR/
+            cp docker-compose.yml "$DEPLOY_DIR/"
 
-            cd $DEPLOY_DIR
+            cd "$DEPLOY_DIR"
 
             docker compose down || true
             docker image prune -f