fix: adding service key as Input in argo action ci cd (#2797)

* fix: adding service key as Input * feat: removed check if migration needed
ballerine-io · Oct 24, 2024 · 4dec194 · 4dec194
1 parent 177b19f
commit 4dec194
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 60 deletions.
diff --git a/.github/actions/argocd-action/action.yml b/.github/actions/argocd-action/action.yml
@@ -10,13 +10,16 @@ inputs:
   argocd_server:
     description: "ArgoCD Server"
     required: true
+  tg_svc_key:
+    description: "Twingate Key"
+    required: true
 runs:
   using: composite
   steps:
     - name: Setup Twingate
       uses: twingate/github-action@v1
       with:
-        service-key: ${{ secrets.TWINGATE_SERVICE_KEY_SECRET_NAME }}
+        service-key: ${{ inputs.tg_svc_key }}
 
     - name: Obtain ArgoCD JWT Token
       id: get_token

diff --git a/.github/workflows/db-ops.yaml b/.github/workflows/db-ops.yaml
@@ -13,38 +13,8 @@ env:
 
 
 jobs:
-  check_if_data_migration_needed:
-    runs-on: ubuntu-latest
-    outputs:
-      should_build: ${{ steps.check-branch-existance.outputs.should_build }} # short sha of the commit
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-          submodules: 'recursive'
-          token: ${{ secrets.SUBMODULES_TOKEN }}
-
-      - name: Check if branch exists
-        id: check-branch-existance
-        run: |
-          cd services/workflows-service/prisma/data-migrations
-
-
-          is_exists=$(git ls-remote --exit-code --heads -t --ref -q origin "${{ env.MIGRATION_REF }}" | wc -l)
-
-          # Check if the branch exists by counting the number of results
-          if [ $is_exists -eq 0  ]; then
-            echo "Branch '${{ env.MIGRATION_REF }}' does not exist."
-            echo "should_build=false" >> $GITHUB_OUTPUT
-          else
-            echo "should_build=true" >> $GITHUB_OUTPUT
-          fi
-          exit 0
   build-and-push-ee-image:
     runs-on: ubuntu-latest
-    needs: [check_if_data_migration_needed]
-    if: ${{ needs.check_if_data_migration_needed.outputs.should_build == 'true' }}
     permissions:
       contents: read
       packages: write
@@ -187,6 +157,7 @@ jobs:
           argocd_username: ${{ secrets.ARGOCD_USERNAME }}
           argocd_password: ${{ secrets.ARGOCD_PASSWORD }}
           argocd_server: ${{ secrets.ARGOCD_SERVER }}
+          tg_svc_key: ${{ secrets.TWINGATE_SERVICE_KEY_SECRET_NAME }}
 
   send-to-slack:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/deploy-wf-service.yml b/.github/workflows/deploy-wf-service.yml
@@ -40,33 +40,6 @@ jobs:
           echo "SHORT_HASH is ${{ env.SHORT_HASH }}"
           echo "SHORT_HASH is ${{ env.SHORT_HASH }}"
           echo "SHORT_HASH is $SHORT_HASH"
-  check_if_data_migration_needed:
-    runs-on: ubuntu-latest
-    outputs:
-      should_build: ${{ steps.check-branch-existance.outputs.should_build }} # short sha of the commit
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-          submodules: 'recursive'
-          token: ${{ secrets.SUBMODULES_TOKEN }}
-
-      - name: Check if branch exists
-        id: check-branch-existance
-        run: |
-          cd services/workflows-service/prisma/data-migrations
-
-          is_exists=$(git ls-remote --exit-code --heads -t --ref -q origin "${{ inputs.environment }}" | wc -l)
-
-          # Check if the branch exists by counting the number of results
-          if [ $is_exists -eq 0  ]; then
-            echo "Branch '${{ inputs.environment }}' does not exist."
-            echo "should_build=false" >> $GITHUB_OUTPUT
-          else
-            echo "should_build=true" >> $GITHUB_OUTPUT
-          fi
-          exit 0
 
   tag-and-push-image:
     runs-on: ubuntu-latest
@@ -146,8 +119,7 @@ jobs:
 
   build-and-push-ee-image:
     runs-on: ubuntu-latest
-    needs: [check_if_data_migration_needed,tag-and-push-image]
-    if: always() && ${{(needs.check_if_data_migration_needed.outputs.should_build == 'true')}}
+    needs: [tag-and-push-image]
     outputs:
       SUBMODULE_SHORT_HASH: ${{ steps.lastcommit.outputs.shorthash }}
     permissions: