From bd3b2a809687d7727a3a97e6c0acfecf1c3d6856 Mon Sep 17 00:00:00 2001
From: Keepers <104464746+ryanfkeepers@users.noreply.github.com>
Date: Thu, 14 Jul 2022 11:48:14 -0600
Subject: [PATCH] clean up leftover restorepoint var names (#344)

---
 src/internal/operations/backup.go  |  6 +++---
 src/internal/operations/restore.go | 12 ++++++------
 src/pkg/repository/repository.go   | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/internal/operations/backup.go b/src/internal/operations/backup.go
index 942bc1d4c..9fa7869f2 100644
--- a/src/internal/operations/backup.go
+++ b/src/internal/operations/backup.go
@@ -114,14 +114,14 @@ func (op *BackupOperation) createBackupModels(ctx context.Context, snapID string
 		return errors.Wrap(err, "creating backupdetails model")
 	}
 
-	rp := backup.New(snapID, string(details.ModelStoreID))
+	bu := backup.New(snapID, string(details.ModelStoreID))
 
-	err = op.modelStore.Put(ctx, kopia.BackupModel, rp)
+	err = op.modelStore.Put(ctx, kopia.BackupModel, bu)
 	if err != nil {
 		return errors.Wrap(err, "creating backup model")
 	}
 
-	op.Results.BackupID = rp.StableID
+	op.Results.BackupID = bu.StableID
 
 	return nil
 }
diff --git a/src/internal/operations/restore.go b/src/internal/operations/restore.go
index b0591448c..2849f6fae 100644
--- a/src/internal/operations/restore.go
+++ b/src/internal/operations/restore.go
@@ -82,15 +82,15 @@ func (op *RestoreOperation) Run(ctx context.Context) error {
 	defer op.persistResults(time.Now(), &stats)
 
 	// retrieve the restore point details
-	rp := backup.Backup{}
-	err := op.modelStore.Get(ctx, kopia.BackupModel, op.BackupID, &rp)
+	bu := backup.Backup{}
+	err := op.modelStore.Get(ctx, kopia.BackupModel, op.BackupID, &bu)
 	if err != nil {
 		stats.readErr = errors.Wrap(err, "retrieving restore point")
 		return stats.readErr
 	}
 
-	rpd := backup.Details{}
-	err = op.modelStore.GetWithModelStoreID(ctx, kopia.BackupDetailsModel, manifest.ID(rp.DetailsID), &rpd)
+	backup := backup.Details{}
+	err = op.modelStore.GetWithModelStoreID(ctx, kopia.BackupDetailsModel, manifest.ID(bu.DetailsID), &backup)
 	if err != nil {
 		stats.readErr = errors.Wrap(err, "retrieving restore point details")
 		return stats.readErr
@@ -103,8 +103,8 @@ func (op *RestoreOperation) Run(ctx context.Context) error {
 	}
 
 	// format the details and retrieve the items from kopia
-	fds := er.FilterDetails(&rpd)
-	dcs, err := op.kopia.RestoreMultipleItems(ctx, rp.SnapshotID, fds)
+	fds := er.FilterDetails(&backup)
+	dcs, err := op.kopia.RestoreMultipleItems(ctx, bu.SnapshotID, fds)
 	if err != nil {
 		stats.readErr = errors.Wrap(err, "retrieving service data")
 		return stats.readErr
diff --git a/src/pkg/repository/repository.go b/src/pkg/repository/repository.go
index 16ca63f91..ff7adce43 100644
--- a/src/pkg/repository/repository.go
+++ b/src/pkg/repository/repository.go
@@ -156,24 +156,24 @@ func (r Repository) Backups(ctx context.Context) ([]*backup.Backup, error) {
 	if err != nil {
 		return nil, err
 	}
-	rps := make([]*backup.Backup, 0, len(bms))
+	bus := make([]*backup.Backup, 0, len(bms))
 	for _, bm := range bms {
-		rp := backup.Backup{}
-		err := r.modelStore.GetWithModelStoreID(ctx, kopia.BackupModel, bm.ModelStoreID, &rp)
+		bu := backup.Backup{}
+		err := r.modelStore.GetWithModelStoreID(ctx, kopia.BackupModel, bm.ModelStoreID, &bu)
 		if err != nil {
 			return nil, err
 		}
-		rps = append(rps, &rp)
+		bus = append(bus, &bu)
 	}
-	return rps, nil
+	return bus, nil
 }
 
 // BackupDetails returns the specified backup details object
 func (r Repository) BackupDetails(ctx context.Context, rpDetailsID string) (*backup.Details, error) {
-	rpd := backup.Details{}
-	err := r.modelStore.GetWithModelStoreID(ctx, kopia.BackupDetailsModel, manifest.ID(rpDetailsID), &rpd)
+	bud := backup.Details{}
+	err := r.modelStore.GetWithModelStoreID(ctx, kopia.BackupDetailsModel, manifest.ID(rpDetailsID), &bud)
 	if err != nil {
 		return nil, err
 	}
-	return &rpd, nil
+	return &bud, nil
 }