fix: Improve BUILD_SHA detection and add debug logging

Author: trillium

.github/workflows/aws-backend-deploy.yml

@@ -30,15 +30,16 @@ jobs:
           ref: ${{ github.event.inputs.ref }}
       - name: Set AWS Env & Image Tag per workflow
         run: |
-          SHORT_SHA=$(git rev-parse --short HEAD)
           if [[ "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]]; then
               INPUT_ENV=${{ github.event.inputs.env }}; INPUT_REF=${{ github.event.inputs.ref }}
               echo AWS_APPENV="$AWS_APP_NAME"-$INPUT_ENV >> $GITHUB_ENV
-              echo IMAGE_TAG=$SHORT_SHA >> $GITHUB_ENV
+              echo IMAGE_TAG=$(git rev-parse --short HEAD) >> $GITHUB_ENV
+              echo BUILD_SHA=$(git rev-parse --short HEAD) >> $GITHUB_ENV
           fi
     outputs:
       AWS_APPENV: ${{ env.AWS_APPENV }}
       IMAGE_TAG: ${{ env.IMAGE_TAG }}
+      BUILD_SHA: ${{ env.BUILD_SHA }}
   build:
     name: Build & Push Docker Image
     runs-on: ubuntu-latest
@@ -59,18 +60,30 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+      - name: Debug Build Variables
+        env:
+          BUILD_SHA: ${{ needs.setup_env.outputs.BUILD_SHA }}
+          IMAGE_TAG: ${{ needs.setup_env.outputs.IMAGE_TAG }}
+        run: |
+          echo "=== Build Debug Information ==="
+          echo "BUILD_SHA: $BUILD_SHA"
+          echo "IMAGE_TAG: $IMAGE_TAG"
+          echo "DOCKERFILE: ${{ env.DOCKERFILE }}"
+          echo "DOCKER_PATH: ${{ env.DOCKER_PATH }}"
+          echo "================================"
       - name: Build & Push Image to ECR
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           ECR_REPOSITORY: ${{ needs.setup_env.outputs.AWS_APPENV }}
           IMAGE_TAG: ${{ needs.setup_env.outputs.IMAGE_TAG }}
+          BUILD_SHA: ${{ needs.setup_env.outputs.BUILD_SHA }}
         run: |
           docker buildx build \
             --platform linux/amd64 \
             --cache-from type=gha \
             --cache-to type=gha,mode=max \
             --push \
-            --build-arg BUILD_SHA=$IMAGE_TAG \
+            --build-arg BUILD_SHA=$BUILD_SHA \
             -f ${{ env.DOCKERFILE }} \
             -t $ECR_REGISTRY/$ECR_REPOSITORY:latest \
             -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG \

backend/Dockerfile.prod

@@ -7,10 +7,12 @@ RUN yarn install --pure-lockfile
 COPY . .
 
 FROM node:18.12.0-slim AS api-production
+ARG BUILD_SHA
 EXPOSE 4000
-USER node
 WORKDIR /srv/backend
 COPY --from=api-builder /srv/backend/node_modules ./node_modules
 COPY . .
 ENV BUILD_SHA=${BUILD_SHA}
+RUN echo "${BUILD_SHA:-unknown}" > BUILD_INFO
+USER node
 CMD ["npm", "run", "start"]

backend/controllers/healthCheck.controller.js

@@ -1,17 +1,41 @@
 const { execSync } = require('child_process');
+const fs = require('fs');
 
 const HealthCheckController = {};
 
 function getBuildInfo() {
+  // Method 1: BUILD_SHA environment variable (from Docker build arg) - PRIORITY
+  if (
+    process.env.BUILD_SHA &&
+    process.env.BUILD_SHA !== 'undefined' &&
+    process.env.BUILD_SHA !== ''
+  ) {
+    return process.env.BUILD_SHA;
+  }
+
+  // Method 2: Check BUILD_INFO file (created during Docker build)
   try {
-    // Try to get git info from the container
-    const gitSha = execSync('git rev-parse --short HEAD 2>/dev/null || echo "unknown"', {
-      encoding: 'utf8',
-    }).trim();
-    return gitSha;
+    if (fs.existsSync('/srv/backend/BUILD_INFO')) {
+      const buildInfo = fs.readFileSync('/srv/backend/BUILD_INFO', 'utf8').trim();
+      if (buildInfo && buildInfo !== 'unknown' && buildInfo !== '') {
+        return buildInfo;
+      }
+    }
   } catch {
-    return process.env.BUILD_SHA || 'unknown';
+    // BUILD_INFO file not available
   }
+
+  // Method 3: Try git command (for local development)
+  try {
+    const gitSha = execSync('git rev-parse --short HEAD 2>/dev/null', { encoding: 'utf8' }).trim();
+    if (gitSha && gitSha !== '' && gitSha !== 'unknown') {
+      return gitSha;
+    }
+  } catch {
+    // Git not available
+  }
+
+  return 'unknown';
 }
 
 HealthCheckController.isAlive = (_, res) => {