Fixed conflicts

shakacode · Jan 27, 2025 · c31e3d8 · c31e3d8
1 parent 151c527
commit c31e3d8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/.github/workflows/delete-review-app.yml b/.github/workflows/delete-review-app.yml
@@ -14,7 +14,7 @@ permissions:
 
 env:
   CPLN_ORG: ${{ secrets.CPLN_ORG }}
-  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN }}
+  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
   APP_NAME: qa-react-webpack-rails-tutorial-pr-${{ github.event.pull_request.number || github.event.issue.number }}
   PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
 
@@ -34,7 +34,7 @@ jobs:
       - name: Validate Required Secrets
         run: |
           missing_secrets=()
-          for secret in "CPLN_TOKEN" "CPLN_ORG"; do
+          for secret in "CPLN_TOKEN_STAGING" "CPLN_ORG_STAGING"; do
             if [ -z "${!secret}" ]; then
               missing_secrets+=("$secret")
             fi
@@ -122,7 +122,7 @@ jobs:
           org: ${{ env.CPLN_ORG }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
         env:
-          CPLN_TOKEN: ${{ secrets.CPLN_TOKEN }}
+          CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
 
       - name: Update Delete Status
         if: always()

diff --git a/.github/workflows/deploy-to-control-plane.yml b/.github/workflows/deploy-to-control-plane.yml
@@ -16,8 +16,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CPLN_ORG: ${{ secrets.CPLN_ORG }}
-  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN }}
+  CPLN_ORG: ${{ secrets.CPLN_ORG_STAGING }}
+  CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
 
 jobs:
   Process-Deployment-Command:

diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml
@@ -42,35 +42,21 @@ 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-review-app`',
                 '',
-                '**Required Environment Variables:**',
-                '- `CPLN_TOKEN`: Control Plane authentication token',
-                '- `CPLN_ORG`: Control Plane organization name',
-                '',
                 '### `/help`',
                 'Shows this detailed help message.',
                 '',
                 '---',
                 '## Environment Setup',
                 '',
                 '1. Set required secrets in your repository settings:',
-                '   - `CPLN_TOKEN`',
-                '   - `CPLN_ORG`',
+                '   - `CPLN_TOKEN_STAGING`',
+                '   - `CPLN_ORG_STAGING`',
                 '',
                 '2. Optional: Configure `WAIT_TIMEOUT` in GitHub Actions variables to customize deployment timeout',
                 '',

diff --git a/.github/workflows/promote-staging-to-production.yml b/.github/workflows/promote-staging-to-production.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Environment
         uses: ./.github/actions/setup-environment
         env:
-          CPLN_TOKEN: ${{ secrets.CPLN_TOKEN }}
+          CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
 
       - name: Promote Staging to Production
         id: promote