revert changes to deploy script

Author: Judahmeek

.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,17 +11,14 @@
 #                 Must be a positive integer
 #
 # Outputs:
-# - ENV APP_URL: URL of the deployed application
+# - rails_url: URL of the deployed Rails application
 
 set -e
 
 # Validate required environment variables
 : "${APP_NAME:?APP_NAME environment variable is required}"
 : "${CPLN_ORG:?CPLN_ORG environment variable is required}"
 
-auth_check=$(cpln profile get 2>&1)
-echo "$auth_check"
-
 # Set and validate deployment timeout
 WAIT_TIMEOUT=${WAIT_TIMEOUT:-900}
 if ! [[ "${WAIT_TIMEOUT}" =~ ^[0-9]+$ ]]; then
@@ -34,41 +31,21 @@ trap 'rm -f "$TEMP_OUTPUT"' EXIT
 
 # 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
-
-echo "🚀 Rocket launched!"
-
-# 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 "⏳ Wait complete!"
-
-# Extract app URL from deployment output
-echo "🙏 Extracting app URL"
-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"
-  echo "Full output:"
-  cat "$TEMP_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
-
-echo "✅ Deployment successful"
-echo "🌐 App URL: $APP_URL"
-echo "APP_URL=$APP_URL" >> "$GITHUB_OUTPUT"