Skip to content

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

FIX (storages): Clean up backups on storage change

Rostislav Dugin84cbf5782bed
diff --git a/backend/internal/features/backups/backups/service.go b/backend/internal/features/backups/backups/service.go
index b3eb8f65..ac9deaba 100644
--- a/backend/internal/features/backups/backups/service.go
+++ b/backend/internal/features/backups/backups/service.go
@@ -34,10 +34,7 @@ func (s *BackupService) AddBackupRemoveListener(listener BackupRemoveListener) {
s.backupRemoveListeners = append(s.backupRemoveListeners, listener)
}
-func (s *BackupService) OnBeforeBackupsStorageChange(
- databaseID uuid.UUID,
- storageID uuid.UUID,
-) error {
+func (s *BackupService) OnBeforeBackupsStorageChange(databaseID uuid.UUID) error {
err := s.deleteDbBackups(databaseID)
if err != nil {
return err
diff --git a/backend/internal/features/backups/config/controller.go b/backend/internal/features/backups/config/controller.go
index 97596522..a087c3c0 100644
--- a/backend/internal/features/backups/config/controller.go
+++ b/backend/internal/features/backups/config/controller.go
@@ -32,8 +32,8 @@ func (c *BackupConfigController) RegisterRoutes(router *gin.RouterGroup) {
// @Failure 500
// @Router /backup-configs/save [post]
func (c *BackupConfigController) SaveBackupConfig(ctx *gin.Context) {
- var request BackupConfig
- if err := ctx.ShouldBindJSON(&request); err != nil {
+ var requestDTO BackupConfig
+ if err := ctx.ShouldBindJSON(&requestDTO); err != nil {
ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
@@ -44,13 +44,16 @@ func (c *BackupConfigController) SaveBackupConfig(ctx *gin.Context) {
return
}
- _, err := c.userService.GetUserFromToken(authorizationHeader)
+ user, err := c.userService.GetUserFromToken(authorizationHeader)
if err != nil {
ctx.JSON(http.StatusUnauthorized, gin.H{"error": "invalid token"})
return
}
- savedConfig, err := c.backupConfigService.SaveBackupConfig(&request)
+ // make sure we rely on full .Storage object
+ requestDTO.StorageID = nil
+
+ savedConfig, err := c.backupConfigService.SaveBackupConfigWithAuth(user, &requestDTO)
if err != nil {
ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
diff --git a/backend/internal/features/backups/config/interfaces.go b/backend/internal/features/backups/config/interfaces.go
index b9f6cbfa..9d5a49f3 100644
--- a/backend/internal/features/backups/config/interfaces.go
+++ b/backend/internal/features/backups/config/interfaces.go
@@ -3,5 +3,5 @@ package backups_config
import "github.com/google/uuid"
type BackupConfigStorageChangeListener interface {
- OnBeforeBackupsStorageChange(dbID uuid.UUID, storageID uuid.UUID) error
+ OnBeforeBackupsStorageChange(dbID uuid.UUID) error
}
diff --git a/backend/internal/features/backups/config/service.go b/backend/internal/features/backups/config/service.go
index 1a4163df..3f17d4d0 100644
--- a/backend/internal/features/backups/config/service.go
+++ b/backend/internal/features/backups/config/service.go
@@ -57,25 +57,17 @@ func (s *BackupConfigService) SaveBackupConfig(
// If storage is changing, notify the listener
if s.dbStorageChangeListener != nil &&
!storageIDsEqual(existingConfig.StorageID, backupConfig.StorageID) {
- var newStorageID uuid.UUID
-
- if backupConfig.StorageID != nil {
- newStorageID = *backupConfig.StorageID
- }
-
if err := s.dbStorageChangeListener.OnBeforeBackupsStorageChange(
backupConfig.DatabaseID,
- newStorageID,
); err != nil {
return nil, err
}
}
}
- if !backupConfig.IsBackupsEnabled && backupConfig.StorageID != nil {
+ if !backupConfig.IsBackupsEnabled && existingConfig.StorageID != nil {
if err := s.dbStorageChangeListener.OnBeforeBackupsStorageChange(
backupConfig.DatabaseID,
- *backupConfig.StorageID,
); err != nil {
return nil, err
}