v0.7.10 - Maintenance capability overhaul, Storefront critical patches and improvements

.github/workflows/cd.yml

@@ -58,6 +58,43 @@ jobs:
           files: |
             ./docker-bake.hcl
 
+      - name: Resolve ECS Targets
+        run: |
+          set -euo pipefail
+
+          # Detect naming scheme by checking if new cluster exists
+          NEW_CLUSTER="${PROJECT}-${STACK}-cluster"
+          if aws ecs describe-clusters --region "${AWS_REGION}" --clusters "${NEW_CLUSTER}" \
+              --query "clusters[?status=='ACTIVE'].clusterArn" --output text 2>/dev/null | grep -q .; then
+            # New scheme: use cluster suffix and service prefixes
+            CLUSTER="${NEW_CLUSTER}"
+            SERVICE_PREFIX="${PROJECT}-${STACK}-"
+            SERVICE_BASE="api"
+          else
+            # Legacy scheme: no suffixes/prefixes
+            CLUSTER="${PROJECT}-${STACK}"
+            SERVICE_PREFIX=""
+            SERVICE_BASE="app"
+          fi
+
+          # Build service names
+          API_SERVICE="${SERVICE_PREFIX}${SERVICE_BASE}"
+          SCHEDULER_SERVICE="${SERVICE_PREFIX}scheduler"
+          EVENTS_SERVICE="${SERVICE_PREFIX}events"
+          TASK_DEF="${PROJECT}-${STACK}-${SERVICE_BASE}"
+          
+          # Get container name from task definition
+          CONTAINER_NAME="$(aws ecs describe-task-definition --task-definition "$TASK_DEF" \
+              --query 'taskDefinition.containerDefinitions[0].name' --output text 2>/dev/null || echo "$SERVICE_BASE")"
+
+          {
+            echo "CLUSTER=$CLUSTER"
+            echo "API_SERVICE=$API_SERVICE"
+            echo "SCHEDULER_SERVICE=$SCHEDULER_SERVICE"
+            echo "EVENTS_SERVICE=$EVENTS_SERVICE"
+            echo "TASK_DEF=$TASK_DEF"
+            echo "CONTAINER_NAME=$CONTAINER_NAME"
+          } >> "$GITHUB_ENV"
       - name: Download ecs-tool
         run: |
           wget -O ecs-tool.tar.gz https://github.com/springload/ecs-tool/releases/download/1.9.6/ecs-tool_1.9.6_linux_amd64.tar.gz && tar -xvf ecs-tool.tar.gz ecs-tool
@@ -65,9 +102,21 @@ jobs:
       - name: Deploy the images 🚀
         run: |-
           set -eu
-          # run deploy.sh script before deployments
-          env "ECS_RUN.SERVICE=app" "ECS_RUN.LAUNCH_TYPE=FARGATE" ./ecs-tool run -l "ecs-tool" --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} --task_definition ${{ env.PROJECT }}-${{ env.STACK }}-app --container_name app ./deploy.sh
-          ./ecs-tool deploy --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} -s app -s scheduler -s events
+          
+          # Run deploy.sh script before deployments
+          env "ECS_RUN.SERVICE=${API_SERVICE}" "ECS_RUN.LAUNCH_TYPE=FARGATE" \
+            ./ecs-tool run -l "ecs-tool" \
+              --image_tag '{container_name}-${{ env.VERSION }}' \
+              --cluster "${CLUSTER}" \
+              --task_definition "${TASK_DEF}" \
+              --container_name "${CONTAINER_NAME}" \
+              ./deploy.sh
+
+          # Deploy services
+          ./ecs-tool deploy \
+              --image_tag '{container_name}-${{ env.VERSION }}' \
+              --cluster "${CLUSTER}" \
+              -s "${API_SERVICE}" -s "${SCHEDULER_SERVICE}" -s "${EVENTS_SERVICE}"
 
   build_frontend:
     name: Build and Deploy the Console
@@ -175,6 +224,11 @@ jobs:
           set -u
 
           DEPLOY_BUCKET=${STATIC_DEPLOY_BUCKET:-${{ env.PROJECT }}-${{ env.STACK }}}
+          NEW_BUCKET="${PROJECT}-${STACK}-console"
+          if aws s3api head-bucket --bucket "$NEW_BUCKET" 2>/dev/null; then
+            DEPLOY_BUCKET="$NEW_BUCKET"
+          fi
+
           # this value will come from the dotenv above
           echo "Deploying to $DEPLOY_BUCKET"
           wget -O- https://github.com/bep/s3deploy/releases/download/v2.11.0/s3deploy_2.11.0_linux-amd64.tar.gz | tar xzv -f - s3deploy