From f9687d9957fc313fed99623b43540b8438f7ab2b Mon Sep 17 00:00:00 2001
From: Viet Le <87754887+vietlvq2609@users.noreply.github.com>
Date: Wed, 12 Jun 2024 17:32:32 +0700
Subject: [PATCH] Add or update the Azure App Service build and deployment
 workflow config

---
 .github/workflows/master_bellchat.yml | 44 ++++++---------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/master_bellchat.yml b/.github/workflows/master_bellchat.yml
index eb72bfc..3a964e3 100644
--- a/.github/workflows/master_bellchat.yml
+++ b/.github/workflows/master_bellchat.yml
@@ -21,18 +21,6 @@ jobs:
         with:
           java-version: '17'
 
-      - name: Set environment variables
-        run: |
-          echo "AZURE_POSTGRESQL_CONNECTIONSTRING=${{ secrets.AZURE_POSTGRESQL_CONNECTIONSTRING }}" >> $GITHUB_ENV
-          echo "AZURE_POSTGRESQL_USERNAME=${{ secrets.AZURE_POSTGRESQL_USERNAME }}" >> $GITHUB_ENV
-          echo "AZURE_POSTGRESQL_PASSWORD=${{ secrets.AZURE_POSTGRESQL_PASSWORD }}" >> $GITHUB_ENV
-          echo "AZURE_BLOBSTORAGE_ACCOUNT_NAME=${{ secrets.AZURE_BLOBSTORAGE_ACCOUNT_NAME }}" >> $GITHUB_ENV
-          echo "AZURE_BLOBSTORAGE_ACCOUNT_KEY=${{ secrets.AZURE_BLOBSTORAGE_ACCOUNT_KEY }}" >> $GITHUB_ENV
-          echo "AZURE_BLOBSTORAGE_ENDPOINT=${{ secrets.AZURE_BLOBSTORAGE_ENDPOINT }}" >> $GITHUB_ENV
-          echo "AZURE_BLOBSTORAGE_CONTAINER_NAME=${{ secrets.AZURE_BLOBSTORAGE_CONTAINER_NAME }}" >> $GITHUB_ENV
-          echo "MAINSITE_JWT_SECRET=${{ secrets.MAINSITE_JWT_SECRET }}" >> $GITHUB_ENV
-          echo "MAINSITE_JWT_EXPIRATION=${{ secrets.MAINSITE_JWT_EXPIRATION }}" >> $GITHUB_ENV
-
       - name: Build with Maven
         run: mvn clean install
 
@@ -48,33 +36,21 @@ jobs:
     environment:
       name: 'Production'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-    permissions:
-      id-token: write #This is required for requesting the JWT
+    permissions:
+      id-token: write #This is required for requesting the JWT
   
     steps:
       - name: Download artifact from build job
         uses: actions/download-artifact@v3
         with:
           name: java-app
-      
-      - name: Login to Azure
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_163E3275757B4380A2BE03EA347C173B }}
-          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_ED487F559A414692AC227A29A31E754F }}
-          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_080005D4AF014E65804FD8EE33E96916 }}
-      
-      - name: Set environment variables for deployment
-        run: |
-          echo "AZURE_POSTGRESQL_CONNECTIONSTRING=${{ secrets.AZURE_POSTGRESQL_CONNECTIONSTRING }}" >> $GITHUB_ENV
-          echo "AZURE_POSTGRESQL_USERNAME=${{ secrets.AZURE_POSTGRESQL_USERNAME }}" >> $GITHUB_ENV
-          echo "AZURE_POSTGRESQL_PASSWORD=${{ secrets.AZURE_POSTGRESQL_PASSWORD }}" >> $GITHUB_ENV
-          echo "AZURE_BLOBSTORAGE_ACCOUNT_NAME=${{ secrets.AZURE_BLOBSTORAGE_ACCOUNT_NAME }}" >> $GITHUB_ENV
-          echo "AZURE_BLOBSTORAGE_ACCOUNT_KEY=${{ secrets.AZURE_BLOBSTORAGE_ACCOUNT_KEY }}" >> $GITHUB_ENV
-          echo "AZURE_BLOBSTORAGE_ENDPOINT=${{ secrets.AZURE_BLOBSTORAGE_ENDPOINT }}" >> $GITHUB_ENV
-          echo "AZURE_BLOBSTORAGE_CONTAINER_NAME=${{ secrets.AZURE_BLOBSTORAGE_CONTAINER_NAME }}" >> $GITHUB_ENV
-          echo "MAINSITE_JWT_SECRET=${{ secrets.MAINSITE_JWT_SECRET }}" >> $GITHUB_ENV
-          echo "MAINSITE_JWT_EXPIRATION=${{ secrets.MAINSITE_JWT_EXPIRATION }}" >> $GITHUB_ENV
+      
+      - name: Login to Azure
+        uses: azure/login@v1
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_026F34AB77244F56950CEFF987846FBE }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_570667AE4F54413E91C7C2D06CA032AF }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_D32C80138BF745BD84CF9A191DBD8537 }}
 
       - name: Deploy to Azure Web App
         id: deploy-to-webapp
@@ -83,4 +59,4 @@ jobs:
           app-name: 'bellchat'
           slot-name: 'Production'
           package: '*.jar'
-          
+          
\ No newline at end of file