backup: Add a logger to the Manager

Adds a logger field to be used by a subsequent commit for logging
non-critical errors.

4 files changed, 13 insertions, 10 deletions

diff --git a/internal/backup/backup.go b/internal/backup/backup.go
index a15f47abe..59e468835 100644
--- a/internal/backup/backup.go
+++ b/internal/backup/backup.go
@@ -161,6 +161,7 @@ type Manager struct {
 	sink    Sink
 	conns   *client.Pool
 	locator Locator
+	logger  log.Logger
 
 	// repositoryFactory returns an abstraction over git repositories in order
 	// to create and restore backups.
@@ -168,7 +169,7 @@ type Manager struct {
 }
 
 // NewManager creates and returns initialized *Manager instance.
-func NewManager(sink Sink, locator Locator, pool *client.Pool) *Manager {
+func NewManager(sink Sink, logger log.Logger, locator Locator, pool *client.Pool) *Manager {
 	return &Manager{
 		sink:    sink,
 		conns:   pool,
@@ -185,6 +186,7 @@ func NewManager(sink Sink, locator Locator, pool *client.Pool) *Manager {
 
 			return newRemoteRepository(repo, conn), nil
 		},
+		logger: logger,
 	}
 }
 
@@ -208,6 +210,7 @@ func NewManagerLocal(
 
 			return newLocalRepository(logger, storageLocator, gitCmdFactory, txManager, repoCounter, localRepo), nil
 		},
+		logger: logger,
 	}
 }
 
diff --git a/internal/backup/backup_test.go b/internal/backup/backup_test.go
index 81e87a33a..85f87d334 100644
--- a/internal/backup/backup_test.go
+++ b/internal/backup/backup_test.go
@@ -54,7 +54,7 @@ func TestManager_RemoveRepository(t *testing.T) {
 	locator, err := backup.ResolveLocator("pointer", sink)
 	require.NoError(t, err)
 
-	fsBackup := backup.NewManager(sink, locator, pool)
+	fsBackup := backup.NewManager(sink, testhelper.SharedLogger(t), locator, pool)
 	err = fsBackup.RemoveRepository(ctx, &backup.RemoveRepositoryRequest{
 		Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token},
 		Repo:   repo,
@@ -145,7 +145,7 @@ func TestManager_ListRepositories(t *testing.T) {
 			locator, err := backup.ResolveLocator("pointer", sink)
 			require.NoError(t, err)
 
-			fsBackup := backup.NewManager(sink, locator, pool)
+			fsBackup := backup.NewManager(sink, testhelper.SharedLogger(t), locator, pool)
 
 			for storageName, repos := range tc.repos {
 				actualRepos, err := fsBackup.ListRepositories(ctx, &backup.ListRepositoriesRequest{
@@ -184,7 +184,7 @@ func TestManager_Create(t *testing.T) {
 					testhelper.MustClose(tb, pool)
 				})
 
-				return backup.NewManager(sink, locator, pool)
+				return backup.NewManager(sink, testhelper.SharedLogger(t), locator, pool)
 			},
 		},
 		{
@@ -431,7 +431,7 @@ func TestManager_Create_incremental(t *testing.T) {
 					testhelper.MustClose(tb, pool)
 				})
 
-				return backup.NewManager(sink, locator, pool)
+				return backup.NewManager(sink, testhelper.SharedLogger(t), locator, pool)
 			},
 		},
 		{
@@ -577,7 +577,7 @@ func TestManager_Restore_latest(t *testing.T) {
 					testhelper.MustClose(tb, pool)
 				})
 
-				return backup.NewManager(sink, locator, pool)
+				return backup.NewManager(sink, testhelper.SharedLogger(t), locator, pool)
 			},
 		},
 		{
@@ -918,7 +918,7 @@ func TestManager_Restore_specific(t *testing.T) {
 					testhelper.MustClose(tb, pool)
 				})
 
-				return backup.NewManager(sink, locator, pool)
+				return backup.NewManager(sink, testhelper.SharedLogger(t), locator, pool)
 			},
 		},
 		{
@@ -1198,7 +1198,7 @@ func TestManager_CreateRestore_contextServerInfo(t *testing.T) {
 	locator, err := backup.ResolveLocator("pointer", sink)
 	require.NoError(t, err)
 
-	fsBackup := backup.NewManager(sink, locator, pool)
+	fsBackup := backup.NewManager(sink, testhelper.SharedLogger(t), locator, pool)
 
 	ctx = testhelper.MergeIncomingMetadata(ctx, testcfg.GitalyServersMetadataFromCfg(t, cfg))
 
diff --git a/internal/cli/gitalybackup/create.go b/internal/cli/gitalybackup/create.go
index be7e75cdb..6e6396adc 100644
--- a/internal/cli/gitalybackup/create.go
+++ b/internal/cli/gitalybackup/create.go
@@ -140,7 +140,7 @@ func (cmd *createSubcommand) run(ctx context.Context, logger log.Logger, stdin i
 			return fmt.Errorf("create: resolve locator: %w", err)
 		}
 
-		manager = backup.NewManager(sink, locator, pool)
+		manager = backup.NewManager(sink, logger, locator, pool)
 	}
 
 	var opts []backup.PipelineOption
diff --git a/internal/cli/gitalybackup/restore.go b/internal/cli/gitalybackup/restore.go
index 7a3833f80..c80c1e2ba 100644
--- a/internal/cli/gitalybackup/restore.go
+++ b/internal/cli/gitalybackup/restore.go
@@ -132,7 +132,7 @@ func (cmd *restoreSubcommand) run(ctx context.Context, logger log.Logger, stdin
 		if err != nil {
 			return fmt.Errorf("restore: resolve locator: %w", err)
 		}
-		manager = backup.NewManager(sink, locator, pool)
+		manager = backup.NewManager(sink, logger, locator, pool)
 	}
 
 	// Get the set of existing repositories keyed by storage. We'll later use this to determine any