PBM-1649 Support profiles in cleanup and delete-backup

cmd/pbm-agent/delete.go

@@ -95,8 +95,13 @@ func (a *Agent) Delete(ctx context.Context, d *ctrl.DeleteBackupCmd, opid ctrl.O
 			return
 		}
 
-		l.Info("deleting backups older than %v", t)
-		err = backup.DeleteBackupBefore(ctx, a.leadConn, t, bcpType, nodeInfo.Me)
+		stg, err := util.GetProfiledStorage(ctx, a.leadConn, d.Profile, nodeInfo.Me, l)
+		if err != nil {
+			l.Error("get storage: %v", err)
+			return
+		}
+		l.Info("deleting backups (profile: %q) older than %v", d.Profile, t)
+		err = backup.DeleteBackupBefore(ctx, a.leadConn, stg, d.Profile, bcpType, t)
 		if err != nil {
 			l.Error("deleting: %v", err)
 			return
@@ -254,20 +259,22 @@ func (a *Agent) Cleanup(ctx context.Context, d *ctrl.CleanupCmd, opid ctrl.OPID,
 		return
 	}
 
-	cfg, err := config.GetConfig(ctx, a.leadConn)
+	cfg, err := config.GetProfiledConfig(ctx, a.leadConn, d.Profile)
 	if err != nil {
 		l.Error("get config: %v", err)
+		return
 	}
 
 	stg, err := util.StorageFromConfig(&cfg.Storage, a.brief.Me, l)
 	if err != nil {
 		l.Error("get storage: " + err.Error())
+		return
 	}
 
 	eg := errgroup.Group{}
 	eg.SetLimit(runtime.NumCPU())
 
-	cr, err := backup.MakeCleanupInfo(ctx, a.leadConn, d.OlderThan)
+	cr, err := backup.MakeCleanupInfo(ctx, a.leadConn, d.OlderThan, d.Profile)
 	if err != nil {
 		l.Error("make cleanup report: " + err.Error())
 		return
@@ -289,15 +296,18 @@ func (a *Agent) Cleanup(ctx context.Context, d *ctrl.CleanupCmd, opid ctrl.OPID,
 		bcp := &cr.Backups[i]
 
 		eg.Go(func() error {
-			err := backup.DeleteBackupFiles(stg, bcp.Name)
-			return errors.Wrapf(err, "delete backup files %q", bcp.Name)
+			err := backup.DeleteBackupData(ctx, a.leadConn, stg, bcp.Name)
+			return errors.Wrapf(err, "delete backup %q", bcp.Name)
 		})
 	}
 	if err := eg.Wait(); err != nil {
 		l.Error(err.Error())
 	}
 
-	err = resync.Resync(ctx, a.leadConn, &cfg.Storage, a.brief.Me, false)
+	if d.Profile == "" {
+		err = resync.Resync(ctx, a.leadConn, &cfg.Storage, a.brief.Me, false)
+	}
+
 	if err != nil {
 		l.Error("storage resync: " + err.Error())
 	}
@@ -306,7 +316,7 @@ func (a *Agent) Cleanup(ctx context.Context, d *ctrl.CleanupCmd, opid ctrl.OPID,
 func (a *Agent) deletePITRImpl(ctx context.Context, ts primitive.Timestamp) error {
 	l := log.LogEventFromContext(ctx)
 
-	r, err := backup.MakeCleanupInfo(ctx, a.leadConn, ts)
+	r, err := backup.MakeCleanupInfo(ctx, a.leadConn, ts, "")
 	if err != nil {
 		return errors.Wrap(err, "get pitr chunks")
 	}

cmd/pbm/delete.go

@@ -12,6 +12,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 	"github.com/percona/percona-backup-mongodb/pbm/backup"
+	"github.com/percona/percona-backup-mongodb/pbm/config"
 	"github.com/percona/percona-backup-mongodb/pbm/connect"
 	"github.com/percona/percona-backup-mongodb/pbm/ctrl"
 	"github.com/percona/percona-backup-mongodb/pbm/defs"
@@ -25,6 +26,7 @@ type deleteBcpOpts struct {
 	name      string
 	olderThan string
 	bcpType   string
+	profile   string
 	dryRun    bool
 	yes       bool
 }
@@ -36,14 +38,26 @@ func deleteBackup(
 	d *deleteBcpOpts,
 ) (fmt.Stringer, error) {
 	if d.name == "" && d.olderThan == "" {
-		return nil, errors.New("either --name or --older-than should be set")
+		return nil, errors.New("either [name] or --older-than should be set")
 	}
 	if d.name != "" && d.olderThan != "" {
-		return nil, errors.New("cannot use --name and --older-than at the same command")
+		return nil, errors.New("cannot use [name] and --older-than at the same command")
+	}
+	if d.name != "" && d.profile != "" {
+		return nil, errors.New("cannot use [name] with --profile")
 	}
 	if d.bcpType != "" && d.olderThan == "" {
 		return nil, errors.New("cannot use --type without --older-than")
 	}
+	if d.profile != "" {
+		_, err := config.GetProfile(ctx, conn, d.profile)
+		if err != nil {
+			if errors.Is(err, config.ErrMissedConfigProfile) {
+				return nil, errors.Errorf("profile %q is not found", d.profile)
+			}
+			return nil, errors.Wrap(err, "get config")
+		}
+	}
 	if !d.dryRun {
 		err := checkForAnotherOperation(ctx, pbm)
 		if err != nil {
@@ -135,7 +149,7 @@ func deleteManyBackup(ctx context.Context, pbm *sdk.Client, d *deleteBcpOpts) (s
 	if err != nil {
 		return sdk.NoOpID, errors.Wrap(err, "parse --type")
 	}
-	backups, err := sdk.ListDeleteBackupBefore(ctx, pbm, ts, bcpType)
+	backups, err := sdk.ListDeleteBackupBefore(ctx, pbm, ts, bcpType, d.profile)
 	if err != nil {
 		return sdk.NoOpID, errors.Wrap(err, "fetch backup list")
 	}
@@ -151,7 +165,7 @@ func deleteManyBackup(ctx context.Context, pbm *sdk.Client, d *deleteBcpOpts) (s
 		}
 	}
 
-	cid, err := pbm.DeleteBackupBefore(ctx, ts, sdk.DeleteBackupBeforeOptions{Type: bcpType})
+	cid, err := pbm.DeleteBackupBefore(ctx, ts, sdk.DeleteBackupBeforeOptions{Type: bcpType, Profile: d.profile})
 	return cid, errors.Wrap(err, "schedule delete")
 }
 
@@ -255,6 +269,7 @@ type cleanupOptions struct {
 	wait      bool
 	waitTime  time.Duration
 	dryRun    bool
+	profile   string
 }
 
 func doCleanup(ctx context.Context, conn connect.Client, pbm *sdk.Client, d *cleanupOptions) (fmt.Stringer, error) {
@@ -267,14 +282,23 @@ func doCleanup(ctx context.Context, conn connect.Client, pbm *sdk.Client, d *cle
 		realTime := n.Format(time.RFC3339)
 		return nil, errors.Errorf("--older-than %q is after now %q", providedTime, realTime)
 	}
+	if d.profile != "" {
+		_, err := config.GetProfile(ctx, conn, d.profile)
+		if err != nil {
+			if errors.Is(err, config.ErrMissedConfigProfile) {
+				return nil, errors.Errorf("profile %q is not found", d.profile)
+			}
+			return nil, errors.Wrap(err, "get config")
+		}
+	}
 	if !d.dryRun {
 		err := checkForAnotherOperation(ctx, pbm)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	info, err := pbm.CleanupReport(ctx, ts)
+	info, err := pbm.CleanupReport(ctx, ts, d.profile)
 	if err != nil {
 		return nil, errors.Wrap(err, "make cleanup report")
 	}
@@ -296,7 +320,7 @@ func doCleanup(ctx context.Context, conn connect.Client, pbm *sdk.Client, d *cle
 		}
 	}
 
-	cid, err := pbm.RunCleanup(ctx, ts)
+	cid, err := pbm.RunCleanup(ctx, ts, d.profile)
 	if err != nil {
 		return nil, errors.Wrap(err, "send command")
 	}

cmd/pbm/main.go

@@ -335,32 +335,36 @@ func (app *pbmApp) buildCancelBackupCmd() *cobra.Command {
 func (app *pbmApp) buildCleanupCmd() *cobra.Command {
 	cleanupOpts := cleanupOptions{}
 
-	deletePitrCmd := &cobra.Command{
+	cleanupCmd := &cobra.Command{
 		Use:   "cleanup",
 		Short: "Delete Backups and PITR chunks",
 		RunE: app.wrapRunE(func(cmd *cobra.Command, args []string) (fmt.Stringer, error) {
 			return doCleanup(app.ctx, app.conn, app.pbm, &cleanupOpts)
 		}),
 	}
 
-	deletePitrCmd.Flags().StringVar(
+	cleanupCmd.Flags().StringVar(
 		&cleanupOpts.olderThan, "older-than", "",
 		fmt.Sprintf("Delete backups older than date/time in format %s or %s", datetimeFormat, dateFormat),
 	)
-	deletePitrCmd.Flags().BoolVarP(
+	cleanupCmd.Flags().BoolVarP(
 		&cleanupOpts.yes, "yes", "y", false, "Don't ask for confirmation",
 	)
-	deletePitrCmd.Flags().BoolVarP(
+	cleanupCmd.Flags().BoolVarP(
 		&cleanupOpts.wait, "wait", "w", false, "Wait for deletion done",
 	)
-	deletePitrCmd.Flags().DurationVar(
+	cleanupCmd.Flags().DurationVar(
 		&cleanupOpts.waitTime, "wait-time", 0, "Maximum wait time",
 	)
-	deletePitrCmd.Flags().BoolVar(
+	cleanupCmd.Flags().BoolVar(
 		&cleanupOpts.dryRun, "dry-run", false, "Report but do not delete",
 	)
+	cleanupCmd.Flags().StringVar(
+		&cleanupOpts.profile, "profile", "",
+		"Name of the PBM profile to use for cleanup. Uses the default profile if omitted.",
+	)
 
-	return deletePitrCmd
+	return cleanupCmd
 }
 
 func (app *pbmApp) buildConfigCmd() *cobra.Command {
@@ -560,6 +564,10 @@ func (app *pbmApp) buildDeleteBackupCmd() *cobra.Command {
 	deleteBcpCmd.Flags().BoolVar(
 		&deleteBcpOptions.dryRun, "dry-run", false, "Report but do not delete",
 	)
+	deleteBcpCmd.Flags().StringVar(
+		&deleteBcpOptions.profile, "profile", "",
+		"Name of the PBM profile to use for delete. Uses the default profile if omitted.",
+	)
 
 	return deleteBcpCmd
 }

go.mod

@@ -30,6 +30,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/viper v1.21.0
+	github.com/stretchr/testify v1.11.1
 	github.com/testcontainers/testcontainers-go v0.39.0
 	github.com/testcontainers/testcontainers-go/modules/minio v0.34.0
 	github.com/testcontainers/testcontainers-go/modules/mongodb v0.39.0
@@ -126,7 +127,6 @@ require (
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
-	github.com/stretchr/testify v1.11.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tinylib/msgp v1.4.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect