fixup! feat: backup revolution

cli/app/restore.go

@@ -1,20 +1,12 @@
 package app
 
 import (
-	"context"
 	"fmt"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
-	"coopcloud.tech/abra/pkg/config"
-	containerPkg "coopcloud.tech/abra/pkg/container"
 	"coopcloud.tech/abra/pkg/recipe"
-	"coopcloud.tech/abra/pkg/service"
-	"coopcloud.tech/abra/pkg/upstream/container"
-	"github.com/docker/cli/cli/command"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
@@ -66,21 +58,7 @@ var appRestoreCommand = cli.Command{
 			logrus.Fatal(err)
 		}
 
-		chosenService, err := service.GetServiceByLabel(context.Background(), cl, config.BackupbotLabel, internal.NoInput)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		logrus.Debugf("retrieved %s as backup enabled service", chosenService.Spec.Name)
-
-		filters := filters.NewArgs()
-		filters.Add("name", chosenService.Spec.Name)
-		targetContainer, err := containerPkg.GetContainer(
-			context.Background(),
-			cl,
-			filters,
-			internal.NoInput,
-		)
+		targetContainer, err := internal.RetrieveBackupBotContainer(cl)
 		if err != nil {
 			logrus.Fatal(err)
 		}
@@ -94,25 +72,8 @@ var appRestoreCommand = cli.Command{
 			logrus.Debugf("including TARGET=%s in backupbot exec invocation", targetPath)
 			execEnv = append(execEnv, fmt.Sprintf("TARGET=%s", targetPath))
 		}
-		execBackupListOpts := types.ExecConfig{
-			AttachStderr: true,
-			AttachStdin:  true,
-			AttachStdout: true,
-			Cmd:          []string{"/usr/bin/backup", "--", "restore"},
-			Detach:       false,
-			Env:          execEnv,
-			Tty:          true,
-		}
 
-		logrus.Debugf("running backup list on %s with exec config %v", targetContainer.ID, execBackupListOpts)
-
-		// FIXME: avoid instantiating a new CLI
-		dcli, err := command.NewDockerCli()
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		if _, err := container.RunExec(dcli, cl, targetContainer.ID, &execBackupListOpts); err != nil {
+		if err := internal.RunBackupCmdRemote(cl, "restore", targetContainer.ID, execEnv); err != nil {
 			logrus.Fatal(err)
 		}