Improve envtool (#1598)

Closes #1590.
FerretDB · Nov 30, 2022 · 373d939 · 373d939 · vercel · Nov 30, 2022
1 parent 0cbcd6d
commit 373d939
Show file tree

Hide file tree

Showing 9 changed files with 290 additions and 188 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -207,7 +207,7 @@ jobs:
         if: always()
         run: |
           bin/task fuzz-corpus
-          go run ./cmd/fuzztool/fuzztool.go corpus seed ../fuzz-corpus
+          go run ./cmd/fuzztool corpus seed ../fuzz-corpus
         working-directory: source
 
       # `secrets` are not supported in `if`, so we have to do this trick with environment variable:

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -10,6 +10,7 @@ vars:
   FUZZCORPUS: ../fuzz-corpus
   RACEFLAG: -race={{and (ne OS "windows") (ne ARCH "arm")}}
   BUILDTAGS: ferretdb_tigris
+  SERVICES: postgres tigris mongodb
 
 tasks:
   # invoked when `task` is run without arguments
@@ -68,34 +69,39 @@ tasks:
       - task: env-pull
       - task: init
 
-  env-setup:
-    deps: [gen-version]
-    cmds:
-      - go run {{.RACEFLAG}} ./cmd/envtool/main.go
-
   env-up-detach:
     cmds:
       - >
         docker-compose up --always-recreate-deps --force-recreate --remove-orphans --renew-anon-volumes --timeout=0 --detach
         --build
-        postgres tigris cockroach mongodb
+        {{.SERVICES}}
 
   env-up-detach-offline:
     cmds:
       - >
         docker-compose up --always-recreate-deps --force-recreate --remove-orphans --renew-anon-volumes --timeout=0 --detach
-        postgres tigris mongodb
+        {{.SERVICES}}
+
+  env-setup:
+    deps: [gen-version]
+    cmds:
+      - go run {{.RACEFLAG}} ./cmd/envtool
+
+  env-logs:
+    cmds:
+      - docker-compose ps --all
+      - docker-compose logs --follow
 
   env-up:
     desc: "Start development environment"
     deps: [env-up-detach, env-setup]
     cmds:
-      - docker-compose logs --follow
+      - task: env-logs
 
   env-up-offline:
     deps: [env-up-detach-offline, env-setup]
     cmds:
-      - docker-compose logs --follow
+      - task: env-logs
 
   env-pull:
     desc: "Pull development environment's Docker images"
@@ -223,9 +229,9 @@ tasks:
   fuzz-corpus:
     desc: "Sync seed and generated fuzz corpora with FUZZCORPUS"
     cmds:
-      - go run {{.RACEFLAG}} ./cmd/fuzztool/fuzztool.go corpus generated {{.FUZZCORPUS}}
-      - go run {{.RACEFLAG}} ./cmd/fuzztool/fuzztool.go corpus seed {{.FUZZCORPUS}}
-      - go run {{.RACEFLAG}} ./cmd/fuzztool/fuzztool.go corpus {{.FUZZCORPUS}} generated
+      - go run {{.RACEFLAG}} ./cmd/fuzztool corpus generated {{.FUZZCORPUS}}
+      - go run {{.RACEFLAG}} ./cmd/fuzztool corpus seed {{.FUZZCORPUS}}
+      - go run {{.RACEFLAG}} ./cmd/fuzztool corpus {{.FUZZCORPUS}} generated
 
   build-testcover:
     desc: "Build bin/ferretdb-testcover"