clean up duplicates

Author: justin808

.github/actions/deploy-to-control-plane/action.yml

@@ -32,80 +32,16 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - name: Validate Required Secrets
-      shell: bash
-      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: Get Commit SHA
-      id: get_sha
-      shell: bash
-      run: ${{ github.action_path }}/scripts/get-commit-sha.sh
-      env:
-        GITHUB_TOKEN: ${{ inputs.github_token }}
-        PR_NUMBER: ${{ inputs.pr_number }}
-
     - name: Deploy to Control Plane
       id: deploy
       shell: bash
       env:
+        APP_NAME: ${{ inputs.app_name }}
+        CPLN_ORG: ${{ inputs.org }}
         CPLN_TOKEN: ${{ inputs.cpln_token }}
-        PR_NUMBER: ${{ inputs.pr_number }}
+        WAIT_TIMEOUT: ${{ inputs.wait_timeout }}
       run: |
-        echo "🚀 Deploying app for PR #${PR_NUMBER}..."
-        
-        # Create temp file for output
-        TEMP_OUTPUT=$(mktemp)
-        trap 'rm -f "${TEMP_OUTPUT}"' EXIT
-        
-        # Deploy the application and show output in real-time while capturing it
-        if ! cpflow deploy-image -a "${{ inputs.app_name }}" --run-release-phase --org "${{ inputs.org }}" 2>&1 | tee "${TEMP_OUTPUT}"; then
-          echo "❌ Deployment failed for PR #${PR_NUMBER}"
-          echo "Error output:"
-          cat "${TEMP_OUTPUT}"
-          exit 1
-        fi
-        
-        # Extract app URL from captured output
-        REVIEW_APP_URL=$(grep -oP 'https://rails-[^[:space:]]*\.cpln\.app(?=\s|$)' "${TEMP_OUTPUT}" | head -n1)
-        if [ -z "${REVIEW_APP_URL}" ]; then
-          echo "❌ Failed to get app URL from deployment output"
-          echo "Deployment output:"
-          cat "${TEMP_OUTPUT}"
-          exit 1
-        fi
-        
-        # 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)..."
-        
-        # 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
-          TIMEOUT_EXIT=$?
-          if [ ${TIMEOUT_EXIT} -eq 124 ]; then
-            echo "❌ Timed out waiting for workloads after ${WAIT_TIMEOUT} seconds"
-          else
-            echo "❌ Workloads did not become ready for PR #${PR_NUMBER} (exit code: ${TIMEOUT_EXIT})"
-          fi
-          echo "Full output:"
-          cat "${TEMP_OUTPUT}"
+        # Run the deployment script
+        if ! ${{ github.action_path }}/scripts/deploy.sh; then
           exit 1
         fi
-        
-        echo "✅ Deployment successful for PR #${PR_NUMBER}"
-        echo "🌐 App URL: ${REVIEW_APP_URL}"
-        echo "review_app_url=${REVIEW_APP_URL}" >> $GITHUB_OUTPUT
-        echo "REVIEW_APP_URL=${REVIEW_APP_URL}" >> $GITHUB_ENV

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

@@ -24,7 +24,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  APP_NAME: qa-react-webpack-rails-tutorial-pr-${{ github.event.pull_request.number || github.event.issue.number || github.event.inputs.pr_number }}
+  APP_NAME: ${{ vars.REVIEW_APP_PREFIX }}-${{ github.event.pull_request.number || github.event.issue.number || github.event.inputs.pr_number }}
   CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
   CPLN_ORG: ${{ vars.CPLN_ORG_STAGING }}
   PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number || github.event.inputs.pr_number }}
@@ -55,13 +55,36 @@ jobs:
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
 
       # Basic checkout for other events (workflow_dispatch, issue_comment)
-      # We'll do proper checkout after getting PR info
       - name: Initial checkout
         if: github.event_name == 'workflow_dispatch' || github.event_name == 'issue_comment'
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Validate Required Secrets and Variables
+        shell: bash
+        run: |
+          missing=()
+          
+          # Check secrets
+          if [ -z "${{ secrets.CPLN_TOKEN_STAGING }}" ]; then
+            missing+=("Secret: CPLN_TOKEN_STAGING")
+          fi
+          
+          # Check variables
+          if [ -z "${{ vars.CPLN_ORG_STAGING }}" ]; then
+            missing+=("Variable: CPLN_ORG_STAGING")
+          fi
+          
+          if [ -z "${{ vars.REVIEW_APP_PREFIX }}" ]; then
+            missing+=("Variable: REVIEW_APP_PREFIX")
+          fi
+          
+          if [ ${#missing[@]} -ne 0 ]; then
+            echo "Required secrets/variables are not set: ${missing[*]}"
+            exit 1
+          fi
+
       - name: Get PR HEAD Ref
         id: getRef
         env:
@@ -91,7 +114,7 @@ jobs:
           
           # Set environment variables
           echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
-          echo "APP_NAME=qa-react-webpack-rails-tutorial-pr-$PR_NUMBER" >> $GITHUB_ENV
+          echo "APP_NAME=${{ vars.REVIEW_APP_PREFIX }}-$PR_NUMBER" >> $GITHUB_ENV
           
           # Get PR data using GitHub CLI
           PR_DATA=$(gh pr view $PR_NUMBER --repo shakacode/react-webpack-rails-tutorial --json headRefName,headRefOid)