fix-for-delete

justin808 · justin808 · commit d5b8b7f2c4f4 · 2025-01-25T22:36:11.000-10:00
diff --git a/.github/actions/deploy-to-control-plane/action.yml b/.github/actions/deploy-to-control-plane/action.yml
@@ -16,7 +16,7 @@ inputs:
   wait_timeout:
     description: 'Timeout in seconds for waiting for workloads to be ready'
     required: false
-    default: 600
+    default: '900'
 
 outputs:
   review_app_url:
@@ -66,7 +66,11 @@ runs:
         
         # 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)..."
+        if ! [[ "${WAIT_TIMEOUT}" =~ ^[0-9]+$ ]]; then
+          echo "❌ Invalid timeout value: ${WAIT_TIMEOUT}"
+          exit 1
+        fi
+        echo "⏳ Waiting for all workloads to be ready (timeout: ${WAIT_TIMEOUT}s)"
         
         # 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
diff --git a/.github/actions/deploy-to-control-plane/scripts/deploy.sh b/.github/actions/deploy-to-control-plane/scripts/deploy.sh
@@ -6,6 +6,10 @@
 # - APP_NAME: Name of the application to deploy
 # - CPLN_ORG: Control Plane organization
 #
+# Optional environment variables:
+# - WAIT_TIMEOUT: Timeout in seconds for deployment (default: 900)
+#                 Must be a positive integer
+#
 # Outputs:
 # - rails_url: URL of the deployed Rails application
 
@@ -15,15 +19,19 @@ set -e
 : "${APP_NAME:?APP_NAME environment variable is required}"
 : "${CPLN_ORG:?CPLN_ORG environment variable is required}"
 
-# Set deployment timeout (15 minutes)
-TIMEOUT=900
+# Set and validate deployment timeout
+WAIT_TIMEOUT=${WAIT_TIMEOUT:-900}
+if ! [[ "${WAIT_TIMEOUT}" =~ ^[0-9]+$ ]]; then
+  echo "❌ Invalid timeout value: ${WAIT_TIMEOUT}"
+  exit 1
+fi
 
 TEMP_OUTPUT=$(mktemp)
 trap 'rm -f "$TEMP_OUTPUT"' EXIT
 
 # Deploy the application
-echo "🚀 Deploying to Control Plane..."
-if timeout "$TIMEOUT" cpflow deploy-image -a "$APP_NAME" --run-release-phase --org "$CPLN_ORG" --verbose | tee "$TEMP_OUTPUT"; then
+echo "🚀 Deploying to Control Plane (timeout: ${WAIT_TIMEOUT}s)"
+if timeout "$WAIT_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 -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' "$TEMP_OUTPUT" | head -n1)
     if [ -n "$RAILS_URL" ]; then
@@ -35,7 +43,7 @@ if timeout "$TIMEOUT" cpflow deploy-image -a "$APP_NAME" --run-release-phase --o
         exit 1
     fi
 elif [ $? -eq 124 ]; then
-    echo "❌ Deployment timed out after $TIMEOUT seconds"
+    echo "❌ Deployment timed out after $WAIT_TIMEOUT seconds"
     exit 1
 else
     echo "❌ Deployment to Control Plane failed"
diff --git a/.github/workflows/deploy-to-control-plane.yml b/.github/workflows/deploy-to-control-plane.yml
@@ -60,7 +60,7 @@ jobs:
           done
           
           if [ ${#missing_secrets[@]} -ne 0 ]; then
-            echo "❌ Required secrets are not set: ${missing_secrets[*]}"
+            echo "Required secrets are not set: ${missing_secrets[*]}"
             exit 1
           fi
 
@@ -74,7 +74,7 @@ jobs:
           script: |
             core.exportVariable('GET_CONSOLE_LINK', `
               function getConsoleLink(prNumber) {
-                return '🎮 [Control Plane Console for Review App with PR #' + prNumber + '](' + 
+                return ' [Control Plane Console for Review App with PR #' + prNumber + '](' + 
                        'https://console.cpln.io/org/' + process.env.CPLN_ORG + '/workloads/' + process.env.APP_NAME + ')';
               }
             `);
@@ -110,7 +110,7 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: process.env.PR_NUMBER,
-              body: '⏳ Initializing deployment...'
+              body: ' Initializing deployment...'
             });
             
             // Create GitHub deployment
@@ -148,9 +148,9 @@ jobs:
             eval(process.env.GET_CONSOLE_LINK);
 
             const buildingMessage = [
-              '🏗️ Building Docker image for PR #' + process.env.PR_NUMBER + ', commit ' + '${{ env.COMMIT_HASH }}',
+              ' Building Docker image for PR #' + process.env.PR_NUMBER + ', commit ' + '${{ env.COMMIT_HASH }}',
               '',
-              '📋 [View Build Logs](' + process.env.WORKFLOW_URL + ')',
+              ' [View Build Logs](' + process.env.WORKFLOW_URL + ')',
               '',
               getConsoleLink(process.env.PR_NUMBER)
             ].join('\n');
@@ -177,11 +177,11 @@ jobs:
             eval(process.env.GET_CONSOLE_LINK);
 
             const deployingMessage = [
-              '🚀 Deploying to Control Plane...',
+              ' Deploying to Control Plane...',
               '',
-              '⏳ Waiting for deployment to be ready...',
+              ' Waiting for deployment to be ready...',
               '',
-              '📋 [View Deploy Logs](' + process.env.WORKFLOW_URL + ')',
+              ' [View Deploy Logs](' + process.env.WORKFLOW_URL + ')',
               '',
               getConsoleLink(process.env.PR_NUMBER)
             ].join('\n');
@@ -199,6 +199,7 @@ jobs:
           app_name: ${{ env.APP_NAME }}
           org: ${{ env.CPLN_ORG }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
+          wait_timeout: ${{ vars.WAIT_TIMEOUT || 900 }}
 
       - name: Update Status - Deployment Complete
         uses: actions/github-script@v7
@@ -226,19 +227,19 @@ jobs:
             
             // Define messages based on deployment status
             const successMessage = [
-              '✅ Deployment complete for PR #' + prNumber + ', commit ' + '${{ env.COMMIT_HASH }}',
+              ' Deployment complete for PR #' + prNumber + ', commit ' + '${{ env.COMMIT_HASH }}',
               '',
-              '🚀 [Review App for PR #' + prNumber + '](' + appUrl + ')',
+              ' [Review App for PR #' + prNumber + '](' + appUrl + ')',
               '',
-              '📋 [View Completed Action Build and Deploy Logs](' + workflowUrl + ')',
+              ' [View Completed Action Build and Deploy Logs](' + workflowUrl + ')',
               '',
               getConsoleLink(prNumber)
             ].join('\n');
             
             const failureMessage = [
-              '❌ Deployment failed for PR #' + prNumber + ', commit ' + '${{ env.COMMIT_HASH }}',
+              ' Deployment failed for PR #' + prNumber + ', commit ' + '${{ env.COMMIT_HASH }}',
               '',
-              '📋 [View Deployment Logs with Errors](' + workflowUrl + ')',
+              ' [View Deployment Logs with Errors](' + workflowUrl + ')',
               '',
               getConsoleLink(prNumber)
             ].join('\n');
@@ -282,7 +283,7 @@ jobs:
         with:
           script: |
             const helpMessage = [
-              '## 📚 Available Commands',
+              '##  Available Commands',
               '',
               '### `/deploy`',
               'Deploys your PR branch to a review environment on Control Plane.',
@@ -349,7 +350,7 @@ jobs:
           done
           
           if [ ${#missing_secrets[@]} -ne 0 ]; then
-            echo "❌ Required secrets are not set: ${missing_secrets[*]}"
+            echo "Required secrets are not set: ${missing_secrets[*]}"
             exit 1
           fi
 
@@ -365,7 +366,7 @@ jobs:
               issue_number: process.env.PR_NUMBER,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: '🗑️ Starting app deletion...'
+              body: ' Starting app deletion...'
             });
             return { commentId: comment.data.id };
 
@@ -388,11 +389,11 @@ jobs:
             const cpConsoleUrl = `https://console.cpln.io/org/${process.env.CPLN_ORG}/workloads/${process.env.APP_NAME}`;
             
             const message = success
-              ? '✅ Review app for PR #' + prNumber + ' was successfully deleted'
+              ? ' Review app for PR #' + prNumber + ' was successfully deleted'
               : [
-                  '❌ Review app for PR #' + prNumber + ' failed to be deleted',
+                  ' Review app for PR #' + prNumber + ' failed to be deleted',
                   '',
-                  '🎮 [Control Plane Console for Review App with PR #' + prNumber + '](' + cpConsoleUrl + ')'
+                  ' [Control Plane Console for Review App with PR #' + prNumber + '](' + cpConsoleUrl + ')'
                 ].join('\n');
             
             await github.rest.issues.updateComment({
diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           script: |
             const helpMessage = [
-              '## Available Commands',
+              '## 📚 Available Commands',
               '',
               '### `/deploy`',
               'Deploys your PR branch to a review environment on Control Plane.',
@@ -49,17 +49,37 @@ jobs:
               '- Provides a unique URL to preview your changes',
               '- Shows build and deployment progress in real-time',
               '',
+              '**Required Environment Variables:**',
+              '- `CPLN_TOKEN`: Control Plane authentication token',
+              '- `CPLN_ORG`: Control Plane organization name',
+              '',
+              '**Optional Configuration:**',
+              '- `WAIT_TIMEOUT`: Deployment timeout in seconds (default: 900)',
+              '  - Must be a positive integer',
+              '  - Can be set in GitHub Actions variables',
+              '  - Applies to both deployment and workload readiness checks',
+              '',
               '### `/delete-review-app`',
               'Deletes the review app associated with this PR.',
               '- Removes all resources from Control Plane',
               '- Helpful for cleaning up when you\'re done testing',
               '- Can be re-deployed later using `/deploy`',
               '',
+              '**Required Environment Variables:**',
+              '- `CPLN_TOKEN`: Control Plane authentication token',
+              '- `CPLN_ORG`: Control Plane organization name',
+              '',
               '### `/help`',
-              'Shows this help message explaining available commands.',
+              'Shows this help message explaining available commands and configuration.',
               '',
               '---',
-              '_Note: These commands only work in pull request comments._'
+              '**Note:** These commands only work in pull request comments.',
+              '',
+              '**Environment Setup:**',
+              '1. Set required secrets in your repository settings:',
+              '   - `CPLN_TOKEN`',
+              '   - `CPLN_ORG`',
+              '2. Optional: Configure `WAIT_TIMEOUT` in GitHub Actions variables to customize deployment timeout'
             ].join('\n');
             
             await github.rest.issues.createComment({
