Skip to content

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

FIX (storages): Load storage from StorageRepository in critical places to join all relations

Rostislav Duginec070d96c02e
diff --git a/backend/internal/features/backups/background_service.go b/backend/internal/features/backups/background_service.go
index 7d17fce7..8d519085 100644
--- a/backend/internal/features/backups/background_service.go
+++ b/backend/internal/features/backups/background_service.go
@@ -3,6 +3,7 @@ package backups
import (
"postgresus-backend/internal/config"
"postgresus-backend/internal/features/databases"
+ "postgresus-backend/internal/features/storages"
"postgresus-backend/internal/util/logger"
"time"
)
@@ -11,6 +12,7 @@ type BackupBackgroundService struct {
backupService *BackupService
backupRepository *BackupRepository
databaseService *databases.DatabaseService
+ storageService *storages.StorageService
lastBackupTime time.Time
}
@@ -111,7 +113,19 @@ func (s *BackupBackgroundService) cleanOldBackups() error {
}
for _, backup := range oldBackups {
- backup.DeleteBackupFromStorage()
+ storage, err := s.storageService.GetStorageByID(backup.StorageID)
+ if err != nil {
+ log.Error(
+ "Failed to get storage by ID",
+ "storageId",
+ backup.StorageID,
+ "error",
+ err,
+ )
+ continue
+ }
+
+ storage.DeleteFile(backup.ID)
if err := s.backupRepository.DeleteByID(backup.ID); err != nil {
log.Error("Failed to delete old backup", "backupId", backup.ID, "error", err)
diff --git a/backend/internal/features/backups/di.go b/backend/internal/features/backups/di.go
index 2f071542..aabb419a 100644
--- a/backend/internal/features/backups/di.go
+++ b/backend/internal/features/backups/di.go
@@ -27,6 +27,7 @@ var backupBackgroundService = &BackupBackgroundService{
backupService,
backupRepository,
databases.GetDatabaseService(),
+ storages.GetStorageService(),
time.Now().UTC(),
}
diff --git a/backend/internal/features/restores/di.go b/backend/internal/features/restores/di.go
index 80405dc8..94faa362 100644
--- a/backend/internal/features/restores/di.go
+++ b/backend/internal/features/restores/di.go
@@ -3,6 +3,7 @@ package restores
import (
"postgresus-backend/internal/features/backups"
"postgresus-backend/internal/features/restores/usecases"
+ "postgresus-backend/internal/features/storages"
"postgresus-backend/internal/features/users"
)
@@ -11,6 +12,7 @@ var restoreRepository = &RestoreRepository{}
var restoreService = &RestoreService{
backups.GetBackupService(),
restoreRepository,
+ storages.GetStorageService(),
restoreBackupUsecase,
}
var restoreController = &RestoreController{
diff --git a/backend/internal/features/restores/service.go b/backend/internal/features/restores/service.go
index c7ff3a87..c0a8fa4d 100644
--- a/backend/internal/features/restores/service.go
+++ b/backend/internal/features/restores/service.go
@@ -7,6 +7,7 @@ import (
"postgresus-backend/internal/features/restores/enums"
"postgresus-backend/internal/features/restores/models"
"postgresus-backend/internal/features/restores/usecases"
+ "postgresus-backend/internal/features/storages"
users_models "postgresus-backend/internal/features/users/models"
"time"
@@ -14,9 +15,9 @@ import (
)
type RestoreService struct {
- backupService *backups.BackupService
- restoreRepository *RestoreRepository
-
+ backupService *backups.BackupService
+ restoreRepository *RestoreRepository
+ storageService *storages.StorageService
restoreBackupUsecase *usecases.RestoreBackupUsecase
}
@@ -102,11 +103,17 @@ func (s *RestoreService) RestoreBackup(
}
}
+ storage, err := s.storageService.GetStorageByID(backup.StorageID)
+ if err != nil {
+ return err
+ }
+
start := time.Now().UTC()
- err := s.restoreBackupUsecase.Execute(
+ err = s.restoreBackupUsecase.Execute(
restore,
backup,
+ storage,
)
if err != nil {
errMsg := err.Error()
diff --git a/backend/internal/features/restores/usecases/postgresql/restore_backup_uc.go b/backend/internal/features/restores/usecases/postgresql/restore_backup_uc.go
index d506c2bd..d01babfa 100644
--- a/backend/internal/features/restores/usecases/postgresql/restore_backup_uc.go
+++ b/backend/internal/features/restores/usecases/postgresql/restore_backup_uc.go
@@ -17,6 +17,7 @@ import (
"postgresus-backend/internal/features/databases"
pgtypes "postgresus-backend/internal/features/databases/databases/postgresql"
"postgresus-backend/internal/features/restores/models"
+ "postgresus-backend/internal/features/storages"
"postgresus-backend/internal/util/logger"
"postgresus-backend/internal/util/tools"
@@ -30,6 +31,7 @@ type RestorePostgresqlBackupUsecase struct{}
func (uc *RestorePostgresqlBackupUsecase) Execute(
restore models.Restore,
backup *backups.Backup,
+ storage *storages.Storage,
) error {
if backup.Database.Type != databases.DatabaseTypePostgres {
return errors.New("database type not supported")
@@ -80,6 +82,7 @@ func (uc *RestorePostgresqlBackupUsecase) Execute(
args,
pg.Password,
backup,
+ storage,
pg,
)
}
@@ -90,6 +93,7 @@ func (uc *RestorePostgresqlBackupUsecase) restoreFromStorage(
args []string,
password string,
backup *backups.Backup,
+ storage *storages.Storage,
pgConfig *pgtypes.PostgresqlDatabase,
) error {
log.Info(
@@ -148,7 +152,7 @@ func (uc *RestorePostgresqlBackupUsecase) restoreFromStorage(
}
// Download backup to temporary file
- tempBackupFile, cleanupFunc, err := uc.downloadBackupToTempFile(ctx, backup)
+ tempBackupFile, cleanupFunc, err := uc.downloadBackupToTempFile(ctx, backup, storage)
if err != nil {
return fmt.Errorf("failed to download backup to temporary file: %w", err)
}
@@ -164,6 +168,7 @@ func (uc *RestorePostgresqlBackupUsecase) restoreFromStorage(
func (uc *RestorePostgresqlBackupUsecase) downloadBackupToTempFile(
ctx context.Context,
backup *backups.Backup,
+ storage *storages.Storage,
) (string, func(), error) {
// Create temporary directory for backup data
tempDir, err := os.MkdirTemp(config.GetEnv().TempFolder, "restore_"+uuid.New().String())
@@ -185,7 +190,7 @@ func (uc *RestorePostgresqlBackupUsecase) downloadBackupToTempFile(
"tempFile",
tempBackupFile,
)
- backupReader, err := backup.Storage.GetFile(backup.ID)
+ backupReader, err := storage.GetFile(backup.ID)
if err != nil {
cleanupFunc()
return "", nil, fmt.Errorf("failed to get backup file from storage: %w", err)
diff --git a/backend/internal/features/restores/usecases/restore_backup_uc.go b/backend/internal/features/restores/usecases/restore_backup_uc.go
index ce8df8aa..b1726349 100644
--- a/backend/internal/features/restores/usecases/restore_backup_uc.go
+++ b/backend/internal/features/restores/usecases/restore_backup_uc.go
@@ -6,6 +6,7 @@ import (
"postgresus-backend/internal/features/databases"
"postgresus-backend/internal/features/restores/models"
usecases_postgresql "postgresus-backend/internal/features/restores/usecases/postgresql"
+ "postgresus-backend/internal/features/storages"
)
type RestoreBackupUsecase struct {
@@ -15,9 +16,10 @@ type RestoreBackupUsecase struct {
func (uc *RestoreBackupUsecase) Execute(
restore models.Restore,
backup *backups.Backup,
+ storage *storages.Storage,
) error {
if restore.Backup.Database.Type == databases.DatabaseTypePostgres {
- return uc.RestorePostgresqlBackupUsecase.Execute(restore, backup)
+ return uc.RestorePostgresqlBackupUsecase.Execute(restore, backup, storage)
}
return errors.New("database type not supported")
diff --git a/backend/internal/features/tests/postgresql_backup_restore_test.go b/backend/internal/features/tests/postgresql_backup_restore_test.go
index c1cb9cad..9e7d5367 100644
--- a/backend/internal/features/tests/postgresql_backup_restore_test.go
+++ b/backend/internal/features/tests/postgresql_backup_restore_test.go
@@ -174,7 +174,7 @@ func testBackupRestoreForVersion(t *testing.T, pgVersion string) {
// Restore the backup
restoreBackupUC := &usecases_postgresql_restore.RestorePostgresqlBackupUsecase{}
- err = restoreBackupUC.Execute(restore, completedBackup)
+ err = restoreBackupUC.Execute(restore, completedBackup, storage)
assert.NoError(t, err)
// Verify restored table exists