From 2d351c9d53fcacead9197bee0f489c765730bad4 Mon Sep 17 00:00:00 2001 From: Gerrit Date: Wed, 7 Feb 2024 13:24:42 +0100 Subject: [PATCH] Adapt. --- cmd/internal/database/localfs/localfs.go | 22 +++++++++++++++------- cmd/main.go | 6 ++---- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cmd/internal/database/localfs/localfs.go b/cmd/internal/database/localfs/localfs.go index 7ee4d22..dcd5539 100644 --- a/cmd/internal/database/localfs/localfs.go +++ b/cmd/internal/database/localfs/localfs.go @@ -1,35 +1,43 @@ package localfs -import "go.uber.org/zap" +import ( + "context" + "log/slog" +) type LocalFS struct { datadir string - log *zap.SugaredLogger + log *slog.Logger } -func New(log *zap.SugaredLogger, datadir string) *LocalFS { +func New(log *slog.Logger, datadir string) *LocalFS { return &LocalFS{ datadir: datadir, log: log, } } -func (l *LocalFS) Check() (bool, error) { +func (l *LocalFS) Check(ctx context.Context) (bool, error) { //ToDo: check if Datadir empty -> true return true, nil } -func (l *LocalFS) Backup() error { +func (l *LocalFS) Backup(ctx context.Context) error { //ToDo: put Datadir into compressed archive return nil } -func (l *LocalFS) Recover() error { +func (l *LocalFS) Recover(ctx context.Context) error { //ToDo: decompress archive into Datadir return nil } -func (l *LocalFS) Probe() error { +func (l *LocalFS) Probe(ctx context.Context) error { //Nothing to do, not a real Database return nil } + +func (_ *LocalFS) Upgrade(ctx context.Context) error { + // Nothing to do here + return nil +} diff --git a/cmd/main.go b/cmd/main.go index 008d778..68ea451 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -9,8 +9,6 @@ import ( "os/signal" "strings" - "github.com/metal-stack/backup-restore-sidecar/cmd/internal/database/localfs" - v1 "github.com/metal-stack/backup-restore-sidecar/api/v1" "github.com/metal-stack/backup-restore-sidecar/cmd/internal/backup" "github.com/metal-stack/backup-restore-sidecar/cmd/internal/backup/providers" @@ -20,6 +18,7 @@ import ( "github.com/metal-stack/backup-restore-sidecar/cmd/internal/compress" "github.com/metal-stack/backup-restore-sidecar/cmd/internal/database" "github.com/metal-stack/backup-restore-sidecar/cmd/internal/database/etcd" + "github.com/metal-stack/backup-restore-sidecar/cmd/internal/database/localfs" "github.com/metal-stack/backup-restore-sidecar/cmd/internal/database/meilisearch" "github.com/metal-stack/backup-restore-sidecar/cmd/internal/database/postgres" "github.com/metal-stack/backup-restore-sidecar/cmd/internal/database/redis" @@ -463,10 +462,9 @@ func initDatabase() error { } case "localfs": db = localfs.New( - logger.Named("localfs"), + logger.WithGroup("localfs"), datadir, ) - default: return fmt.Errorf("unsupported database type: %s", dbString) }