Merge pull request #1092 from percona/release-2.9.0

Release 2.9.0

Author: sandraromanchenko

.github/workflows/ci.yml

@@ -25,6 +25,15 @@ on:
       - "packaging/**"
       - "version/**"
 
+  push:
+    branches:
+      - main
+      - dev
+    paths-ignore:
+      - "e2e-tests/**"
+      - "packaging/**"
+      - "version/**"      
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -35,10 +44,10 @@ jobs:
         psmdb: ["6.0", "7.0", "8.0"]
         test: [logical, physical, incremental, external]
     env:
-      PBM_BRANCH: ${{ github.event.inputs.pbm_branch || 'main' }}
+      PBM_BRANCH: ${{ github.event.inputs.pbm_branch || github.ref_name }}
       GO_VER: ${{ github.event.inputs.go_ver || '1.22-bullseye' }}
       PR_NUMBER: ${{ github.event.number|| github.event.inputs.pr_ver }}
-
+      MAKE_TARGET: 'build-cover'
     steps:
       - name: Checkout testing repo
         uses: actions/checkout@v4
@@ -58,8 +67,50 @@ jobs:
           docker compose run test pytest -s --junitxml=junit.xml -k ${{ matrix.test }}
         working-directory: psmdb-testing/pbm-functional/pytest
 
+      - name: Fetch coverage files
+        run: |
+          docker compose run --rm golang_reports cp -r /gocoverdir/reports /test
+          sudo chmod -R 777 reports
+        working-directory: psmdb-testing/pbm-functional/pytest
+        if: success() || failure()
+
+      - name: Upload coverage reports
+        uses: actions/upload-artifact@v4
+        with:
+          name: reports-${{ matrix.test }}-${{ matrix.psmdb }}
+          path: psmdb-testing/pbm-functional/pytest/reports/
+        if: success() || failure()
+
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4
         if: success() || failure()
         with:
           report_paths: "**/junit.xml"
+
+  coverage:
+    if: ${{ always() }}
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+      - name: Download all coverage reports
+        uses: actions/download-artifact@v4
+        with:
+          path: reports
+          pattern: reports-*
+          merge-multiple: true
+      - name: Merge coverage reports
+        run: |
+          go tool covdata textfmt -i=./reports -o ./coverage.txt
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          files: ./coverage.txt
+          flags: integration
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codecov.yml

@@ -3,6 +3,11 @@ name: 'codecov'
 on:
   push:
     branches:
+      - main
+      - dev
+  pull_request:
+    branches:
+      - main
       - dev
 
 jobs:
@@ -21,5 +26,6 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           file: cover.out
+          flags: unittests
           fail_ci_if_error: false
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/reviewdog.yml

@@ -1,24 +1,6 @@
 name: reviewdog
 on: [pull_request]
 jobs:
-  go-test:
-    name: runner / go-test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
-        with:
-          go-version: "1.22"
-      - name: test
-        run: go test -v ./... -covermode=atomic -coverprofile=cover.out
-
-      - name: upload coverage report
-        uses: codecov/codecov-action@v4
-        with:
-          file: cover.out
-          fail_ci_if_error: false
-          token: ${{ secrets.CODECOV_TOKEN }}
-
   shellcheck:
     name: runner / shellcheck
     runs-on: ubuntu-latest

cmd/pbm-agent/commands_test.go

@@ -0,0 +1,87 @@
+package main
+
+import (
+	"bytes"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/spf13/cobra"
+
+	"github.com/percona/percona-backup-mongodb/pbm/version"
+)
+
+func TestRootCmd_NoArgs(t *testing.T) {
+	rootCmd, _ := setupTestCmd()
+	err := rootCmd.Execute()
+	if err == nil || !strings.Contains(err.Error(), "required flag mongodb-uri") {
+		t.Fatal(err)
+	}
+}
+
+func TestRootCmd_Config(t *testing.T) {
+	tmpConfig, cleanup := createTempConfigFile(`
+log:
+  path: "/dev/stderr"
+  level: "D"
+  json: false
+`)
+	defer cleanup()
+
+	rootCmd, _ := setupTestCmd("--config", tmpConfig)
+	err := rootCmd.Execute()
+	if err == nil || !strings.Contains(err.Error(), "required flag mongodb-uri") {
+		t.Fatal(err)
+	}
+}
+
+func createTempConfigFile(content string) (string, func()) {
+	temp, _ := os.CreateTemp("", "test-config-*.yaml")
+
+	_, _ = temp.WriteString(content)
+	_ = temp.Close()
+
+	return temp.Name(), func() {
+		_ = os.Remove(temp.Name())
+	}
+}
+
+func TestVersionCommand_Default(t *testing.T) {
+	rootCmd, buf := setupTestCmd("version")
+	err := rootCmd.Execute()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	output := buf.String()
+
+	if !strings.Contains(output, "Version:") {
+		t.Errorf("expected full version info in output, got: %s", output)
+	}
+}
+
+func TestVersionCommand_Short(t *testing.T) {
+	rootCmd, buf := setupTestCmd("version", "--short")
+	err := rootCmd.Execute()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	output := buf.String()
+
+	if !strings.Contains(output, version.Current().Short()) {
+		t.Errorf("expected short version info in output, got: %s", output)
+	}
+}
+
+func setupTestCmd(args ...string) (*cobra.Command, *bytes.Buffer) {
+	cmd := rootCommand()
+	cmd.AddCommand(versionCommand())
+
+	var buf bytes.Buffer
+	cmd.SetOut(&buf)
+	cmd.SetErr(&buf)
+	cmd.SetArgs(args)
+
+	return cmd, &buf
+}