From ad13cd5d6ad30bce4d79c0f625c6738ac94f3e28 Mon Sep 17 00:00:00 2001
From: Ogu1208 <kdasunb6@gmail.com>
Date: Sun, 1 Sep 2024 22:17:07 +0900
Subject: [PATCH] =?UTF-8?q?chore:=20application.yml=EC=97=90=20Jasypt=20?=
 =?UTF-8?q?=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20=EA=B2=BD=EB=A1=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dev-aws-CI-CD.yml | 12 +++---------
 src/main/resources/application.yml  |  1 +
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/dev-aws-CI-CD.yml b/.github/workflows/dev-aws-CI-CD.yml
index 11df81b..901a670 100644
--- a/.github/workflows/dev-aws-CI-CD.yml
+++ b/.github/workflows/dev-aws-CI-CD.yml
@@ -113,30 +113,24 @@ jobs:
     name: Discord Notify
     runs-on: ubuntu-latest
     needs: [ build, deploy ]  # build와 deploy 작업이 끝난 후 실행
+    if: always()  # 항상 실행되도록 설정
     env:
-      jasypt.encryptor.password: ${{ secrets.JASYPT_ENCRYPTOR_PASSWORD }}  # 이름 변경
+      jasypt.encryptor.password: ${{ secrets.JASYPT_ENCRYPTOR_PASSWORD }}
     steps:
       - name: Send Discord Notification
         uses: sarisia/actions-status-discord@v1
-        if: always()  # 항상 실행되도록 설정
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK_URL }}
           status: ${{ job.status }}  # 현재 작업(job)의 상태 (성공, 실패 등)
           title: "CI/CD Pipeline Status"
           description: |
-            ${{ github.event_name == 'push' && format(
+            ${{ format(
               'The CI/CD pipeline has completed.\n- **Build Job Status**: {0}\n- **Deploy Job Status**: {1}\n- **Branch**: {2}\n- **Commit**: {3}\n- **Author**: {4}',
               needs.build.result,
               needs.deploy.result,
               github.ref,
               github.sha,
               github.actor
-            ) || github.event_name == 'pull_request' && format(
-              'The Build job for pull request has completed.\n- **Build Job Status**: {0}\n- **Branch**: {1}\n- **Commit**: {2}\n- **Author**: {3}',
-              needs.build.result,
-              github.ref,
-              github.sha,
-              github.actor
             ) }}
           url: "https://github.com/sarisia/actions-status-discord"
           username: GitHub Actions Bot
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f2d775e..83e6364 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,7 @@
 jasypt:
   encryptor:
     bean: jasyptStringEncryptor
+    password: ${ JASYPT_ENCRYPTOR_PASSWORD}
 
 spring:
   profiles: