refactor: remove callback from WALArchiver factory (#18)

Signed-off-by: Armando Ruocco <[email protected]>

Author: armru

pkg/archiver/archiver.go

@@ -66,7 +66,7 @@ func New(
 	env []string,
 	spoolDirectory string,
 	pgDataDirectory string,
-	removeEmptyFileArchive func() error,
+	emptyWalArchivePath string,
 ) (archiver *WALArchiver, err error) {
 	contextLog := log.FromContext(ctx)
 	var walArchiveSpool *spool.WALSpool
@@ -81,9 +81,9 @@ func New(
 		env:             env,
 		pgDataDirectory: pgDataDirectory,
 		barmanArchiver: &walarchive.BarmanArchiver{
-			Env:                    env,
-			Touch:                  walArchiveSpool.Touch,
-			RemoveEmptyFileArchive: removeEmptyFileArchive,
+			Env:                 env,
+			Touch:               walArchiveSpool.Touch,
+			EmptyWalArchivePath: emptyWalArchivePath,
 		},
 	}
 	return archiver, nil

pkg/archiver/command_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package archiver
 
 import (
+	"os"
 	"strings"
 
 	barmanApi "github.com/cloudnative-pg/barman-cloud/pkg/api"
@@ -27,6 +28,8 @@ import (
 
 var _ = Describe("barmanCloudWalArchiveOptions", func() {
 	var config *barmanApi.BarmanObjectStoreConfiguration
+	var tempDir string
+	var tempEmptyWalArchivePath string
 
 	BeforeEach(func() {
 		config = &barmanApi.BarmanObjectStoreConfiguration{
@@ -36,10 +39,20 @@ var _ = Describe("barmanCloudWalArchiveOptions", func() {
 				Encryption:  "aes256",
 			},
 		}
+		var err error
+		tempDir, err = os.MkdirTemp(os.TempDir(), "command_test")
+		Expect(err).ToNot(HaveOccurred())
+		file, err := os.CreateTemp(tempDir, "empty-wal-archive-path")
+		Expect(err).ToNot(HaveOccurred())
+		tempEmptyWalArchivePath = file.Name()
+	})
+	AfterEach(func() {
+		err := os.RemoveAll(tempDir)
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("should generate correct arguments", func(ctx SpecContext) {
-		archiver, err := New(ctx, nil, "spool", "pgdata", nil)
+		archiver, err := New(ctx, nil, "spool", "pgdata", tempEmptyWalArchivePath)
 		Expect(err).ToNot(HaveOccurred())
 
 		extraOptions := []string{"--min-chunk-size=5MB", "--read-timeout=60", "-vv"}
@@ -66,7 +79,7 @@ var _ = Describe("barmanCloudWalArchiveOptions", func() {
 		config.Wal.ArchiveAdditionalCommandArgs = extraOptions
 
 		archiver, err := New(
-			ctx, nil, "spool", "pgdata", nil)
+			ctx, nil, "spool", "pgdata", tempEmptyWalArchivePath)
 		Expect(err).ToNot(HaveOccurred())
 
 		options, err := archiver.BarmanCloudWalArchiveOptions(ctx, config, "test-cluster")

pkg/walarchive/cmd.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/cloudnative-pg/machinery/pkg/execlog"
+	"github.com/cloudnative-pg/machinery/pkg/fileutils"
 	"github.com/cloudnative-pg/machinery/pkg/log"
 
 	barmanCapabilities "github.com/cloudnative-pg/barman-cloud/pkg/capabilities"
@@ -33,9 +34,9 @@ import (
 // BarmanArchiver implements a WAL archiver based
 // on Barman cloud
 type BarmanArchiver struct {
-	Env                    []string
-	Touch                  func(walFile string) error
-	RemoveEmptyFileArchive func() error
+	Env                 []string
+	Touch               func(walFile string) error
+	EmptyWalArchivePath string
 }
 
 // WALArchiverResult contains the result of the archival of one WAL
@@ -89,7 +90,10 @@ func (archiver *BarmanArchiver) Archive(
 
 	// Removes the `.check-empty-wal-archive` file inside PGDATA after the
 	// first successful archival of a WAL file.
-	return archiver.RemoveEmptyFileArchive()
+	if err := fileutils.RemoveFile(archiver.EmptyWalArchivePath); err != nil {
+		return fmt.Errorf("error while deleting the check WAL file flag: %w", err)
+	}
+	return nil
 }
 
 // ArchiveList archives a list of WAL files in parallel