fixes

Author: justin808

.github/actions/deploy-to-control-plane/scripts/deploy.sh

@@ -11,7 +11,16 @@
 
 set -e
 
+# Validate required environment variables
+: "${APP_NAME:?APP_NAME environment variable is required}"
+: "${CPLN_ORG:?CPLN_ORG environment variable is required}"
+: "${GITHUB_SHA:?GITHUB_SHA environment variable is required}"
+
+# Set deployment timeout (15 minutes)
+TIMEOUT=900
+
 TEMP_OUTPUT=$(mktemp)
+trap 'rm -f "$TEMP_OUTPUT"' EXIT
 
 # Build the Docker image
 echo "🏗️ Building Docker image..."
@@ -22,21 +31,21 @@ fi
 
 # Deploy the application
 echo "🚀 Deploying to Control Plane..."
-if cpflow deploy-image -a "$APP_NAME" --run-release-phase --org "$CPLN_ORG" --verbose | tee "$TEMP_OUTPUT"; then
+if timeout "$TIMEOUT" cpflow deploy-image -a "$APP_NAME" --run-release-phase --org "$CPLN_ORG" --verbose | tee "$TEMP_OUTPUT"; then
     # Extract Rails URL from deployment output
-    RAILS_URL=$(grep -o 'https://rails-[^[:space:]]*\.cpln\.app' "$TEMP_OUTPUT")
+    RAILS_URL=$(grep -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' "$TEMP_OUTPUT" | head -n1)
     if [ -n "$RAILS_URL" ]; then
-        echo "rails_url=$RAILS_URL" >> $GITHUB_OUTPUT
+        echo "rails_url=$RAILS_URL" >> "$GITHUB_OUTPUT"
         echo "✅ Deployment successful"
         echo "🚀 Rails URL: $RAILS_URL"
     else
         echo "❌ Failed to extract Rails URL from deployment output"
         exit 1
     fi
+elif [ $? -eq 124 ]; then
+    echo "❌ Deployment timed out after $TIMEOUT seconds"
+    exit 1
 else
     echo "❌ Deployment to Control Plane failed"
     exit 1
 fi
-
-# Clean up temporary file
-rm -f "$TEMP_OUTPUT"

.github/actions/deploy-to-control-plane/scripts/get-commit-sha.sh

@@ -15,14 +15,20 @@ set -e
 
 if [ -n "$PR_NUMBER" ]; then
     # If PR_NUMBER is set, get the PR's head SHA
-    PR_SHA=$(gh pr view $PR_NUMBER --json headRefOid --jq '.headRefOid')
-    echo "sha=$PR_SHA" >> $GITHUB_OUTPUT
-    echo "sha_short=${PR_SHA:0:7}" >> $GITHUB_OUTPUT
+    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_short=${PR_SHA:0:7}" >> "$GITHUB_OUTPUT"
     echo "Using PR head commit SHA: ${PR_SHA:0:7}"
 else
     # For direct branch deployments, use the current commit SHA
-    CURRENT_SHA=$(git rev-parse HEAD)
-    echo "sha=$CURRENT_SHA" >> $GITHUB_OUTPUT
-    echo "sha_short=${CURRENT_SHA:0:7}" >> $GITHUB_OUTPUT
+    if ! CURRENT_SHA=$(git rev-parse HEAD); then
+        echo "Failed to get current SHA" >&2
+        exit 1
+    fi
+    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

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

@@ -1,6 +1,6 @@
 name: Deploy to Control Plane
 
-run-name: ${{ github.event_name == 'pull_request' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) ? 'Deploying Review App' : format('Deploying {0} to Staging App', github.ref_name) }}
+run-name: "${{ github.event_name == 'pull_request' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) ? 'Deploying Review App' : format('Deploying {0} to Staging App', github.ref_name) }}"
 
 on:
   pull_request:
@@ -114,8 +114,18 @@ jobs:
 
       - name: Setup cpflow app
         run: |
+          set -e
+          
+          # Validate required environment variables
+          : "${APP_NAME:?APP_NAME environment variable is required}"
+          
           if ! cpflow exists -a ${{ env.APP_NAME }} ; then
-            cpflow setup-app -a ${{ env.APP_NAME }}
+            echo "🔧 Setting up new application: ${{ env.APP_NAME }}"
+            if ! cpflow setup-app -a ${{ env.APP_NAME }}; then
+              echo "❌ Failed to setup application"
+              exit 1
+            fi
+            echo "✅ Application setup complete"
           fi
 
       - name: Deploy to Control Plane
@@ -135,9 +145,10 @@ jobs:
         with:
           script: |
             const isSuccess = '${{ job.status }}' === 'success';
-            const deploymentId = ${{ fromJSON(steps.init-deployment.outputs.result).deploymentId }};
-            const commentId = ${{ fromJSON(steps.init-deployment.outputs.result).commentId }};
-            const workflowUrl = ${{ fromJSON(steps.init-deployment.outputs.result).workflowUrl }};
+            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;
             
@@ -154,7 +165,12 @@ jobs:
               deploymentStatus.environment_url = railsUrl;
             }
             
-            await github.rest.repos.createDeploymentStatus(deploymentStatus);
+            try {
+              await github.rest.repos.createDeploymentStatus(deploymentStatus);
+            } catch (error) {
+              console.error('Failed to update deployment status:', error);
+              throw error;
+            }
             
             // Update the initial comment
             const successMessage = [
@@ -173,9 +189,14 @@ jobs:
               '[View Workflow Status](' + workflowUrl + ')'
             ].join('\n');
             
-            await github.rest.issues.updateComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: commentId,
-              body: isSuccess ? successMessage : failureMessage
-            });
+            try {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: commentId,
+                body: isSuccess ? successMessage : failureMessage
+              });
+            } catch (error) {
+              console.error('Failed to update comment:', error);
+              throw error;
+            }