fix(infra): improve service URL retrieval script with better error handling

Author: Yuriy Bezsonov

infra/scripts/test/getsvcurl.sh

@@ -1,33 +1,36 @@
-#bin/sh
+#!/bin/sh
 
-# Check if parameter is provided
-if [ -z "$1" ]; then
-    echo "Error: Compute target parameter is required"
-    echo "Usage: $0 <compute-target>"
-    echo "Valid compute targets: apprunner, ecs, eks, lambda, local"
-    exit 1
-fi
-
-COMPUTE=$1
+# Default to EKS if no parameter provided
+COMPUTE=${1:-eks}
 
 SVC_URL=""
 
-if [ "$COMPUTE" = "apprunner" ]; then
-    SVC_URL=https://$(aws apprunner list-services --query "ServiceSummaryList[?ServiceName == 'unicorn-store-spring'].ServiceUrl" --output text)
-elif [ "$COMPUTE" = "ecs" ]; then
-    SVC_URL=http://$(aws elbv2 describe-load-balancers --names unicorn-store-spring --query "LoadBalancers[0].DNSName" --output text)
+if [ "$COMPUTE" = "ecs" ]; then
+    # Try Express Mode first (HTTPS)
+    EXPRESS_URL=$(aws ecs describe-express-gateway-service \
+        --service-arn arn:aws:ecs:${AWS_REGION}:${ACCOUNT_ID}:service/unicorn-store-spring/unicorn-store-spring \
+        --no-cli-pager 2>/dev/null \
+        | jq -r '.service.activeConfigurations[0].ingressPaths[0].endpoint // empty')
+    if [ -n "$EXPRESS_URL" ]; then
+        SVC_URL=https://${EXPRESS_URL}
+    else
+        # Fall back to regular ECS with ALB (HTTP)
+        ALB_DNS=$(aws elbv2 describe-load-balancers --names unicorn-store-spring \
+            --query "LoadBalancers[0].DNSName" --output text --no-cli-pager 2>/dev/null)
+        if [ -n "$ALB_DNS" ] && [ "$ALB_DNS" != "None" ]; then
+            SVC_URL=http://${ALB_DNS}
+        fi
+    fi
 elif [ "$COMPUTE" = "eks" ]; then
-    SVC_URL=http://$(kubectl get ingress unicorn-store-spring -n unicorn-store-spring -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
-elif [ "$COMPUTE" = "lambda" ]; then
-    REST_API_ID=$(aws apigateway get-rest-apis --query 'items[?name==`unicorn-store-spring-api`].[id]' --output text)
-    STAGE=$(aws apigateway get-stages --rest-api-id $REST_API_ID --query 'item[].stageName' --output text)
-    SVC_URL=https://$REST_API_ID.execute-api.$AWS_REGION.amazonaws.com/$STAGE
+    SVC_URL=http://$(kubectl get ingress unicorn-store-spring \
+        -n unicorn-store-spring \
+        -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null)
 elif [ "$COMPUTE" = "local" ]; then
     SVC_URL="http://localhost:8080"
 fi
 
 # Check if URL was successfully set
-if [ -z "$SVC_URL" ]; then
+if [ -z "$SVC_URL" ] || [ "$SVC_URL" = "http://" ]; then
     echo "Error: Failed to retrieve service URL for compute target '$COMPUTE'"
     exit 1
 fi