fix-for-delete

justin808 · justin808 · commit 3426aca0422f · 2025-01-25T21:59:13.000-10:00
diff --git a/.github/workflows/delete-review-app.yml b/.github/workflows/delete-review-app.yml
@@ -0,0 +1,85 @@
+name: Delete Review App
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: read
+  deployments: write
+  pull-requests: write
+  issues: write
+
+env:
+  CPLN_ORG: ${{ secrets.CPLN_ORG_STAGING }}
+  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
+
+jobs:
+  Process-Delete-Command:
+    if: |
+      github.event_name == 'issue_comment' && 
+      github.event.issue.pull_request && 
+      github.event.comment.body == '/delete-review-app'
+    runs-on: ubuntu-latest
+
+    steps:
+      - 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
+
+      - uses: actions/checkout@v4
+
+      - 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
+        env:
+          APP_NAME: ${{ env.APP_NAME }}
+          CPLN_ORG: ${{ secrets.CPLN_ORG }}
+          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',
+                  '',
+                  '[View in Control Plane Console](' + 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/deploy-to-control-plane.yml b/.github/workflows/deploy-to-control-plane.yml
@@ -22,11 +22,10 @@ env:
 jobs:
   Process-Deployment-Command:
     if: |
-      github.event_name == 'pull_request' || 
+      (github.event_name == 'pull_request') ||
       (github.event_name == 'issue_comment' && 
-       (github.event.comment.body == '/deploy-review-app' || 
-        github.event.comment.body == '/delete-review-app') && 
-       github.event.issue.pull_request)
+       github.event.issue.pull_request && 
+       github.event.comment.body == '/deploy')
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -46,72 +45,15 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Determine Action
-        id: determine_action
-        run: |
-          if [[ "${{ github.event.comment.body }}" == "/delete-review-app" ]]; then
-            echo "action=delete" >> $GITHUB_OUTPUT
-          else
-            echo "action=deploy" >> $GITHUB_OUTPUT
-          fi
-
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          # For PR events: use the head SHA
-          # For PR comments: use the PR head SHA
-          # For other events: use the push SHA
-          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || steps.getRef.outputs.PR_SHA || github.sha }}
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || steps.getRef.outputs.PR_REF || github.ref }}
 
       - name: Setup Environment
         uses: ./.github/actions/setup-environment
 
-      # Delete App Steps
-      - name: Create Initial Delete Comment
-        if: steps.determine_action.outputs.action == 'delete'
-        uses: actions/github-script@v7
-        id: init-delete
-        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 App
-        if: steps.determine_action.outputs.action == 'delete'
-        id: delete
-        run: |
-          echo "🗑️ Deleting review app: $APP_NAME"
-          ${{ github.workspace }}/.github/actions/deploy-to-control-plane/scripts/delete-app.sh
-
-      - name: Update Delete Status
-        if: steps.determine_action.outputs.action == 'delete'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const success = '${{ steps.delete.outcome }}' === 'success';
-            const message = success
-              ? [
-                  '✅ Review app successfully deleted',
-                  '',
-                  '⚡ [Control Plane Console](https://console.cpln.io/console/org/' + process.env.CPLN_ORG + '/gvc/' + process.env.APP_NAME + '/workload)'
-                ].join('\n')
-              : '❌ Review app deletion failed';
-            
-            await github.rest.issues.updateComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: ${{ fromJSON(steps.init-delete.outputs.result).commentId }},
-              body: message
-            });
-
-      # Deploy Steps
       - name: Initialize Deployment
-        if: steps.determine_action.outputs.action == 'deploy'
         id: init-deployment
         uses: actions/github-script@v7
         with:
@@ -162,19 +104,16 @@ jobs:
             };
 
       - name: Set comment ID and workflow URL
-        if: steps.determine_action.outputs.action == 'deploy'
         run: |
           echo "COMMENT_ID=${{ fromJSON(steps.init-deployment.outputs.result).commentId }}" >> $GITHUB_ENV
           echo "WORKFLOW_URL=${{ fromJSON(steps.init-deployment.outputs.result).workflowUrl }}" >> $GITHUB_ENV
 
       - name: Set commit hash
-        if: steps.determine_action.outputs.action == 'deploy'
         run: |
           FULL_COMMIT="${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || steps.getRef.outputs.PR_SHA || github.sha }}"
           echo "COMMIT_HASH=${FULL_COMMIT:0:7}" >> $GITHUB_ENV
 
       - name: Update Status - Building
-        if: steps.determine_action.outputs.action == 'deploy'
         uses: actions/github-script@v7
         with:
           script: |
@@ -192,7 +131,6 @@ jobs:
             });
 
       - name: Build Docker Image
-        if: steps.determine_action.outputs.action == 'deploy'
         uses: ./.github/actions/build-docker-image
         with:
           app_name: ${{ env.APP_NAME }}
@@ -201,7 +139,6 @@ jobs:
           PR_NUMBER: ${{ env.PR_NUMBER }}
 
       - name: Update Status - Deploying
-        if: steps.determine_action.outputs.action == 'deploy'
         uses: actions/github-script@v7
         with:
           script: |
@@ -221,28 +158,13 @@ jobs:
             });
 
       - name: Deploy to Control Plane
-        if: steps.determine_action.outputs.action == 'deploy'
-        id: deploy
         uses: ./.github/actions/deploy-to-control-plane
         with:
           app_name: ${{ env.APP_NAME }}
           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: |
-            await github.rest.issues.updateComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: process.env.COMMENT_ID,
-              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: |
@@ -268,15 +190,15 @@ jobs:
             const successMessage = [
               '✅ Deployment complete for PR #' + prNumber + ', commit ' + '${{ env.COMMIT_HASH }}',
               '',
-              '🚀 Review App for PR #' + prNumber + ': [`' + appUrl + '`](' + appUrl + ')',
+              '🚀 [Review App for PR #' + prNumber + '](' + appUrl + ')',
               '',
               '📋 [View Completed Action Build and Deploy Logs](' + workflowUrl + ')'
             ].join('\n');
             
             const failureMessage = [
-              '❌ Deployment failed for PR #' + prNumber,
+              '❌ Deployment failed for PR #' + prNumber + ', commit ' + '${{ env.COMMIT_HASH }}',
               '',
-              '[View Workflow Status](' + workflowUrl + ')'
+              '📋 [View Deployment Logs with Errors](' + workflowUrl + ')'
             ].join('\n');
             
             // Update the existing comment
@@ -285,4 +207,4 @@ jobs:
               repo: context.repo.repo,
               comment_id: process.env.COMMENT_ID,
               body: isSuccess ? successMessage : failureMessage
-            });
+            });
diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml
@@ -0,0 +1,52 @@
+name: Show Help for Commands
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  show-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
+            });
