Fix Github Action / Control Plane Pipeline

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

@@ -10,16 +10,10 @@ inputs:
   org:
     description: 'Organization name'
     required: true
-  github_token:
-    description: 'GitHub token'
-    required: true
   wait_timeout:
     description: 'Timeout in seconds for waiting for workloads to be ready'
     required: false
     default: '900'
-  cpln_token:
-    description: 'Control Plane token'
-    required: true
   pr_number:
     description: 'Pull Request number'
     required: true
@@ -38,7 +32,6 @@ runs:
       env:
         APP_NAME: ${{ inputs.app_name }}
         CPLN_ORG: ${{ inputs.org }}
-        CPLN_TOKEN: ${{ inputs.cpln_token }}
         WAIT_TIMEOUT: ${{ inputs.wait_timeout }}
       run: |
         # Run the deployment script

.github/actions/deploy-to-control-plane/scripts/deploy.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This script handles the deployment to Control Plane and extracts the Rails URL
-#
+# 
 # Required environment variables:
 # - APP_NAME: Name of the application to deploy
 # - CPLN_ORG: Control Plane organization
@@ -11,7 +11,7 @@
 #                 Must be a positive integer
 #
 # Outputs:
-# - ENV APP_URL: URL of the deployed application
+# - rails_url: URL of the deployed Rails application
 
 set -e
 
@@ -29,36 +29,26 @@ fi
 TEMP_OUTPUT=$(mktemp)
 trap 'rm -f "$TEMP_OUTPUT"' EXIT
 
+last_output=$(cpln workload get 2>&1)
+echo "$last_output"
+
 # Deploy the application
 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 2>&1 | tee "$TEMP_OUTPUT"; then
-  echo "❌ Deployment failed"
-  echo "Full output:"
-  cat "$TEMP_OUTPUT"
-  exit 1
-fi
-
-# Extract app URL from deployment output
-APP_URL=$(grep -oP 'https://[^[:space:]]*\.cpln\.app(?=\s|$)' "$TEMP_OUTPUT" | head -n1)
-if [ -z "$APP_URL" ]; then
-  echo "❌ Error: Could not find app URL in deployment output"
-  exit 1
+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
+        echo "rails_url=$RAILS_URL" >> "$GITHUB_OUTPUT"
+        echo "✅ Deployment successful"
+        echo "🚀 Rails URL: $RAILS_URL"
+    else
+        echo "❌ Failed to extract Rails URL from deployment output"
+        exit 1
+    fi
+elif [ $? -eq 124 ]; then
+    echo "❌ Deployment timed out after $WAIT_TIMEOUT seconds"
+    exit 1
+else
+    echo "❌ Deployment to Control Plane failed"
+    exit 1
 fi
-
-# Wait for all workloads to be ready
-echo "⏳ Waiting for all workloads to be ready (timeout: ${WAIT_TIMEOUT}s)"
-if ! timeout "${WAIT_TIMEOUT}" bash -c "cpflow ps:wait -a \"$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"
-  fi
-  echo "Full output:"
-  cat "$TEMP_OUTPUT"
-  exit 1
-fi
-
-echo "✅ Deployment successful"
-echo "🌐 App URL: $APP_URL"
-echo "APP_URL=$APP_URL" >> "$GITHUB_OUTPUT"

.github/actions/setup-environment/action.yml

@@ -24,7 +24,7 @@ runs:
       run: |
         sudo npm install -g @controlplane/[email protected]
         cpln --version
-        gem install cpflow -v 4.1.0
+        gem install cpflow -v 4.1.1
         cpflow --version
 
     - name: Setup Control Plane Profile

.github/workflows/delete-review-app.yml

@@ -19,6 +19,7 @@ permissions:
   issues: write
 
 env:
+  PREFIX: ${{ vars.REVIEW_APP_PREFIX }}
   CPLN_ORG: ${{ vars.CPLN_ORG_STAGING }}
   CPLN_TOKEN: ${{ secrets.CPLN_TOKEN_STAGING }}
   APP_NAME: ${{ vars.REVIEW_APP_PREFIX }}-pr-${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number }}
@@ -43,7 +44,28 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Validate Required Secrets and Variables
-        uses: ./.github/actions/validate-required-vars
+        shell: bash
+        run: |
+          missing=()
+
+          # Check required secrets
+          if [ -z "$CPLN_TOKEN" ]; then
+            missing+=("Secret: CPLN_TOKEN_STAGING")
+          fi
+
+          # Check required variables
+          if [ -z "$CPLN_ORG" ]; then
+            missing+=("Variable: CPLN_ORG_STAGING")
+          fi
+
+          if [ -z "$"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: Setup Environment
         uses: ./.github/actions/setup-environment

.github/workflows/deploy-to-control-plane-review-app.yml

@@ -2,14 +2,12 @@ name: Deploy PR Review App to Control Plane
 
 run-name: Deploy PR Review App - PR #${{ github.event.pull_request.number || github.event.issue.number || github.event.inputs.pr_number }}
 
+
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
   push:
-    branches:
-      - '**'        # Any branch
-      - '!main'     # Except main
-      - '!master'   # Except master
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
   issue_comment:
     types: [created]
   workflow_dispatch:
@@ -24,6 +22,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  PREFIX: ${{ vars.REVIEW_APP_PREFIX }}
   APP_NAME: ${{ vars.REVIEW_APP_PREFIX }}-pr-${{ 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 }}
@@ -70,7 +69,28 @@ jobs:
           fetch-depth: 0
 
       - name: Validate Required Secrets and Variables
-        uses: ./.github/actions/validate-required-vars
+        shell: bash
+        run: |
+          missing=()
+
+          # Check required secrets
+          if [ -z "$CPLN_TOKEN" ]; then
+            missing+=("Secret: CPLN_TOKEN_STAGING")
+          fi
+
+          # Check required variables
+          if [ -z "$CPLN_ORG" ]; then
+            missing+=("Variable: CPLN_ORG_STAGING")
+          fi
+
+          if [ -z "$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
@@ -158,6 +178,8 @@ jobs:
           if ! cpflow exists -a ${{ env.APP_NAME }}; then
             echo "APP_EXISTS=false" >> $GITHUB_ENV
           else
+            last_output=$(cpln workload get 2>&1)
+            echo "$last_output"
             echo "APP_EXISTS=true" >> $GITHUB_ENV
           fi
 
@@ -294,9 +316,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       image_tag: ${{ steps.build.outputs.image_tag }}
-      comment_id: ${{ needs.process-deployment.outputs.comment_id }}
-      pr_number: ${{ needs.process-deployment.outputs.pr_number }}
-      do_deploy: ${{ needs.process-deployment.outputs.do_deploy }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -338,7 +357,7 @@ jobs:
           PR_NUMBER: ${{ needs.process-deployment.outputs.pr_number }}
 
   deploy:
-    needs: build
+    needs: [build, process-deployment]
     if: needs.build.outputs.do_deploy != 'false'
     runs-on: ubuntu-latest
     steps:
@@ -350,6 +369,9 @@ jobs:
         with:
           token: ${{ secrets.CPLN_TOKEN_STAGING }}
           org: ${{ vars.CPLN_ORG_STAGING }}
+
+      - name: Confirm Auth
+        run: cpln profile get
 
       - name: Update Status - Deploying
         uses: actions/github-script@v7
@@ -368,20 +390,13 @@ jobs:
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: ${{ steps.create-comment.outputs.comment-id }},
+              comment_id: ${{ needs.process-deployment.outputs.comment_id }},
               body: deployingMessage
             });
 
       - name: Deploy to Control Plane
         if: env.DO_DEPLOY != 'false'
-        uses: ./.github/actions/deploy-to-control-plane
-        with:
-          app_name: ${{ env.APP_NAME }}
-          org: ${{ vars.CPLN_ORG_STAGING }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          wait_timeout: ${{ vars.WAIT_TIMEOUT || 900 }}
-          cpln_token: ${{ secrets.CPLN_TOKEN_STAGING }}
-          pr_number: ${{ env.PR_NUMBER }}
+        run: cpflow deploy-image -a ${{ env.APP_NAME }} --run-release-phase --org ${{ vars.CPLN_ORG_STAGING }} --verbose
 
       - name: Update Status - Deployment Complete
         if: env.DO_DEPLOY != 'false'
@@ -399,7 +414,7 @@ jobs:
             const deploymentStatus = {
               owner: context.repo.owner,
               repo: context.repo.repo,
-              deployment_id: ${{ steps.init-deployment.outputs.result }},
+              deployment_id: ${{ needs.process-deployment.outputs.deployment_id }},
               state: isSuccess ? 'success' : 'failure',
               environment_url: isSuccess ? appUrl : undefined,
               log_url: workflowUrl,
@@ -430,6 +445,6 @@ jobs:
             await github.rest.issues.updateComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: ${{ steps.create-comment.outputs.comment-id }},
+              comment_id: ${{ needs.process-deployment.outputs.comment_id }},
               body: isSuccess ? successMessage : failureMessage
             });