Merge pull request #58 from YAPP-Github/feat/38-fix

38 fix: workflow Discord Webhook 미전송 문제 해결

Author: pp8817

.github/workflows/terraform-apply-sandbox.yml

@@ -80,16 +80,16 @@ jobs:
             -reconfigure
 
       - name: Terraform Apply
+        id: tfapply
         continue-on-error: true
         run: |
-          set -o pipefail
           terraform apply \
             -auto-approve \
             -var-file="sandbox.tfvars"
 
       # ✅ Apply 성공
       - name: Send Discord Notification (Apply Success)
-        if: always() && job.status == 'success'
+        if: steps.tfapply.outcome == 'success'
         env:
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
         run: |
@@ -103,7 +103,7 @@ jobs:
 
       # ❌ Apply 실패
       - name: Send Discord Notification (Apply Failure)
-        if: always() && job.status == 'failure'
+        if: steps.tfapply.outcome == 'failure'
         env:
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
         run: |
@@ -119,5 +119,5 @@ jobs:
         if: always()
         run: |
           echo "### Result" >> $GITHUB_STEP_SUMMARY
-          echo "- Status: ${{ job.status }}" >> $GITHUB_STEP_SUMMARY
+          echo "- Status: ${{ steps.tfapply.outcome }}" >> $GITHUB_STEP_SUMMARY
           echo "- Apply Commit: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/terraform-plan-sandbox.yml

@@ -75,19 +75,20 @@ jobs:
             -reconfigure
 
       - name: Terraform Plan
+        id: tfplan
         continue-on-error: true
         run: |
           terraform plan \
             -var-file="sandbox.tfvars" \
             -out=tfplan
 
       - name: Convert Plan to JSON
-        if: always()
+        if: steps.tfplan.outcome == 'success'
         run: |
           terraform show -json tfplan > plan.json
 
       - name: Extract Plan Summary
-        if: always()
+        if: steps.tfplan.outcome == 'success'
         run: |
           PLAN_ADD=$(jq '[.resource_changes[] | select(.change.actions | index("create"))] | length' plan.json)
           PLAN_CHANGE=$(jq '[.resource_changes[] | select(.change.actions | index("update"))] | length' plan.json)
@@ -105,7 +106,7 @@ jobs:
 
           echo "- Branch: sandbox" >> $GITHUB_STEP_SUMMARY
           echo "- Commit: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Status: ${{ job.status }}" >> $GITHUB_STEP_SUMMARY
+          echo "- Status: ${{ steps.tfplan.outcome }}" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
 
           echo "### Change Summary" >> $GITHUB_STEP_SUMMARY
@@ -114,36 +115,43 @@ jobs:
           echo "- ❌ Destroy: ${PLAN_DESTROY:-0}" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
 
-          echo "<details><summary>📄 Full Terraform Plan</summary>" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo '```terraform' >> $GITHUB_STEP_SUMMARY
-          terraform show tfplan | sed -n '1,300p' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "</details>" >> $GITHUB_STEP_SUMMARY
+          if [ -f tfplan ]; then
+            echo "<details><summary>📄 Full Terraform Plan</summary>" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo '```terraform' >> $GITHUB_STEP_SUMMARY
+            terraform show tfplan | sed -n '1,300p' >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo "</details>" >> $GITHUB_STEP_SUMMARY
+          fi
+
 
       # ✅ Plan 성공 알림
       - name: Send Discord Notification (Plan Success)
-        if: always() && job.status == 'success'
+        if: steps.tfplan.outcome == 'success'
         env:
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
         run: |
           if [ -n "$DISCORD_WEBHOOK_URL" ]; then
+            THREAD_NAME="[sandbox] Terraform Plan 성공"
             APPLY_URL="${{ github.server_url }}/${{ github.repository }}/actions/workflows/terraform-apply-sandbox.yml"
-            MESSAGE="**Terraform Plan (sandbox) 완료**\n\n- Branch: sandbox\n- Commit: ${{ github.sha }}\n\n👉 Apply 실행\n${APPLY_URL}"
+            RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+            MESSAGE="**Terraform Plan (sandbox) 완료**\n\n- Branch: sandbox\n- Commit: ${{ github.sha }}\n\n📄 Workflow\n${RUN_URL}\n\n👉 Apply 실행\n${APPLY_URL}"
             curl -X POST "$DISCORD_WEBHOOK_URL" \
               -H "Content-Type: application/json" \
-              -d "{\"content\": \"$MESSAGE\"}"
+              -d "{\"content\": \"$MESSAGE\", \"thread_name\": \"$THREAD_NAME\"}"
           fi
 
       # ❌ Plan 실패 알림
       - name: Send Discord Notification (Plan Failure)
-        if: always() && job.status == 'failure'
+        if: steps.tfplan.outcome == 'failure'
         env:
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
         run: |
           if [ -n "$DISCORD_WEBHOOK_URL" ]; then
-            MESSAGE="❌ **Terraform Plan (sandbox) 실패**\n\n- Commit: ${{ github.sha }}"
+            THREAD_NAME="❌ [sandbox] Terraform Plan 실패"
+            RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+            MESSAGE="❌ **Terraform Plan (sandbox) 실패**\n\n- Branch: sandbox\n- Commit: ${{ github.sha }}\n\n📄 Workflow\n${RUN_URL}"
             curl -X POST "$DISCORD_WEBHOOK_URL" \
               -H "Content-Type: application/json" \
-              -d "{\"content\": \"$MESSAGE\"}"
+              -d "{\"content\": \"$MESSAGE\", \"thread_name\": \"$THREAD_NAME\"}"
           fi