PBM-1649 Profile support for delete and cleanup in PBM CLI

Author: jcechace

cmd/pbm/delete.go

@@ -146,7 +146,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")
 	}
@@ -162,7 +162,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")
 }
 
@@ -295,7 +295,7 @@ func doCleanup(ctx context.Context, conn connect.Client, pbm *sdk.Client, d *cle
 		}
 	}
 
-	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")
 	}
@@ -317,7 +317,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")
 	}

pbm/backup/delete.go

@@ -358,6 +358,7 @@ func ListDeleteBackupBefore(
 	conn connect.Client,
 	ts primitive.Timestamp,
 	bcpType defs.BackupType,
+	profile string,
 ) ([]BackupMeta, error) {
 	info, err := MakeCleanupInfo(ctx, conn, ts)
 	if err != nil {
@@ -509,6 +510,12 @@ func listBackupsBefore(ctx context.Context, conn connect.Client, ts primitive.Ti
 			defs.StatusError,
 		}}},
 	}
+	if profile == "" {
+		f = append(f, bson.E{Key: "store.profile", Value: nil})
+	} else {
+		f = append(f, bson.E{Key: "store.profile", Value: true}, bson.E{Key: "store.name", Value: profile})
+	}
+
 	o := options.Find().SetSort(bson.D{{"last_write_ts", 1}})
 	cur, err := conn.BcpCollection().Find(ctx, f, o)
 	if err != nil {

pbm/ctrl/cmd.go

@@ -203,6 +203,7 @@ type DeleteBackupCmd struct {
 	Backup    string          `bson:"backup"`
 	OlderThan int64           `bson:"olderthan"`
 	Type      defs.BackupType `bson:"type"`
+	Profile   string          `bson:"profile"`
 }
 
 type DeletePITRCmd struct {
@@ -211,6 +212,7 @@ type DeletePITRCmd struct {
 
 type CleanupCmd struct {
 	OlderThan primitive.Timestamp `bson:"olderThan"`
+	Profile   string              `bson:"profile"`
 }
 
 func (d DeleteBackupCmd) String() string {

pbm/ctrl/send.go

@@ -27,12 +27,14 @@ func SendDeleteBackupBefore(
 	m connect.Client,
 	before primitive.Timestamp,
 	type_ defs.BackupType,
+	profile string,
 ) (OPID, error) {
 	cmd := Cmd{
 		Cmd: CmdDeleteBackup,
 		Delete: &DeleteBackupCmd{
 			OlderThan: int64(before.T),
 			Type:      type_,
+			Profile:   profile,
 		},
 	}
 	return sendCommand(ctx, m, cmd)
@@ -56,11 +58,13 @@ func SendCleanup(
 	ctx context.Context,
 	m connect.Client,
 	before primitive.Timestamp,
+	profile string,
 ) (OPID, error) {
 	cmd := Cmd{
 		Cmd: CmdCleanup,
 		Cleanup: &CleanupCmd{
 			OlderThan: before,
+			Profile:   profile,
 		},
 	}
 	return sendCommand(ctx, m, cmd)

pbm/util/storage.go

@@ -79,6 +79,21 @@ func GetStorage(ctx context.Context, m connect.Client, node string, l log.LogEve
 	return StorageFromConfig(&c.Storage, node, l)
 }
 
+func GetProfiledStorage(
+	ctx context.Context,
+	m connect.Client,
+	profile string,
+	node string,
+	l log.LogEvent,
+) (storage.Storage, error) {
+	c, err := config.GetProfile(ctx, m, profile)
+	if err != nil {
+		return nil, errors.Wrap(err, "get profile")
+	}
+
+	return StorageFromConfig(&c.Storage, node, l)
+}
+
 // Initialize write current PBM version to PBM init file.
 //
 // It does not handle "file already exists" error.

sdk/impl.go

@@ -323,7 +323,7 @@ func (c *Client) DeleteBackupBefore(
 	beforeTS Timestamp,
 	options DeleteBackupBeforeOptions,
 ) (CommandID, error) {
-	opid, err := ctrl.SendDeleteBackupBefore(ctx, c.conn, beforeTS, options.Type)
+	opid, err := ctrl.SendDeleteBackupBefore(ctx, c.conn, beforeTS, options.Type, options.Profile)
 	return CommandID(opid.String()), err
 }
 
@@ -334,10 +334,11 @@ func (c *Client) DeleteOplogRange(ctx context.Context, until Timestamp) (Command
 
 func (c *Client) CleanupReport(ctx context.Context, beforeTS Timestamp) (CleanupReport, error) {
 	return backup.MakeCleanupInfo(ctx, c.conn, beforeTS)
+func (c *Client) CleanupReport(ctx context.Context, beforeTS Timestamp, profile string) (CleanupReport, error) {
 }
 
-func (c *Client) RunCleanup(ctx context.Context, beforeTS Timestamp) (CommandID, error) {
-	opid, err := ctrl.SendCleanup(ctx, c.conn, beforeTS)
+func (c *Client) RunCleanup(ctx context.Context, beforeTS Timestamp, profile string) (CommandID, error) {
+	opid, err := ctrl.SendCleanup(ctx, c.conn, beforeTS, profile)
 	return CommandID(opid.String()), err
 }
 

sdk/sdk.go

@@ -107,7 +107,8 @@ type GetAllRestoresOptions struct {
 }
 
 type DeleteBackupBeforeOptions struct {
-	Type BackupType
+	Type    BackupType
+	Profile string
 }
 
 // OpLock represents internal PBM lock.
@@ -214,8 +215,9 @@ func ListDeleteBackupBefore(
 	client *Client,
 	ts primitive.Timestamp,
 	bcpType BackupType,
+	profile string,
 ) ([]BackupMetadata, error) {
-	return backup.ListDeleteBackupBefore(ctx, client.conn, ts, bcpType)
+	return backup.ListDeleteBackupBefore(ctx, client.conn, ts, bcpType, profile)
 }
 
 func ListDeleteChunksBefore(