From f72451e0822312234b44a295e18a628193d1d782 Mon Sep 17 00:00:00 2001
From: Shreyansh Sahare <shreyansh.sahare@fylehq.com>
Date: Tue, 19 Mar 2024 12:34:38 +0530
Subject: [PATCH] Using github vars for workflow directory (#195)

---
 .github/workflows/production_deployment.yml | 14 +++++++-------
 .github/workflows/staging_deployment.yml    | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/production_deployment.yml b/.github/workflows/production_deployment.yml
index 6eae5e79..9db7bd1d 100644
--- a/.github/workflows/production_deployment.yml
+++ b/.github/workflows/production_deployment.yml
@@ -14,7 +14,7 @@ jobs:
         uses: fylein/docker-release-action@master
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
           IMAGE_NAME: fyle_integration_settings-api
 
       - name: Install kustomize
@@ -25,9 +25,9 @@ jobs:
       - name: Clone another repository
         uses: actions/checkout@v2
         with:
-          repository: ${{ secrets.PROD_DEPLOY_REPO }}
+          repository: ${{ vars.PROD_DEPLOY_REPO }}
           ref: master
-          path: ${{ secrets.PROD_DEPLOY_REPO }}
+          path: ${{ vars.PROD_DEPLOY_REPO }}
           persist-credentials: false
           token: ${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}
 
@@ -35,21 +35,21 @@ jobs:
         run: |
           NEW_TAG="v$(git rev-parse --short HEAD)"
 
-          cd ${{ secrets.PROD_DEPLOY_REPO }}/${{ secrets.US_EKS_CLUSTER_NAME }}/integrations
+          cd ${{ vars.PROD_DEPLOY_REPO }}/${{ vars.PROD_US1_DEPLOY_DIR }}/integrations
           kustomize edit set image docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_integration_settings-api=docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_integration_settings-api:$NEW_TAG
 
-          cd ../../${{ secrets.IN_EKS_CLUSTER_NAME }}/integrations
+          cd ../../${{ vars.PROD_IN1_DEPLOY_DIR }}/integrations
           kustomize edit set image docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_integration_settings-api=docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_integration_settings-api:$NEW_TAG
 
 
       - name: Commit and push changes
         run: |
-          cd ${{ secrets.PROD_DEPLOY_REPO }}/
+          cd ${{ vars.PROD_DEPLOY_REPO }}/
           git config --global user.email "integrations@fylehq.com"
           git config --global user.name "GitHub Actions"
           git add .
           git commit -m "Update image tag"
-          git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ secrets.PROD_DEPLOY_REPO }}
+          git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ vars.PROD_DEPLOY_REPO }}
           git pull origin master
           git push origin master
 
diff --git a/.github/workflows/staging_deployment.yml b/.github/workflows/staging_deployment.yml
index ac9ed2e9..a952b91a 100644
--- a/.github/workflows/staging_deployment.yml
+++ b/.github/workflows/staging_deployment.yml
@@ -18,7 +18,7 @@ jobs:
         uses: fylein/docker-release-action@master
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
           IMAGE_NAME: fyle_integration_settings-api
 
       - name: Install kustomize
@@ -29,26 +29,26 @@ jobs:
       - name: Clone another repository
         uses: actions/checkout@v2
         with:
-          repository: ${{ secrets.STAGING_DEPLOY_REPO }}
+          repository: ${{ vars.STAGING_DEPLOY_REPO }}
           ref: master
-          path: ${{ secrets.STAGING_DEPLOY_REPO }}
+          path: ${{ vars.STAGING_DEPLOY_REPO }}
           persist-credentials: false
           token: ${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}
 
       - name: Update Image Tag
         run: |
           NEW_TAG="v$(git rev-parse --short HEAD)"
-          cd ${{ secrets.STAGING_DEPLOY_REPO }}/${{ secrets.EKS_CLUSTER_NAME }}/integrations
+          cd ${{ vars.STAGING_DEPLOY_REPO }}/${{ vars.STAGING_DEPLOY_DIR }}/integrations
           kustomize edit set image docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_integration_settings-api=docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_integration_settings-api:$NEW_TAG
 
       - name: Commit and push changes
         run: |
-          cd ${{ secrets.STAGING_DEPLOY_REPO }}/
+          cd ${{ vars.STAGING_DEPLOY_REPO }}/
           git config --global user.email "integrations@fylehq.com"
           git config --global user.name "GitHub Actions"
           git add .
           git commit -m "Update image tag"
-          git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ secrets.STAGING_DEPLOY_REPO }}
+          git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ vars.STAGING_DEPLOY_REPO }}
           git pull origin master
           git push origin master