From eefd12b3e48323ec59f88ef5bbbf8251fad04a26 Mon Sep 17 00:00:00 2001
From: Nolan Brubaker <brubakern@vmware.com>
Date: Fri, 17 Apr 2020 16:05:29 -0400
Subject: [PATCH] Rename CSI variables to be more descriptive

Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
---
 pkg/controller/backup_controller.go    | 24 ++++++++++++------------
 pkg/persistence/object_store.go        | 12 ++++++------
 pkg/persistence/object_store_layout.go |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkg/controller/backup_controller.go b/pkg/controller/backup_controller.go
index f57d80f23..39b7b30ab 100644
--- a/pkg/controller/backup_controller.go
+++ b/pkg/controller/backup_controller.go
@@ -639,7 +639,7 @@ func persistBackup(backup *pkgbackup.Request,
 	backupStore persistence.BackupStore,
 	log logrus.FieldLogger,
 	csiVolumeSnapshots []*snapshotv1beta1api.VolumeSnapshot,
-	volumeSnapshotContents []*snapshotv1beta1api.VolumeSnapshotContent,
+	csiVolumeSnapshotContents []*snapshotv1beta1api.VolumeSnapshotContent,
 ) []error {
 	errs := []error{}
 	backupJSON := new(bytes.Buffer)
@@ -664,7 +664,7 @@ func persistBackup(backup *pkgbackup.Request,
 		errs = append(errs, err)
 	}
 
-	snapshotContentsJSON, err := encodeToJSONGzip(volumeSnapshotContents, "volume snapshot contents list")
+	csiSnapshotContentsJSON, err := encodeToJSONGzip(csiVolumeSnapshotContents, "csi volume snapshot contents list")
 	if err != nil {
 		errs = append(errs, err)
 	}
@@ -681,19 +681,19 @@ func persistBackup(backup *pkgbackup.Request,
 		nativeVolumeSnapshots = nil
 		backupResourceList = nil
 		csiSnapshotJSON = nil
-		snapshotContentsJSON = nil
+		csiSnapshotContentsJSON = nil
 	}
 
 	backupInfo := persistence.BackupInfo{
-		Name:                   backup.Name,
-		Metadata:               backupJSON,
-		Contents:               backupContents,
-		Log:                    backupLog,
-		PodVolumeBackups:       podVolumeBackups,
-		VolumeSnapshots:        nativeVolumeSnapshots,
-		BackupResourceList:     backupResourceList,
-		CSIVolumeSnapshots:     csiSnapshotJSON,
-		VolumeSnapshotContents: snapshotContentsJSON,
+		Name:                      backup.Name,
+		Metadata:                  backupJSON,
+		Contents:                  backupContents,
+		Log:                       backupLog,
+		PodVolumeBackups:          podVolumeBackups,
+		VolumeSnapshots:           nativeVolumeSnapshots,
+		BackupResourceList:        backupResourceList,
+		CSIVolumeSnapshots:        csiSnapshotJSON,
+		CSIVolumeSnapshotContents: csiSnapshotContentsJSON,
 	}
 	if err := backupStore.PutBackup(backupInfo); err != nil {
 		errs = append(errs, err)
diff --git a/pkg/persistence/object_store.go b/pkg/persistence/object_store.go
index 16db4796c..d15bc8a21 100644
--- a/pkg/persistence/object_store.go
+++ b/pkg/persistence/object_store.go
@@ -43,7 +43,7 @@ type BackupInfo struct {
 	VolumeSnapshots,
 	BackupResourceList,
 	CSIVolumeSnapshots,
-	VolumeSnapshotContents io.Reader
+	CSIVolumeSnapshotContents io.Reader
 }
 
 // BackupStore defines operations for creating, retrieving, and deleting
@@ -221,11 +221,11 @@ func (s *objectBackupStore) PutBackup(info BackupInfo) error {
 	// Since the logic for all of these files is the exact same except for the name and the contents,
 	// use a map literal to iterate through them and write them to the bucket.
 	var backupObjs = map[string]io.Reader{
-		s.layout.getPodVolumeBackupsKey(info.Name):       info.PodVolumeBackups,
-		s.layout.getBackupVolumeSnapshotsKey(info.Name):  info.VolumeSnapshots,
-		s.layout.getBackupResourceListKey(info.Name):     info.BackupResourceList,
-		s.layout.getCSIVolumeSnapshotKey(info.Name):      info.CSIVolumeSnapshots,
-		s.layout.getVolumeSnapshotContentsKey(info.Name): info.VolumeSnapshotContents,
+		s.layout.getPodVolumeBackupsKey(info.Name):          info.PodVolumeBackups,
+		s.layout.getBackupVolumeSnapshotsKey(info.Name):     info.VolumeSnapshots,
+		s.layout.getBackupResourceListKey(info.Name):        info.BackupResourceList,
+		s.layout.getCSIVolumeSnapshotKey(info.Name):         info.CSIVolumeSnapshots,
+		s.layout.getCSIVolumeSnapshotContentsKey(info.Name): info.CSIVolumeSnapshotContents,
 	}
 
 	for key, reader := range backupObjs {
diff --git a/pkg/persistence/object_store_layout.go b/pkg/persistence/object_store_layout.go
index 9accd8e31..025da966b 100644
--- a/pkg/persistence/object_store_layout.go
+++ b/pkg/persistence/object_store_layout.go
@@ -104,6 +104,6 @@ func (l *ObjectStoreLayout) getCSIVolumeSnapshotKey(backup string) string {
 	return path.Join(l.subdirs["backups"], backup, fmt.Sprintf("%s-csi-volumesnapshots.json.gz", backup))
 }
 
-func (l *ObjectStoreLayout) getVolumeSnapshotContentsKey(backup string) string {
+func (l *ObjectStoreLayout) getCSIVolumeSnapshotContentsKey(backup string) string {
 	return path.Join(l.subdirs["backups"], backup, fmt.Sprintf("%s-csi-volumesnapshotcontents.json.gz", backup))
 }