Merge pull request #39 from mittwald/fix/postgres-directory-backup-restore

Fix Postgres Directory Restore

Author: dermodmaster

pkg/source/pgrestore/backend_config_based.go

@@ -33,17 +33,32 @@ func NewConfigBasedBackend() (*ConfigBasedBackend, error) {
 }
 
 func (b *ConfigBasedBackend) RestoreBackup(ctx context.Context) error {
-	fileName, err := cli.CheckAndGunzipFile(b.cfg.Options.SourceFile)
-	if err != nil {
-		return err
+	// Check if SourceFile is a directory (i.e., a pg_dump directory format)
+	src := b.cfg.Options.SourceFile
+	info, statErr := os.Stat(src)
+	if statErr != nil {
+		return statErr
+	}
+
+	fileName := src
+
+	if !info.IsDir() {
+		unzippedFileName, err := cli.CheckAndGunzipFile(src)
+		if err != nil {
+			return err
+		}
+
+		fileName = unzippedFileName
 	}
+
 	args := append(cli.StructToCLI(b.cfg.Options.Flags), b.cfg.Options.AdditionalArgs...)
 	args = append(args, fileName)
 	cmd := cli.CommandType{
 		Binary: binary,
 		Args:   args,
 	}
 	var out []byte
+	var err error
 	out, err = cli.Run(ctx, cmd)
 	if err != nil {
 		return errors.WithStack(fmt.Errorf("%+v - %s", err, out))

test/pkg/source/postgrestest/postgres_test.go

@@ -26,6 +26,7 @@ import (
 const pgPort = "5432/tcp"
 const backupPath = "/tmp/postgres.dump.tar"
 const backupPathPlain = "/tmp/postgres.dump"
+const backupPathDir = "/tmp/postgres-dir"
 const backupPathZip = "/tmp/postgres.dump.tar.gz"
 const backupPathPlainZip = "/tmp/postgres.dump.gz"
 const postgresPW = "postgresroot"
@@ -122,6 +123,71 @@ func (pgDumpAndRestoreTestSuite *PGDumpAndRestoreTestSuite) TestBasicPGDumpAndRe
 	assert.DeepEqual(pgDumpAndRestoreTestSuite.T(), testDataPlain, restoreResultPlain)
 }
 
+// TestBasicPGDumpAndRestoreDirectory führt einen Integrationstest mit Directory-Format (-F d) durch, ohne Restic
+func (pgDumpAndRestoreTestSuite *PGDumpAndRestoreTestSuite) TestBasicPGDumpAndRestoreDirectory() {
+	ctx := context.Background()
+
+	// Verzeichnis nach dem Test aufräumen
+	defer func() {
+		removeErr := os.RemoveAll(backupPathDir)
+		if removeErr != nil {
+			log.WithError(removeErr).Error("failed to remove pgdump directory backup")
+		}
+	}()
+
+	log.Info("Testing postgres restoration with directory dump via pg_restore")
+	// Backup mit Directory-Format erstellen
+	testData, err := pgDoBackup(
+		ctx, false, commons.TestContainerSetup{
+			Port:    "",
+			Address: "",
+		},
+		"d", backupPathDir,
+	)
+	pgDumpAndRestoreTestSuite.Require().NoError(err)
+
+	// In neuen Container restoren und Daten verifizieren
+	restoreResult, err := pgDoRestore(
+		ctx, false, commons.TestContainerSetup{
+			Port:    "",
+			Address: "",
+		},
+		"d", backupPathDir,
+	)
+	pgDumpAndRestoreTestSuite.Require().NoError(err)
+
+	assert.DeepEqual(pgDumpAndRestoreTestSuite.T(), testData, restoreResult)
+}
+
+// TestPGDumpAndRestoreDirectoryRestic testet Directory-Format (-F d) mit Restic
+func (pgDumpAndRestoreTestSuite *PGDumpAndRestoreTestSuite) TestPGDumpAndRestoreDirectoryRestic() {
+	ctx := context.Background()
+
+	defer func() {
+		removeErr := os.RemoveAll(backupPathDir)
+		if removeErr != nil {
+			log.WithError(removeErr).Error("failed to remove pgdump directory backup (restic)")
+		}
+	}()
+
+	resticContainer, err := commons.NewTestContainerSetup(ctx, &commons.ResticReq, commons.ResticPort)
+	pgDumpAndRestoreTestSuite.Require().NoError(err)
+	defer func() {
+		resticErr := resticContainer.Container.Terminate(ctx)
+		if resticErr != nil {
+			log.WithError(resticErr).Error("failed to terminate directory restic container")
+		}
+	}()
+
+	testData, err := pgDoBackup(ctx, true, resticContainer, "d", backupPathDir)
+	pgDumpAndRestoreTestSuite.Require().NoError(err)
+
+	restoreResult, err := pgDoRestore(ctx, true, resticContainer, "d", backupPathDir)
+	pgDumpAndRestoreTestSuite.Require().NoError(err)
+
+	assert.DeepEqual(pgDumpAndRestoreTestSuite.T(), testData, restoreResult)
+}
+
 // TestBasicPGDumpZip performs an integration test for brudi pgdump, with gzip and without use of restic
 func (pgDumpAndRestoreTestSuite *PGDumpAndRestoreTestSuite) TestBasicPGDumpAndRestoreGzip() {
 	ctx := context.Background()