fixes

Author: justin808

.github/actions/deploy-to-control-plane/action.yml

@@ -41,20 +41,22 @@ runs:
       id: deploy
       shell: bash
       run: |
-        echo "🚀 Deploying app for PR #$PR_NUMBER..."
+        echo "🚀 Deploying app for PR #${PR_NUMBER}..."
         
         # Deploy the application and capture the Rails URL
-        if ! DEPLOY_OUTPUT=$(cpflow deploy-image -a ${{ inputs.app_name }} --run-release-phase --org ${{ inputs.org }}); then
-          echo "❌ Deployment failed for PR #$PR_NUMBER"
+        if ! DEPLOY_OUTPUT=$(cpflow deploy-image -a "${{ inputs.app_name }}" --run-release-phase --org "${{ inputs.org }}" 2>&1); then
+          echo "❌ Deployment failed for PR #${PR_NUMBER}"
+          echo "Error output:"
+          echo "${DEPLOY_OUTPUT}"
           exit 1
         fi
         
         # Extract Rails URL from deployment output
-        RAILS_URL=$(echo "$DEPLOY_OUTPUT" | grep -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' | head -n1)
-        if [ -z "$RAILS_URL" ]; then
+        RAILS_URL=$(echo "${DEPLOY_OUTPUT}" | grep -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' | head -n1)
+        if [ -z "${RAILS_URL}" ]; then
           echo "❌ Failed to get Rails URL from deployment output"
           echo "Deployment output:"
-          echo "$DEPLOY_OUTPUT"
+          echo "${DEPLOY_OUTPUT}"
           exit 1
         fi
         
@@ -63,18 +65,18 @@ runs:
         echo "⏳ Waiting for all workloads to be ready (timeout: ${WAIT_TIMEOUT}s)..."
         
         # Use timeout command with ps:wait
-        if ! timeout $WAIT_TIMEOUT bash -c "cpflow ps:wait -a ${{ inputs.app_name }}"; then
+        if ! timeout "${WAIT_TIMEOUT}" bash -c "cpflow ps:wait -a \"${{ inputs.app_name }}\"" 2>&1; then
           TIMEOUT_EXIT=$?
-          if [ $TIMEOUT_EXIT -eq 124 ]; then
+          if [ ${TIMEOUT_EXIT} -eq 124 ]; then
             echo "❌ Timed out waiting for workloads after ${WAIT_TIMEOUT} seconds"
           else
-            echo "❌ Workloads did not become ready for PR #$PR_NUMBER (exit code: $TIMEOUT_EXIT)"
+            echo "❌ Workloads did not become ready for PR #${PR_NUMBER} (exit code: ${TIMEOUT_EXIT})"
           fi
           echo "Last deployment output:"
-          echo "$DEPLOY_OUTPUT"
+          echo "${DEPLOY_OUTPUT}"
           exit 1
         fi
         
-        echo "✅ Deployment successful for PR #$PR_NUMBER"
-        echo "🌐 Rails URL: $RAILS_URL"
-        echo "rails_url=$RAILS_URL" >> $GITHUB_OUTPUT
+        echo "✅ Deployment successful for PR #${PR_NUMBER}"
+        echo "🌐 Rails URL: ${RAILS_URL}"
+        echo "rails_url=${RAILS_URL}" >> $GITHUB_OUTPUT

.github/workflows/deploy-to-control-plane.yml

@@ -116,46 +116,51 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            function getWorkflowUrl(runId) {
-              return `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}/job/${context.job.id}`;
+            async function getWorkflowUrl(runId) {
+              // Get the current job ID
+              const jobs = await github.rest.actions.listJobsForWorkflowRun({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: runId
+              });
+              
+              const currentJob = jobs.data.jobs.find(job => job.status === 'in_progress');
+              const jobId = currentJob?.id;
+              
+              if (!jobId) {
+                console.log('Warning: Could not find current job ID');
+                return `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
+              }
+              
+              return `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}/job/${jobId}`;
             }
             
             const prNumber = process.env.PR_NUMBER;
-            const getJobUrl = (runId, jobId, prNumber) =>
-              `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}/job/${jobId}?pr=${prNumber}`;
             
-            // Create deployment
-            const deployment = await github.rest.repos.createDeployment({
+            // Create initial deployment comment
+            const comment = await github.rest.issues.createComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              ref: context.sha,
-              environment: 'review-' + prNumber,
-              auto_merge: false,
-              required_contexts: []
+              issue_number: prNumber,
+              body: '⏳ Initializing deployment...'
             });
             
-            // Get job URL
-            const jobs = await github.rest.actions.listJobsForWorkflowRun({
+            // Create GitHub deployment
+            const deployment = await github.rest.repos.createDeployment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              run_id: context.runId
+              ref: context.sha,
+              environment: 'review',
+              auto_merge: false,
+              required_contexts: []
             });
             
-            const jobId = jobs.data.jobs.find(job => job.name === 'Process-Deployment-Command')?.id;
-            const jobUrl = getJobUrl(context.runId, jobId, prNumber);
-            
-            // Create initial comment
-            const comment = await github.rest.issues.createComment({
-              issue_number: prNumber,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '🚀 Deploying to Control Plane...\n\n[View Deployment Progress](' + jobUrl + ')'
-            });
+            const workflowUrl = await getWorkflowUrl(context.runId);
             
             return {
               deploymentId: deployment.data.id,
               commentId: comment.data.id,
-              workflowUrl: getWorkflowUrl(context.runId)
+              workflowUrl
             };
 
       - name: Set commit hash