fix-for-delete

justin808 · justin808 · commit 7d75738cc726 · 2025-01-25T22:24:03.000-10:00
diff --git a/.github/workflows/delete-review-app.yml b/.github/workflows/delete-review-app.yml
@@ -11,58 +11,51 @@ permissions:
   issues: write
 
 env:
-  CPLN_ORG: ${{ secrets.CPLN_ORG_STAGING }}
-  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
+  CPLN_ORG: ${{ secrets.CPLN_ORG }}
+  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN }}
+  APP_NAME: qa-react-webpack-rails-tutorial-pr-${{ github.event.issue.number }}
+  PR_NUMBER: ${{ github.event.issue.number }}
 
 jobs:
-  Process-Delete-Command:
-    if: |
-      github.event_name == 'issue_comment' && 
-      github.event.issue.pull_request && 
-      github.event.comment.body == '/delete-review-app'
+  debug-trigger:
+    if: always()
     runs-on: ubuntu-latest
-
     steps:
       - name: Debug Trigger Conditions
         env:
           EVENT_NAME: ${{ github.event_name }}
-          IS_PR: ${{ github.event.issue.pull_request != '' }}
+          IS_PR: ${{ toJSON(github.event.issue.pull_request) }}
           COMMENT: ${{ github.event.comment.body }}
-          PR_NUMBER: ${{ github.event.issue.number }}
         run: |
           echo "Debug information for delete-review-app command:"
           echo "Event name: $EVENT_NAME"
-          echo "Is PR: $IS_PR"
+          echo "Is PR (raw): $IS_PR"
           echo "Comment body: $COMMENT"
-          echo "PR number: $PR_NUMBER"
           echo "Raw event payload:"
           echo '${{ toJSON(github.event) }}'
 
-      - name: Get PR number
-        id: pr
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const prNumber = context.payload.issue.number;
-            core.setOutput('pr_number', prNumber);
-            core.exportVariable('PR_NUMBER', prNumber);
-
-      - name: Set App Name
-        run: echo "APP_NAME=qa-react-webpack-rails-tutorial-pr-${{ env.PR_NUMBER }}" >> $GITHUB_ENV
+  Process-Delete-Command:
+    needs: debug-trigger
+    if: |
+      github.event_name == 'issue_comment' && 
+      github.event.issue.pull_request && 
+      github.event.comment.body == '/delete-review-app'
+    runs-on: ubuntu-latest
 
+    steps:
       - uses: actions/checkout@v4
 
       - name: Validate Required Secrets
         run: |
           missing_secrets=()
-          for secret in "CPLN_TOKEN_STAGING" "CPLN_ORG_STAGING"; do
+          for secret in "CPLN_TOKEN" "CPLN_ORG"; do
             if [ -z "${!secret}" ]; then
               missing_secrets+=("$secret")
             fi
           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
 
@@ -78,7 +71,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 };
 
@@ -101,11 +94,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',
                   '',
-                  '[View in Control Plane Console](' + cpConsoleUrl + ')'
+                  '[Control Plane Console for Review App with PR #' + prNumber + '](' + cpConsoleUrl + ')'
                 ].join('\n');
             
             await github.rest.issues.updateComment({
diff --git a/.github/workflows/deploy-to-control-plane.yml b/.github/workflows/deploy-to-control-plane.yml
@@ -15,8 +15,8 @@ concurrency:
 
 env:
   APP_NAME: qa-react-webpack-rails-tutorial-pr-${{ github.event.pull_request.number || github.event.issue.number }}
-  CPLN_ORG: ${{ secrets.CPLN_ORG_STAGING }}
-  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
+  CPLN_ORG: ${{ secrets.CPLN_ORG }}
+  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN }}
   PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
 
 jobs:
@@ -53,7 +53,7 @@ jobs:
       - name: Validate Required Secrets
         run: |
           missing_secrets=()
-          for secret in "CPLN_TOKEN_STAGING" "CPLN_ORG_STAGING"; do
+          for secret in "CPLN_TOKEN" "CPLN_ORG"; do
             if [ -z "${!secret}" ]; then
               missing_secrets+=("$secret")
             fi
@@ -249,4 +249,155 @@ jobs:
               repo: context.repo.repo,
               comment_id: process.env.COMMENT_ID,
               body: isSuccess ? successMessage : failureMessage
+            });
+
+  debug-help:
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Debug Trigger Conditions
+        env:
+          EVENT_NAME: ${{ github.event_name }}
+          IS_PR: ${{ toJSON(github.event.issue.pull_request) }}
+          COMMENT: ${{ github.event.comment.body }}
+        run: |
+          echo "Debug information for help command:"
+          echo "Event name: $EVENT_NAME"
+          echo "Is PR (raw): $IS_PR"
+          echo "Comment body: $COMMENT"
+          echo "Raw event payload:"
+          echo '${{ toJSON(github.event) }}'
+
+  show-help:
+    needs: debug-help
+    if: |
+      github.event_name == 'issue_comment' && 
+      github.event.issue.pull_request && 
+      github.event.comment.body == '/help'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Show Available Commands
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const helpMessage = [
+              '## 📚 Available Commands',
+              '',
+              '### `/deploy`',
+              'Deploys your PR branch to a review environment on Control Plane.',
+              '- Creates a new review app if one doesn\'t exist',
+              '- Updates the existing review app if it already exists',
+              '- Provides a unique URL to preview your changes',
+              '- Shows build and deployment progress in real-time',
+              '',
+              '### `/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`',
+              '',
+              '### `/help`',
+              'Shows this help message explaining available commands.',
+              '',
+              '---',
+              '_Note: These commands only work in pull request comments._'
+            ].join('\n');
+            
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.issue.number,
+              body: helpMessage
+            });
+
+  debug-delete:
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Debug Trigger Conditions
+        env:
+          EVENT_NAME: ${{ github.event_name }}
+          IS_PR: ${{ toJSON(github.event.issue.pull_request) }}
+          COMMENT: ${{ github.event.comment.body }}
+        run: |
+          echo "Debug information for delete-review-app command:"
+          echo "Event name: $EVENT_NAME"
+          echo "Is PR (raw): $IS_PR"
+          echo "Comment body: $COMMENT"
+          echo "Raw event payload:"
+          echo '${{ toJSON(github.event) }}'
+
+  Process-Delete-Command:
+    needs: debug-delete
+    if: |
+      github.event_name == 'issue_comment' && 
+      github.event.issue.pull_request && 
+      github.event.comment.body == '/delete-review-app'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Validate Required Secrets
+        run: |
+          missing_secrets=()
+          for secret in "CPLN_TOKEN" "CPLN_ORG"; do
+            if [ -z "${!secret}" ]; then
+              missing_secrets+=("$secret")
+            fi
+          done
+          
+          if [ ${#missing_secrets[@]} -ne 0 ]; then
+            echo "❌ Required secrets are not set: ${missing_secrets[*]}"
+            exit 1
+          fi
+
+      - name: Setup Environment
+        uses: ./.github/actions/setup-environment
+
+      - name: Create Initial Delete Comment
+        id: init-delete
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const comment = await github.rest.issues.createComment({
+              issue_number: process.env.PR_NUMBER,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '🗑️ Starting app deletion...'
+            });
+            return { commentId: comment.data.id };
+
+      - name: Delete Review App
+        uses: ./.github/actions/delete-control-plane-app
+        with:
+          app_name: ${{ env.APP_NAME }}
+          org: ${{ env.CPLN_ORG }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          CPLN_TOKEN: ${{ secrets.CPLN_TOKEN }}
+
+      - name: Update Delete Status
+        if: always()
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const success = '${{ job.status }}' === 'success';
+            const prNumber = process.env.PR_NUMBER;
+            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 + ' failed to be deleted',
+                  '',
+                  '🎮 [Control Plane Console for Review App with PR #' + prNumber + '](' + cpConsoleUrl + ')'
+                ].join('\n');
+            
+            await github.rest.issues.updateComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: ${{ fromJSON(steps.init-delete.outputs.result).commentId }},
+              body: message
             });
diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml
@@ -9,33 +9,38 @@ permissions:
   pull-requests: write
 
 jobs:
-  show-help:
-    if: |
-      github.event_name == 'issue_comment' && 
-      github.event.issue.pull_request && 
-      github.event.comment.body == '/help'
+  debug-trigger:
+    if: always()
     runs-on: ubuntu-latest
-
     steps:
       - name: Debug Trigger Conditions
         env:
           EVENT_NAME: ${{ github.event_name }}
-          IS_PR: ${{ github.event.issue.pull_request != '' }}
+          IS_PR: ${{ toJSON(github.event.issue.pull_request) }}
           COMMENT: ${{ github.event.comment.body }}
         run: |
           echo "Debug information for help command:"
           echo "Event name: $EVENT_NAME"
-          echo "Is PR: $IS_PR"
+          echo "Is PR (raw): $IS_PR"
           echo "Comment body: $COMMENT"
           echo "Raw event payload:"
           echo '${{ toJSON(github.event) }}'
 
+  show-help:
+    needs: debug-trigger
+    if: |
+      github.event_name == 'issue_comment' && 
+      github.event.issue.pull_request && 
+      github.event.comment.body == '/help'
+    runs-on: ubuntu-latest
+
+    steps:
       - name: Show Available Commands
         uses: actions/github-script@v7
         with:
           script: |
             const helpMessage = [
-              '## 📚 Available Commands',
+              '## Available Commands',
               '',
               '### `/deploy`',
               'Deploys your PR branch to a review environment on Control Plane.',
