fixes

justin808 · justin808 · commit e0cf883316cb · 2025-01-25T18:23:56.000-10:00
diff --git a/.github/actions/build-docker-image/action.yml b/.github/actions/build-docker-image/action.yml
@@ -22,11 +22,11 @@ runs:
       id: build
       shell: bash
       run: |
-        echo "🏗️ Building Docker image for PR #$PR_NUMBER (commit ${{ inputs.commit }})..."
+        echo "🏗️ Building Docker image for PR #${PR_NUMBER} (commit ${{ inputs.commit }})..."
         
-        if cpflow build-image -a ${{ inputs.app_name }} --commit=${{ inputs.commit }} --org=${{ inputs.org }}; then
-          echo "✅ Docker image build successful for PR #$PR_NUMBER (commit ${{ inputs.commit }})"
+        if cpflow build-image -a "${{ inputs.app_name }}" --commit="${{ inputs.commit }}" --org="${{ inputs.org }}"; then
+          echo "✅ Docker image build successful for PR #${PR_NUMBER} (commit ${{ inputs.commit }})"
         else
-          echo "❌ Docker image build failed for PR #$PR_NUMBER (commit ${{ inputs.commit }})"
+          echo "❌ Docker image build failed for PR #${PR_NUMBER} (commit ${{ inputs.commit }})"
           exit 1
         fi
diff --git a/.github/actions/deploy-to-control-plane/action.yml b/.github/actions/deploy-to-control-plane/action.yml
@@ -19,9 +19,9 @@ inputs:
     default: 600
 
 outputs:
-  rails_url:
-    description: 'URL of the deployed Rails application'
-    value: ${{ steps.deploy.outputs.rails_url }}
+  review_app_url:
+    description: 'URL of the deployed application'
+    value: ${{ steps.deploy.outputs.review_app_url }}
 
 runs:
   using: "composite"
@@ -43,40 +43,45 @@ runs:
       run: |
         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 }}" 2>&1); then
+        # Create temp file for output
+        TEMP_OUTPUT=$(mktemp)
+        trap 'rm -f "${TEMP_OUTPUT}"' EXIT
+        
+        # Deploy the application and show output in real-time while capturing it
+        if ! cpflow deploy-image -a "${{ inputs.app_name }}" --run-release-phase --org "${{ inputs.org }}" 2>&1 | tee "${TEMP_OUTPUT}"; then
           echo "❌ Deployment failed for PR #${PR_NUMBER}"
           echo "Error output:"
-          echo "${DEPLOY_OUTPUT}"
+          cat "${TEMP_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
-          echo "❌ Failed to get Rails URL from deployment output"
+        # Extract app URL from captured output
+        REVIEW_APP_URL=$(grep -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' "${TEMP_OUTPUT}" | head -n1)
+        if [ -z "${REVIEW_APP_URL}" ]; then
+          echo "❌ Failed to get app URL from deployment output"
           echo "Deployment output:"
-          echo "${DEPLOY_OUTPUT}"
+          cat "${TEMP_OUTPUT}"
           exit 1
         fi
         
         # Wait for all workloads to be ready
         WAIT_TIMEOUT=${WAIT_TIMEOUT:-${{ inputs.wait_timeout }}}
         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 }}\"" 2>&1; then
+        # Use timeout command with ps:wait and show output in real-time
+        if ! timeout "${WAIT_TIMEOUT}" bash -c "cpflow ps:wait -a \"${{ inputs.app_name }}\"" 2>&1 | tee -a "${TEMP_OUTPUT}"; then
           TIMEOUT_EXIT=$?
           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})"
           fi
-          echo "Last deployment output:"
-          echo "${DEPLOY_OUTPUT}"
+          echo "Full output:"
+          cat "${TEMP_OUTPUT}"
           exit 1
         fi
         
         echo "✅ Deployment successful for PR #${PR_NUMBER}"
-        echo "🌐 Rails URL: ${RAILS_URL}"
-        echo "rails_url=${RAILS_URL}" >> $GITHUB_OUTPUT
+        echo "🌐 App URL: ${REVIEW_APP_URL}"
+        echo "review_app_url=${REVIEW_APP_URL}" >> $GITHUB_OUTPUT
+        echo "REVIEW_APP_URL=${REVIEW_APP_URL}" >> $GITHUB_ENV
diff --git a/.github/actions/deploy-to-control-plane/scripts/get-commit-sha.sh b/.github/actions/deploy-to-control-plane/scripts/get-commit-sha.sh
@@ -13,13 +13,13 @@
 
 set -e
 
-if [ -n "$PR_NUMBER" ]; then
+if [ -n "${PR_NUMBER}" ]; then
     # If PR_NUMBER is set, get the PR's head SHA
-    if ! PR_SHA=$(gh pr view $PR_NUMBER --json headRefOid --jq '.headRefOid'); then
+    if ! PR_SHA=$(gh pr view "${PR_NUMBER}" --json headRefOid --jq '.headRefOid'); then
         echo "Failed to get PR head SHA" >&2
         exit 1
     fi
-    echo "sha=$PR_SHA" >> "$GITHUB_OUTPUT"
+    echo "sha=${PR_SHA}" >> "$GITHUB_OUTPUT"
     echo "sha_short=${PR_SHA:0:7}" >> "$GITHUB_OUTPUT"
     echo "Using PR head commit SHA: ${PR_SHA:0:7}"
 else
@@ -28,7 +28,7 @@ else
         echo "Failed to get current SHA" >&2
         exit 1
     fi
-    echo "sha=$CURRENT_SHA" >> "$GITHUB_OUTPUT"
+    echo "sha=${CURRENT_SHA}" >> "$GITHUB_OUTPUT"
     echo "sha_short=${CURRENT_SHA:0:7}" >> "$GITHUB_OUTPUT"
     echo "Using branch commit SHA: ${CURRENT_SHA:0:7}"
 fi
diff --git a/.github/workflows/deploy-to-control-plane.yml b/.github/workflows/deploy-to-control-plane.yml
@@ -231,43 +231,51 @@ jobs:
           org: ${{ env.CPLN_ORG }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Update Status - Success
+        if: steps.determine_action.outputs.action == 'deploy' && success()
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const comment = await github.rest.issues.updateComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: steps.init-deployment.outputs.commentId,
+              body: `🚀 Review App for PR #${process.env.PR_NUMBER}: [\`${process.env.REVIEW_APP_URL}\`](${process.env.REVIEW_APP_URL})`
+            });
+
       - name: Update Status - Deployment Complete
         if: steps.determine_action.outputs.action == 'deploy'
         uses: actions/github-script@v7
         with:
           script: |
+            const prNumber = process.env.PR_NUMBER;
+            const appUrl = process.env.REVIEW_APP_URL;
+            const workflowUrl = steps.init-deployment.outputs.workflowUrl;
             const isSuccess = '${{ job.status }}' === 'success';
             const result = ${{ steps.init-deployment.outputs.result }};
             const deploymentId = result.deploymentId;
             const commentId = result.commentId;
-            const workflowUrl = result.workflowUrl;
-            const railsUrl = '${{ steps.deploy.outputs.rails_url }}';
-            const prNumber = process.env.PR_NUMBER;
             
             // Update deployment status
             const deploymentStatus = {
               owner: context.repo.owner,
               repo: context.repo.repo,
               deployment_id: deploymentId,
               state: isSuccess ? 'success' : 'failure',
-              description: isSuccess ? '✅ Deployment successful' : '❌ Deployment failed'
+              environment_url: isSuccess ? appUrl : undefined,
+              log_url: workflowUrl,
+              environment: 'review'
             };
             
-            if (isSuccess) {
-              deploymentStatus.environment_url = railsUrl;
-            }
-            
             await github.rest.repos.createDeploymentStatus(deploymentStatus);
             
-            // Update the initial comment
+            // Define messages based on deployment status
             const successMessage = [
-              '✅ Deployment successful for PR #' + prNumber + ', commit ' + '${{ env.COMMIT_HASH }}',
-              '',
-              '🚀 Rails App: [' + railsUrl + '](' + railsUrl + ')',
+              '✅ Deployment complete for PR #' + prNumber + ', commit ' + '${{ env.COMMIT_HASH }}',
               '',
-              '⚡ [Control Plane Console](https://console.cpln.io/console/org/' + process.env.CPLN_ORG + '/gvc/' + process.env.APP_NAME + '/workload)',
+              '🚀 Review App for PR #' + prNumber + ': [`' + appUrl + '`](' + appUrl + ')',
               '',
-              '[View Completed Action Build and Deploy Logs](' + workflowUrl + ')'
+              '📋 [View Completed Action Build and Deploy Logs](' + workflowUrl + ')'
             ].join('\n');
             
             const failureMessage = [
@@ -276,6 +284,7 @@ jobs:
               '[View Workflow Status](' + workflowUrl + ')'
             ].join('\n');
             
+            // Update the comment with appropriate message
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
