From b1a1fc64c4a9ee897ca99d595b836e330c5af32d Mon Sep 17 00:00:00 2001
From: "Victor M." <vmugicag@redhat.com>
Date: Tue, 13 Aug 2024 09:31:51 +0200
Subject: [PATCH] fix: use compose v2 on GHA tests (#121)

* fix: use compose v2 on GHA tests

* fix(ci): use compose v2 API

* extend timeout
---
 .github/workflows/package.yml           |  2 +-
 deployments/wait_for_keycloak_import.sh | 28 ++++++++++++-------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index bdd5fc1..a02ba14 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           node-version: 18
       - name: Setup E2E testing environment
-        run: docker-compose -f deployments/compose.yaml up -d --build
+        run: docker compose -f deployments/compose.yaml up -d --build
       - name: Wait for Keycloak import to complete
         run: deployments/wait_for_keycloak_import.sh deployments/compose.yaml
       - name: Install test environment
diff --git a/deployments/wait_for_keycloak_import.sh b/deployments/wait_for_keycloak_import.sh
index 5775a44..c1ec31b 100755
--- a/deployments/wait_for_keycloak_import.sh
+++ b/deployments/wait_for_keycloak_import.sh
@@ -2,7 +2,7 @@
 
 COMPOSE_FILE="$1"
 CONTAINER_NAME="keycloak"
-COMPOSE_COMMAND=""
+CONTAINER_ENGINE=""
 SUCCESS_LOG_ENTRY="Keycloak.*started in \d+ms"
 START_SECONDS="$SECONDS"
 TIMEOUT="60"
@@ -11,16 +11,18 @@ command_exists() {
   command -v "$1" >/dev/null
 }
 
-set_compose_command() {
-  if command_exists "docker-compose"; then
-    echo "docker-compose"
-  elif command_exists "podman-compose"; then
-    echo "podman-compose"
+get_container_engine() {
+  if command_exists "docker"; then
+    echo -n "docker"
+  elif command_exists "podman"; then
+    echo -n "podman"
+  else
+    return 1
   fi
 }
 
 success_entry_found() {
-  grep -Pq "$SUCCESS_LOG_ENTRY" <<< "$("$COMPOSE_COMMAND" -f "$COMPOSE_FILE" logs "$CONTAINER_NAME" 2>/dev/null)"
+  grep -Pq "$SUCCESS_LOG_ENTRY" <<<"$("$CONTAINER_ENGINE" compose -f "$COMPOSE_FILE" logs "$CONTAINER_NAME" 2>/dev/null)"
 }
 
 init_checks() {
@@ -30,15 +32,12 @@ init_checks() {
     return 1
   fi
 
-  COMPOSE_COMMAND="$(set_compose_command)"
-
-  if [ -z "$COMPOSE_COMMAND" ]; then
+  if ! CONTAINER_ENGINE="$(get_container_engine)"; then
     echo "cannot find either docker-compose nor podman-compose in PATH"
     return 1
   fi
 }
 
-
 wait_for() {
 
   echo -n "waiting for ${CONTAINER_NAME}"
@@ -47,16 +46,15 @@ wait_for() {
     echo -n '.'
     sleep 1
 
-    if [[ $(( SECONDS - START_SECONDS )) -gt $TIMEOUT ]]; then
-      "$COMPOSE_COMMAND" -f "$COMPOSE_FILE" logs "$CONTAINER_NAME"
+    if [[ $((SECONDS - START_SECONDS)) -gt $TIMEOUT ]]; then
+        "$CONTAINER_ENGINE" compose -f "$COMPOSE_FILE" logs "$CONTAINER_NAME"
       echo "$CONTAINER_NAME failed to reach ready status under $TIMEOUT seconds"
       return 1
     fi
   done
 
-  echo -e "\n Took $(( SECONDS - START_SECONDS )) seconds"
+  echo -e "\n Took $((SECONDS - START_SECONDS)) seconds"
 }
 
 init_checks || exit 1
 wait_for || exit 1
-