chore(taskfile): add tests update other taskfiles

Signed-off-by: Evgeniy Frolov <evgeniy.frolov@flant.com>

Author: Fral738

.github/actions/set-up-prebuilt-trdl-test-binary/action.yml

@@ -45,19 +45,16 @@ jobs:
         run: task ci:install:3p-git-signatures
 
       - name: Install ginkgo
-        working-directory: server
-        run: task -p deps:install:ginkgo
+        run: task deps:install:ginkgo
 
       - name: Test
-        run: task -p test:unit
-        env:
-          TRDL_TEST_COVERAGE_DIR: ${{github.workspace}}/coverage
+        run: task server:test:unit
 
       - name: Upload coverage artifact
         uses: actions/upload-artifact@v4
         with:
-          name: tests_coverage
-          path: ${{github.workspace}}/coverage
+          name: test_coverage
+          path: ${{github.workspace}}/server/test_coverage
 
   e2e_client:
     name: End-to-end tests
@@ -76,10 +73,8 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up prebuilt werf test binary
-        uses: ./.github/actions/set-up-prebuilt-trdl-test-binary
-        with:
-          coverage: "true"
+      - name: Set up prebuilt trdl test binary
+        run: task client:build-with-coverage
 
       - name: Set up git config
         run: task ci:setup:git-config
@@ -93,27 +88,25 @@ jobs:
         uses: task ci:install:3p-git-signatures
 
       - name: Install ginkgo
-        working-directory: e2e
         run: task -p deps:install:ginkgo
 
       - name: Test
-        run: task -p test:e2e
-        env:
-          GOCOVERDIR: ${{github.workspace}}/covdata
+        run: task e2e:test:e2e
 
       - name: Upload coverage artifact
-        uses: ./.github/actions/upload-coverage-artifact
+        uses: actions/upload-artifact@v4
         with:
-          coverage: "true"
-
-  notification:
-    name: Notification
-    if: always()
-    needs:
-      - tests
-      - e2e_tests
-    uses: werf/common-ci/.github/workflows/notification.yml@main
-    secrets:
-      loopNotificationGroup: ${{ secrets.LOOP_NOTIFICATION_GROUP }}
-      webhook: ${{ secrets.LOOP_NOTIFICATION_WEBHOOK }}
-      notificationChannel: ${{ secrets.LOOP_NOTIFICATION_CHANNEL }}
+          name: e2e_coverage
+          path: ${{github.workspace}}/e2e/e2e_coverage
+
+  # notification:
+  #   name: Notification
+  #   if: always()
+  #   needs:
+  #     - unit_server
+  #     - e2e_client
+  #   uses: werf/common-ci/.github/workflows/notification.yml@main
+  #   secrets:
+  #     loopNotificationGroup: ${{ secrets.LOOP_NOTIFICATION_GROUP }}
+  #     webhook: ${{ secrets.LOOP_NOTIFICATION_WEBHOOK }}
+  #     notificationChannel: ${{ secrets.LOOP_NOTIFICATION_CHANNEL }}

.github/workflows/tests.yml

@@ -27,5 +27,3 @@ server/release-build
 _includes
 pages_en
 .task
-
-docs/.prettierignore

.gitignore

@@ -80,16 +80,16 @@ tasks:
   build:dev:all:
     desc: "Build all dev binaries."
     deps:
-      - build:client:dev
-      - build:server:dev
+      - client:build:dev
+      - server:build:dev
     vars:
       version: "{{.version}}"
 
   build:dist:all:
     desc: "Build all release binaries."
     deps:
-      - build:client:all
-      - build:server:all
+      - client:build:dist
+      - server:build:dist
     vars:
       version: "{{.version}}"
 

Taskfile.dist.yaml

@@ -70,6 +70,16 @@ tasks:
     cmds:
       - docker run --rm -v $(pwd):/work tmknom/prettier -c "**/*.yaml"
 
+  build:
+    desc: "Build client dev binary."
+    run: once
+    cmds:
+      - task: build:dev:{{OS}}:{{ARCH}}
+        vars:
+          extraGoBuildArgs: "{{.extraGoBuildArgs}}"
+          raceDetectorEnabled: '{{.raceDetectorEnabled | default "false"}}'
+          outputDir: ../bin/trdl
+
   build:all:
     desc: "Build all client binaries"
     deps:
@@ -147,7 +157,7 @@ tasks:
           targetOS: "linux"
           targetArch: "amd64"
           extraGoBuildArgs: "-tags='dfrunmount dfssh' -ldflags='-s -w -X github.com/werf/trdl/client/pkg/trdl.Version={{.version}}'"
-          outputDir: "../release-build/{{.version}}/linux-amd64/bin/"
+          outputDir: "release-build/{{.version}}/linux-amd64/bin/"
 
   build:dist:linux:arm64:
     desc: "Build client release binary for linux/arm64"
@@ -157,7 +167,7 @@ tasks:
           targetOS: "linux"
           targetArch: "arm64"
           extraGoBuildArgs: "-tags='dfrunmount dfssh' -ldflags='-s -w -X github.com/werf/trdl/client/pkg/trdl.Version={{.version}}'"
-          outputDir: "../release-build/{{.version}}/linux-arm64/bin/"
+          outputDir: "release-build/{{.version}}/linux-arm64/bin/"
 
   build:dist:darwin:amd64:
     desc: "Build client release binary for darwin/amd64"
@@ -167,7 +177,7 @@ tasks:
           targetOS: "darwin"
           targetArch: "amd64"
           extraGoBuildArgs: "-tags='dfrunmount dfssh' -ldflags='-s -w -X github.com/werf/trdl/client/pkg/trdl.Version={{.version}}'"
-          outputDir: "../release-build/{{.version}}/darwin-amd64/bin/"
+          outputDir: "release-build/{{.version}}/darwin-amd64/bin/"
 
   build:dist:darwin:arm64:
     desc: "Build client release binary for darwin/arm64"
@@ -177,7 +187,7 @@ tasks:
           targetOS: "darwin"
           targetArch: "arm64"
           extraGoBuildArgs: "-tags='dfrunmount dfssh' -ldflags='-s -w -X github.com/werf/trdl/client/pkg/trdl.Version={{.version}}'"
-          outputDir: "../release-build/{{.version}}/darwin-arm64/bin/"
+          outputDir: "release-build/{{.version}}/darwin-arm64/bin/"
 
   build:dist:windows:amd64:
     desc: "Build client release binary for windows/amd64"
@@ -187,13 +197,13 @@ tasks:
           targetOS: "windows"
           targetArch: "amd64"
           extraGoBuildArgs: "-tags='dfrunmount dfssh' -ldflags='-s -w -X github.com/werf/trdl/client/pkg/trdl.Version={{.version}}'"
-          outputDir: "../release-build/{{.version}}/windows-amd64/bin/"
+          outputDir: "release-build/{{.version}}/windows-amd64/bin/"
 
   _build:go:
     internal: true
     cmds:
       - |
-        go build -o {{.outputDir | default (printf "../build/%s/%s-%s/bin" .version .targetOS .targetArch)}}/trdl{{if (eq .targetOS "windows")}}.exe{{end}} \
+        go build -o {{.outputDir | default (printf "../bin/%s/%s-%s" .version .targetOS .targetArch)}}/trdl{{if (eq .targetOS "windows")}}.exe{{end}} \
         {{.extraGoBuildArgs}} {{.CLI_ARGS}} github.com/werf/trdl/client/cmd/trdl
     env:
       GOOS: "{{.targetOS}}"

client/Taskfile.yaml

@@ -4,3 +4,4 @@ _site/
 .jekyll-cache/
 .jekyll-bundle/
 docs/
+.prettierignore

docs/.gitignore

@@ -44,3 +44,9 @@ tasks:
       - task: _lint:golangci-lint:go
         vars:
           paths: "{{.paths}}"
+
+  test:e2e:
+    desc: "Run client e2e test."
+    cmd: ginkgo -p --keep-going --cover --coverpkg=../client/... --output-dir={{.outputDir}} ./...
+    vars:
+      outputDir: '{{.outputDir | default "e2e_coverage" }}'

e2e/Taskfile.yaml

@@ -3,3 +3,4 @@
 /publisher
 /.minio_data
 /.run
+tests_coverage

server/.gitignore

@@ -153,8 +153,8 @@ tasks:
         git_trdl_path={{.git_trdl_path}} \
         git_trdl_channels_path={{.git_trdl_channels_path}}
 
-  tail:
-    desc: "Tail Vault logs"
+  logs:
+    desc: "Get Vault logs"
     cmds:
       - docker logs -f {{.vault_container}}
 
@@ -166,6 +166,16 @@ tasks:
       - docker rm -f {{.vault_container}} || true
       - docker run --rm --volume ./:/wrk alpine rm -rf /wrk/{{.minio_data_dir}}
 
+  build:
+    desc: "Build server dev binary."
+    run: once
+    cmds:
+      - task: build:dev:{{OS}}:{{ARCH}}
+        vars:
+          extraGoBuildArgs: "{{.extraGoBuildArgs}}"
+          raceDetectorEnabled: '{{.raceDetectorEnabled | default "false"}}'
+          outputDir: vault/plugins
+
   build:all:
     desc: "Build all server binaries"
     deps:
@@ -197,7 +207,7 @@ tasks:
         vars:
           targetOS: "linux"
           targetArch: "amd64"
-          outputDir: "{{.outputDir}}"
+          outputDir: vault/plugins
 
   build:dev:linux:arm64:
     desc: "Build server dev binary for linux/arm64"
@@ -242,8 +252,8 @@ tasks:
         vars:
           targetOS: "linux"
           targetArch: "amd64"
-          extraGoBuildArgs: "-s -w"
-          outputDir: "../release-build/{{.version}}/linux-amd64/bin/"
+          extraGoBuildArgs: -ldflags="-s -w" 
+          outputDir: "release-build/{{.version}}/linux-amd64/bin/"
 
   build:dist:linux:arm64:
     desc: "Build server release binary for linux/arm64"
@@ -252,8 +262,8 @@ tasks:
         vars:
           targetOS: "linux"
           targetArch: "arm64"
-          extraGoBuildArgs: "-s -w"
-          outputDir: "../release-build/{{.version}}/linux-arm64/bin/"
+          extraGoBuildArgs: -ldflags="-s -w" 
+          outputDir: "release-build/{{.version}}/linux-arm64/bin/"
 
   build:dist:darwin:amd64:
     desc: "Build server release binary for darwin/amd64"
@@ -262,8 +272,8 @@ tasks:
         vars:
           targetOS: "darwin"
           targetArch: "amd64"
-          extraGoBuildArgs: "-s -w"
-          outputDir: "../release-build/{{.version}}/darwin-amd64/bin/"
+          extraGoBuildArgs: -ldflags="-s -w" 
+          outputDir: "release-build/{{.version}}/darwin-amd64/bin/"
 
   build:dist:darwin:arm64:
     desc: "Build server release binary for darwin/arm64"
@@ -272,8 +282,8 @@ tasks:
         vars:
           targetOS: "darwin"
           targetArch: "arm64"
-          extraGoBuildArgs: "-s -w"
-          outputDir: "../release-build/{{.version}}/darwin-arm64/bin/"
+          extraGoBuildArgs: -ldflags="-s -w" 
+          outputDir: "release-build/{{.version}}/darwin-arm64/bin/"
 
   build:dist:windows:amd64:
     desc: "Build server release binary for windows/amd64"
@@ -282,15 +292,30 @@ tasks:
         vars:
           targetOS: "windows"
           targetArch: "amd64"
-          extraGoBuildArgs: "-s -w"
-          outputDir: "../release-build/{{.version}}/windows-amd64/bin/"
+          extraGoBuildArgs: -ldflags="-s -w" 
+          outputDir: "release-build/{{.version}}/windows-amd64/bin/"
 
   _build:go:
     internal: true
     cmds:
       - |
-        go build -o {{.outputDir | default (printf "../build/%s/%s-%s/bin" .version .targetOS .targetArch)}}/vault-plugin-secrets-trdl{{if (eq .targetOS "windows")}}.exe{{end}} \
+        go build -o {{.outputDir | default (printf "vault/plugins/%s/%s-%s/bin" .version .targetOS .targetArch)}}/vault-plugin-secrets-trdl{{if (eq .targetOS "windows")}}.exe{{end}} \
         {{.extraGoBuildArgs}} {{.CLI_ARGS}} github.com/werf/trdl/server/cmd/vault-plugin-secrets-trdl
     env:
       GOOS: "{{.targetOS}}"
       GOARCH: "{{.targetArch}}"
+
+  build-with-coverage:
+    desc: "Build server binary to run E2E tests with coverage."
+    cmds:
+      - task: build:dev:{{OS}}:{{ARCH}}
+        vars:
+          outputDir: ../bin/trdl
+          extraGoBuildArgs: "-cover -covermode=atomic -coverpkg=./... "
+          goTags: test_coverage
+
+  test:unit:
+    desc: "Run server unit tests."
+    cmd: ginkgo --vet=off --race --keep-going --cover --coverpkg=./... --output-dir={{.outputDir}} ./...
+    vars:
+      outputDir: '{{.outputDir | default "tests_coverage"}}'