Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

REFACTOR (agent): Move backup agent to agent/backup/ subdirectory

Rostislav Dugin3ba79b415be8
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index 39811bc8..10d187ab 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -106,11 +106,11 @@ jobs:
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
with:
go-version: "1.26.2"
- cache-dependency-path: agent/go.sum
+ cache-dependency-path: agent/backup/go.sum
- name: Download Go modules
run: |
- cd agent
+ cd agent/backup
go mod download
- name: Install golangci-lint
@@ -120,12 +120,12 @@ jobs:
- name: Run golangci-lint
run: |
- cd agent
+ cd agent/backup
golangci-lint run
- name: Verify go mod tidy
run: |
- cd agent
+ cd agent/backup
go mod tidy
git diff --exit-code go.mod go.sum || (echo "go mod tidy made changes, please run 'go mod tidy' and commit the changes" && exit 1)
@@ -171,16 +171,16 @@ jobs:
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
with:
go-version: "1.26.2"
- cache-dependency-path: agent/go.sum
+ cache-dependency-path: agent/backup/go.sum
- name: Download Go modules
run: |
- cd agent
+ cd agent/backup
go mod download
- name: Run Go tests
run: |
- cd agent
+ cd agent/backup
go test -count=1 -failfast ./internal/...
e2e-agent:
@@ -193,13 +193,13 @@ jobs:
- name: Run e2e tests
run: |
- cd agent
+ cd agent/backup
make e2e
- name: Cleanup
if: always()
run: |
- cd agent/e2e
+ cd agent/backup/e2e
docker compose down -v --rmi local || true
rm -rf artifacts || true
@@ -217,13 +217,13 @@ jobs:
- name: Run backup-restore e2e (PG ${{ matrix.pg_version }})
run: |
- cd agent
+ cd agent/backup
make e2e-backup-restore PG_VERSION=${{ matrix.pg_version }}
- name: Cleanup
if: always()
run: |
- cd agent/e2e
+ cd agent/backup/e2e
docker compose -f docker-compose.backup-restore.yml down -v --rmi local || true
rm -rf artifacts || true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dafbf901..d3770a0f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -47,14 +47,14 @@ repos:
hooks:
- id: agent-format-and-lint
name: Agent Format & Lint (golangci-lint)
- entry: bash -c "cd agent && golangci-lint fmt ./internal/... ./cmd/... && golangci-lint run ./internal/... ./cmd/..."
+ entry: bash -c "cd agent/backup && golangci-lint fmt ./internal/... ./cmd/... && golangci-lint run ./internal/... ./cmd/..."
language: system
- files: ^agent/.*\.go$
+ files: ^agent/backup/.*\.go$
pass_filenames: false
- id: agent-go-mod-tidy
name: Agent Go Mod Tidy
- entry: bash -c "cd agent && go mod tidy"
+ entry: bash -c "cd agent/backup && go mod tidy"
language: system
- files: ^agent/.*\.go$
+ files: ^agent/backup/.*\.go$
pass_filenames: false
diff --git a/CLAUDE.md b/CLAUDE.md
index 7d0e6d8b..815b9d5e 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -6,7 +6,7 @@ This is NOT a strict set of rules — it is a set of recommendations to help wri
Per-folder rules live next to the code they govern:
- [`backend/CLAUDE.md`](backend/CLAUDE.md) — Go + Gin + GORM + PostgreSQL backend (controllers, migrations, CRUD, DI, testing, logging)
-- [`agent/CLAUDE.md`](agent/CLAUDE.md) — Go agent CLI (no HTTP server, no schema; shares Go conventions with the backend)
+- [`agent/backup/CLAUDE.md`](agent/backup/CLAUDE.md) — Go agent CLI (no HTTP server, no schema; shares Go conventions with the backend)
- [`frontend/CLAUDE.md`](frontend/CLAUDE.md) — React 19 + TypeScript + Vite + Ant Design + Tailwind
This root file holds the engineering philosophy that applies everywhere.
diff --git a/Dockerfile b/Dockerfile
index 3ee29e38..38f7ca68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,10 +87,10 @@ ARG APP_VERSION=dev
WORKDIR /agent
-COPY agent/go.mod ./
+COPY agent/backup/go.mod ./
RUN go mod download
-COPY agent/ ./
+COPY agent/backup/ ./
# Build for x86_64 (amd64) — static binary, no glibc dependency
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
diff --git a/agent/.dockerignore b/agent/backup/.dockerignore
similarity index 100%
rename from agent/.dockerignore
rename to agent/backup/.dockerignore
diff --git a/agent/.gitignore b/agent/backup/.gitignore
similarity index 100%
rename from agent/.gitignore
rename to agent/backup/.gitignore
diff --git a/agent/.golangci.yml b/agent/backup/.golangci.yml
similarity index 100%
rename from agent/.golangci.yml
rename to agent/backup/.golangci.yml
diff --git a/agent/CLAUDE.md b/agent/backup/CLAUDE.md
similarity index 100%
rename from agent/CLAUDE.md
rename to agent/backup/CLAUDE.md
diff --git a/agent/Makefile b/agent/backup/Makefile
similarity index 100%
rename from agent/Makefile
rename to agent/backup/Makefile
diff --git a/agent/cmd/main.go b/agent/backup/cmd/main.go
similarity index 100%
rename from agent/cmd/main.go
rename to agent/backup/cmd/main.go
diff --git a/agent/cmd/wal-generator/main.go b/agent/backup/cmd/wal-generator/main.go
similarity index 100%
rename from agent/cmd/wal-generator/main.go
rename to agent/backup/cmd/wal-generator/main.go
diff --git a/agent/e2e/.gitignore b/agent/backup/e2e/.gitignore
similarity index 100%
rename from agent/e2e/.gitignore
rename to agent/backup/e2e/.gitignore
diff --git a/agent/e2e/Dockerfile.agent-builder b/agent/backup/e2e/Dockerfile.agent-builder
similarity index 100%
rename from agent/e2e/Dockerfile.agent-builder
rename to agent/backup/e2e/Dockerfile.agent-builder
diff --git a/agent/e2e/Dockerfile.agent-docker b/agent/backup/e2e/Dockerfile.agent-docker
similarity index 100%
rename from agent/e2e/Dockerfile.agent-docker
rename to agent/backup/e2e/Dockerfile.agent-docker
diff --git a/agent/e2e/Dockerfile.agent-runner b/agent/backup/e2e/Dockerfile.agent-runner
similarity index 100%
rename from agent/e2e/Dockerfile.agent-runner
rename to agent/backup/e2e/Dockerfile.agent-runner
diff --git a/agent/e2e/Dockerfile.backup-restore-runner b/agent/backup/e2e/Dockerfile.backup-restore-runner
similarity index 100%
rename from agent/e2e/Dockerfile.backup-restore-runner
rename to agent/backup/e2e/Dockerfile.backup-restore-runner
diff --git a/agent/e2e/Dockerfile.mock-server b/agent/backup/e2e/Dockerfile.mock-server
similarity index 100%
rename from agent/e2e/Dockerfile.mock-server
rename to agent/backup/e2e/Dockerfile.mock-server
diff --git a/agent/e2e/docker-compose.backup-restore.yml b/agent/backup/e2e/docker-compose.backup-restore.yml
similarity index 100%
rename from agent/e2e/docker-compose.backup-restore.yml
rename to agent/backup/e2e/docker-compose.backup-restore.yml
diff --git a/agent/e2e/docker-compose.yml b/agent/backup/e2e/docker-compose.yml
similarity index 100%
rename from agent/e2e/docker-compose.yml
rename to agent/backup/e2e/docker-compose.yml
diff --git a/agent/e2e/mock-server/main.go b/agent/backup/e2e/mock-server/main.go
similarity index 100%
rename from agent/e2e/mock-server/main.go
rename to agent/backup/e2e/mock-server/main.go
diff --git a/agent/e2e/scripts/backup-restore-helpers.sh b/agent/backup/e2e/scripts/backup-restore-helpers.sh
similarity index 100%
rename from agent/e2e/scripts/backup-restore-helpers.sh
rename to agent/backup/e2e/scripts/backup-restore-helpers.sh
diff --git a/agent/e2e/scripts/run-all.sh b/agent/backup/e2e/scripts/run-all.sh
similarity index 100%
rename from agent/e2e/scripts/run-all.sh
rename to agent/backup/e2e/scripts/run-all.sh
diff --git a/agent/e2e/scripts/test-pg-docker-exec.sh b/agent/backup/e2e/scripts/test-pg-docker-exec.sh
similarity index 100%
rename from agent/e2e/scripts/test-pg-docker-exec.sh
rename to agent/backup/e2e/scripts/test-pg-docker-exec.sh
diff --git a/agent/e2e/scripts/test-pg-host-bindir.sh b/agent/backup/e2e/scripts/test-pg-host-bindir.sh
similarity index 100%
rename from agent/e2e/scripts/test-pg-host-bindir.sh
rename to agent/backup/e2e/scripts/test-pg-host-bindir.sh
diff --git a/agent/e2e/scripts/test-pg-host-path.sh b/agent/backup/e2e/scripts/test-pg-host-path.sh
similarity index 100%
rename from agent/e2e/scripts/test-pg-host-path.sh
rename to agent/backup/e2e/scripts/test-pg-host-path.sh
diff --git a/agent/e2e/scripts/test-upgrade-background.sh b/agent/backup/e2e/scripts/test-upgrade-background.sh
similarity index 100%
rename from agent/e2e/scripts/test-upgrade-background.sh
rename to agent/backup/e2e/scripts/test-upgrade-background.sh
diff --git a/agent/e2e/scripts/test-upgrade-skip.sh b/agent/backup/e2e/scripts/test-upgrade-skip.sh
similarity index 100%
rename from agent/e2e/scripts/test-upgrade-skip.sh
rename to agent/backup/e2e/scripts/test-upgrade-skip.sh
diff --git a/agent/e2e/scripts/test-upgrade-success.sh b/agent/backup/e2e/scripts/test-upgrade-success.sh
similarity index 100%
rename from agent/e2e/scripts/test-upgrade-success.sh
rename to agent/backup/e2e/scripts/test-upgrade-success.sh
diff --git a/agent/e2e/scripts/test-wal-archive-cleanup.sh b/agent/backup/e2e/scripts/test-wal-archive-cleanup.sh
similarity index 100%
rename from agent/e2e/scripts/test-wal-archive-cleanup.sh
rename to agent/backup/e2e/scripts/test-wal-archive-cleanup.sh
diff --git a/agent/go.mod b/agent/backup/go.mod
similarity index 100%
rename from agent/go.mod
rename to agent/backup/go.mod
diff --git a/agent/go.sum b/agent/backup/go.sum
similarity index 100%
rename from agent/go.sum
rename to agent/backup/go.sum
diff --git a/agent/internal/config/config.go b/agent/backup/internal/config/config.go
similarity index 100%
rename from agent/internal/config/config.go
rename to agent/backup/internal/config/config.go
diff --git a/agent/internal/config/config_test.go b/agent/backup/internal/config/config_test.go
similarity index 100%
rename from agent/internal/config/config_test.go
rename to agent/backup/internal/config/config_test.go
diff --git a/agent/internal/config/dto.go b/agent/backup/internal/config/dto.go
similarity index 100%
rename from agent/internal/config/dto.go
rename to agent/backup/internal/config/dto.go
diff --git a/agent/internal/features/api/api.go b/agent/backup/internal/features/api/api.go
similarity index 100%
rename from agent/internal/features/api/api.go
rename to agent/backup/internal/features/api/api.go
diff --git a/agent/internal/features/api/dto.go b/agent/backup/internal/features/api/dto.go
similarity index 100%
rename from agent/internal/features/api/dto.go
rename to agent/backup/internal/features/api/dto.go
diff --git a/agent/internal/features/api/idle_timeout_reader.go b/agent/backup/internal/features/api/idle_timeout_reader.go
similarity index 100%
rename from agent/internal/features/api/idle_timeout_reader.go
rename to agent/backup/internal/features/api/idle_timeout_reader.go
diff --git a/agent/internal/features/api/idle_timeout_reader_test.go b/agent/backup/internal/features/api/idle_timeout_reader_test.go
similarity index 100%
rename from agent/internal/features/api/idle_timeout_reader_test.go
rename to agent/backup/internal/features/api/idle_timeout_reader_test.go
diff --git a/agent/internal/features/full_backup/backuper.go b/agent/backup/internal/features/full_backup/backuper.go
similarity index 100%
rename from agent/internal/features/full_backup/backuper.go
rename to agent/backup/internal/features/full_backup/backuper.go
diff --git a/agent/internal/features/full_backup/backuper_test.go b/agent/backup/internal/features/full_backup/backuper_test.go
similarity index 100%
rename from agent/internal/features/full_backup/backuper_test.go
rename to agent/backup/internal/features/full_backup/backuper_test.go
diff --git a/agent/internal/features/full_backup/stderr_parser.go b/agent/backup/internal/features/full_backup/stderr_parser.go
similarity index 100%
rename from agent/internal/features/full_backup/stderr_parser.go
rename to agent/backup/internal/features/full_backup/stderr_parser.go
diff --git a/agent/internal/features/full_backup/stderr_parser_test.go b/agent/backup/internal/features/full_backup/stderr_parser_test.go
similarity index 100%
rename from agent/internal/features/full_backup/stderr_parser_test.go
rename to agent/backup/internal/features/full_backup/stderr_parser_test.go
diff --git a/agent/internal/features/restore/restorer.go b/agent/backup/internal/features/restore/restorer.go
similarity index 100%
rename from agent/internal/features/restore/restorer.go
rename to agent/backup/internal/features/restore/restorer.go
diff --git a/agent/internal/features/restore/restorer_test.go b/agent/backup/internal/features/restore/restorer_test.go
similarity index 100%
rename from agent/internal/features/restore/restorer_test.go
rename to agent/backup/internal/features/restore/restorer_test.go
diff --git a/agent/internal/features/start/daemon.go b/agent/backup/internal/features/start/daemon.go
similarity index 100%
rename from agent/internal/features/start/daemon.go
rename to agent/backup/internal/features/start/daemon.go
diff --git a/agent/internal/features/start/daemon_windows.go b/agent/backup/internal/features/start/daemon_windows.go
similarity index 100%
rename from agent/internal/features/start/daemon_windows.go
rename to agent/backup/internal/features/start/daemon_windows.go
diff --git a/agent/internal/features/start/lock.go b/agent/backup/internal/features/start/lock.go
similarity index 100%
rename from agent/internal/features/start/lock.go
rename to agent/backup/internal/features/start/lock.go
diff --git a/agent/internal/features/start/lock_test.go b/agent/backup/internal/features/start/lock_test.go
similarity index 100%
rename from agent/internal/features/start/lock_test.go
rename to agent/backup/internal/features/start/lock_test.go
diff --git a/agent/internal/features/start/lock_watcher.go b/agent/backup/internal/features/start/lock_watcher.go
similarity index 100%
rename from agent/internal/features/start/lock_watcher.go
rename to agent/backup/internal/features/start/lock_watcher.go
diff --git a/agent/internal/features/start/lock_watcher_test.go b/agent/backup/internal/features/start/lock_watcher_test.go
similarity index 100%
rename from agent/internal/features/start/lock_watcher_test.go
rename to agent/backup/internal/features/start/lock_watcher_test.go
diff --git a/agent/internal/features/start/lock_watcher_windows.go b/agent/backup/internal/features/start/lock_watcher_windows.go
similarity index 100%
rename from agent/internal/features/start/lock_watcher_windows.go
rename to agent/backup/internal/features/start/lock_watcher_windows.go
diff --git a/agent/internal/features/start/lock_windows.go b/agent/backup/internal/features/start/lock_windows.go
similarity index 100%
rename from agent/internal/features/start/lock_windows.go
rename to agent/backup/internal/features/start/lock_windows.go
diff --git a/agent/internal/features/start/start.go b/agent/backup/internal/features/start/start.go
similarity index 100%
rename from agent/internal/features/start/start.go
rename to agent/backup/internal/features/start/start.go
diff --git a/agent/internal/features/start/start_test.go b/agent/backup/internal/features/start/start_test.go
similarity index 100%
rename from agent/internal/features/start/start_test.go
rename to agent/backup/internal/features/start/start_test.go
diff --git a/agent/internal/features/upgrade/background_upgrader.go b/agent/backup/internal/features/upgrade/background_upgrader.go
similarity index 100%
rename from agent/internal/features/upgrade/background_upgrader.go
rename to agent/backup/internal/features/upgrade/background_upgrader.go
diff --git a/agent/internal/features/upgrade/errors.go b/agent/backup/internal/features/upgrade/errors.go
similarity index 100%
rename from agent/internal/features/upgrade/errors.go
rename to agent/backup/internal/features/upgrade/errors.go
diff --git a/agent/internal/features/upgrade/upgrader.go b/agent/backup/internal/features/upgrade/upgrader.go
similarity index 100%
rename from agent/internal/features/upgrade/upgrader.go
rename to agent/backup/internal/features/upgrade/upgrader.go
diff --git a/agent/internal/features/wal/streamer.go b/agent/backup/internal/features/wal/streamer.go
similarity index 100%
rename from agent/internal/features/wal/streamer.go
rename to agent/backup/internal/features/wal/streamer.go
diff --git a/agent/internal/features/wal/streamer_test.go b/agent/backup/internal/features/wal/streamer_test.go
similarity index 100%
rename from agent/internal/features/wal/streamer_test.go
rename to agent/backup/internal/features/wal/streamer_test.go
diff --git a/agent/internal/logger/logger.go b/agent/backup/internal/logger/logger.go
similarity index 100%
rename from agent/internal/logger/logger.go
rename to agent/backup/internal/logger/logger.go
diff --git a/agent/internal/logger/logger_test.go b/agent/backup/internal/logger/logger_test.go
similarity index 100%
rename from agent/internal/logger/logger_test.go
rename to agent/backup/internal/logger/logger_test.go