From a42598b84c2948301797cfa4f57b705bdb910964 Mon Sep 17 00:00:00 2001
From: Matthew Schuchard <8029687+mschuchard@users.noreply.github.com>
Date: Tue, 7 Jan 2025 10:46:41 -0500
Subject: [PATCH] do not clobber deferred file op errs in storage func

---
 storage/storage.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/storage/storage.go b/storage/storage.go
index 461402e..317d297 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -29,14 +29,16 @@ func StorageTransfer(config *util.CloudConfig, snapshotPath string, cleanup bool
 		}
 	}()
 
-	// TODO: clobbers deferred err from snapshot close and remove
+	// upload snapshot to various storage backends
 	switch config.Platform {
 	case util.AWS:
-		return snapshotS3Upload(config.Container, snapshotFile, snapshotName)
+		err = snapshotS3Upload(config.Container, snapshotFile, snapshotName)
 	case util.GCP:
-		return snapshotCSUpload(config.Container, snapshotFile, snapshotName)
+		err = snapshotCSUpload(config.Container, snapshotFile, snapshotName)
 	default:
 		log.Printf("an invalid cloud platform was specified: %s", config.Platform)
-		return errors.New("invalid cloud platform")
+		err = errors.New("invalid cloud platform")
 	}
+
+	return err
 }