From 6783065be577c4b19770ee3011bb8e877c838663 Mon Sep 17 00:00:00 2001
From: Henit Chobisa <chobisa.henit@gmail.com>
Date: Fri, 23 Aug 2024 14:48:50 +0530
Subject: [PATCH] fix: prime workflow fix for private key generation

---
 .github/workflows/build-branch-ee.yml | 31 +++++++++++++++------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-branch-ee.yml b/.github/workflows/build-branch-ee.yml
index 8849f4abba..859d6cbe26 100644
--- a/.github/workflows/build-branch-ee.yml
+++ b/.github/workflows/build-branch-ee.yml
@@ -108,18 +108,6 @@ jobs:
             monitor:
               - monitor/**
 
-      - name: Generate Keypair
-        run: |
-          if [ "${{ github.event_name }}" == "release" ]; then 
-            ssh-keygen -t ed25519 -m PEM -f monitor/prime.key -N ""
-            echo "-----------------"
-            echo ""
-            cat monitor/prime.key.pub
-            echo ""
-            echo "-----------------"
-          else
-            echo "${{ secrets.DEFAULT_PRIME_PRIVATE_KEY }}"  > monitor/prime.key
-          fi
 
   branch_build_push_admin:
     if: ${{ needs.branch_build_setup.outputs.build_admin== 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
@@ -498,6 +486,21 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v4
 
+      - name: Generate Keypair
+        run: |
+          if [ "${{ github.event_name }}" == "release" ]; then 
+            openssl genrsa -out monitor/private_key.pem 2048            
+            openssl rsa -in monitor/private_key.pem -pubout -out monitor/public_key.pem
+
+            cat monitor/public_key.pem
+
+            prv_key=$(cat monitor/private_key.pem)
+            echo "PRIVATE_KEY=$prv_key" >> $GITHUB_ENV
+          else
+            echo ${{ vars.DEFAULT_PRIME_PUBLIC_KEY }}
+            echo "PRIVATE_KEY=${{ secrets.DEFAULT_PRIME_PRIVATE_KEY }}" >> $GITHUB_ENV
+          fi
+
       - name: Build and Push Monitor to Docker Container Registry
         uses: docker/build-push-action@v5.1.0
         with:
@@ -506,7 +509,8 @@ jobs:
           platforms: ${{ env.BUILDX_PLATFORMS }}
           tags: ${{ env.MONITOR_TAG }}
           push: true
-          build-args: PRIVATE_KEY=${{ secrets.DEFAULT_PRIME_PRIVATE_KEY }}
+          build-args:
+            - PRIVATE_KEY=${{ env.PRIVATE_KEY }}
         env:
           DOCKER_BUILDKIT: 1
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -546,4 +550,3 @@ jobs:
 
           aws s3 cp ~/${{ env.ARTIFACT_SUFFIX }} s3://${{ vars.SELF_HOST_BUCKET_NAME }}/plane-enterprise/${{ env.ARTIFACT_SUFFIX }} --recursive
 
-          rm -rf ~/${{ env.ARTIFACT_SUFFIX }}