From dd404541b6ca36a79677962efe38b14633a40d64 Mon Sep 17 00:00:00 2001
From: Ivan Ogasawara <ivan.ogasawara@gmail.com>
Date: Mon, 6 May 2024 22:53:24 -0400
Subject: [PATCH] update deps

---
 .github/workflows/main.yaml | 19 +++++++-------
 .makim.yaml                 | 49 +++++++++++++++++++++++++++++++++++++
 .sugar.yaml                 |  3 ++-
 conda/base.yaml             |  4 +--
 4 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 9dd623f..9779447 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -79,7 +79,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Create environment variables file
       run: |
@@ -90,10 +90,6 @@ jobs:
         envsubst < .env.tpl > .env
         mkdir /home/runner/work/psql_data
 
-    - name: setup
-      run: |
-        makim host.prepare
-
     - uses: conda-incubator/setup-miniconda@v3
       with:
         miniconda-version: "latest"
@@ -103,6 +99,9 @@ jobs:
         auto-update-conda: true
         conda-solver: libmamba
 
+    - name: setup
+      run: makim host.prepare
+
     - name: configure epigraphhub credentials
       run: |
         epigraphhub-config --name ci-epigraphhub \
@@ -112,16 +111,16 @@ jobs:
       run: makim aws.create-s3-credential
 
     - name: build docker containers
-      run: make containers-build
+      run: sugar build
 
     - name: start services
       run: |
-        make containers-start-services SERVICES="superset airflow postgres"
+        sugar ext restart --services superset,airflow,postgres --options -d
 
     - name: wait for the services are properly working
       run: |
-        docker ps
-        make containers-wait-all
+        sugar ps
+        makim containers.wait-all
 
     - name: run epigraphhub tests
       run: |
@@ -145,7 +144,7 @@ jobs:
     - name: Generate logs
       if: ${{ failure() }}
       run: |
-        make containers-logs ARGS="--tail 1000" SERVICES="" > /tmp/containers-services.log
+        sugar logs --options --tail 1000 > /tmp/containers-services.log
 
     - name: Archive log artifacts
       uses: actions/upload-artifact@v3
diff --git a/.makim.yaml b/.makim.yaml
index 4b94c1c..1aa9919 100644
--- a/.makim.yaml
+++ b/.makim.yaml
@@ -65,6 +65,55 @@ groups:
         help: Reset container storage
         run: rm -rf ~/.local/share/containers/
 
+      wait:
+        help: Wait until container is healthy
+        args:
+          service:
+            help: the name of the service
+            type: str
+            required: true
+          timeout:
+            help: the time (in seconds) for waiting the service
+            type: int
+            default: 90
+            required: false
+        run: |
+          timeout ${{ args.timeout }} ./containers/healthcheck.sh ${{ args.service }}
+
+      wait-all:
+        help: Wait until container is healthy
+        args:
+          timeout:
+            help: the time (in seconds) for waiting the service
+            type: int
+            default: 90
+            required: false
+        dependencies:
+          - target: wait
+            args:
+              timeout: ${{ args.timeout }}
+              service: postgres
+          - target: wait
+            args:
+              timeout: ${{ args.timeout }}
+              service: minio
+          - target: wait
+            args:
+              timeout: ${{ args.timeout }}
+              service: redis
+          - target: wait
+            args:
+              timeout: ${{ args.timeout }}
+              service: flower
+          - target: wait
+            args:
+              timeout: ${{ args.timeout }}
+              service: superset
+          - target: wait
+            args:
+              timeout: ${{ args.timeout }}
+              service: airflow
+
   aws:
     tasks:
       create-s3-credential:
diff --git a/.sugar.yaml b/.sugar.yaml
index ac8e9c5..1a013aa 100644
--- a/.sugar.yaml
+++ b/.sugar.yaml
@@ -1,6 +1,8 @@
 version: 1.0.0
 compose-app: docker-compose
 env-file: .env
+defaults:
+  group: {{ env.ENV }}
 
 groups:
   airflow:
@@ -17,7 +19,6 @@ groups:
         - name: triggerer
         - name: airflow-cli
 
-
   dev:
     project-name: egh-dev
     compose-path:
diff --git a/conda/base.yaml b/conda/base.yaml
index 6a8d8bf..90e350b 100644
--- a/conda/base.yaml
+++ b/conda/base.yaml
@@ -11,8 +11,8 @@ dependencies:
   - webdriver-manager
   - pip
   - pip:
-    - containers-sugar==1.11.2
-    - makim==1.15.0
+    - containers-sugar==1.11.4
+    - makim==1.15.2
     - compose-go
     - epigraphhub>=2.1.1
     - "selenium<=4.0"