remove SnapshotService, replace with direct BlockStore usage

Signed-off-by: Steve Kriss <steve@heptio.com>

pkg/controller/backup_deletion_controller.go

@@ -49,7 +49,7 @@ type backupDeletionController struct {
 	deleteBackupRequestClient arkv1client.DeleteBackupRequestsGetter
 	deleteBackupRequestLister listers.DeleteBackupRequestLister
 	backupClient              arkv1client.BackupsGetter
-	snapshotService           cloudprovider.SnapshotService
+	blockStore                cloudprovider.BlockStore
 	objectStore               cloudprovider.ObjectStore
 	bucket                    string
 	restoreLister             listers.RestoreLister
@@ -69,7 +69,7 @@ func NewBackupDeletionController(
 	deleteBackupRequestInformer informers.DeleteBackupRequestInformer,
 	deleteBackupRequestClient arkv1client.DeleteBackupRequestsGetter,
 	backupClient arkv1client.BackupsGetter,
-	snapshotService cloudprovider.SnapshotService,
+	blockStore cloudprovider.BlockStore,
 	objectStore cloudprovider.ObjectStore,
 	bucket string,
 	restoreInformer informers.RestoreInformer,
@@ -83,7 +83,7 @@ func NewBackupDeletionController(
 		deleteBackupRequestClient: deleteBackupRequestClient,
 		deleteBackupRequestLister: deleteBackupRequestInformer.Lister(),
 		backupClient:              backupClient,
-		snapshotService:           snapshotService,
+		blockStore:                blockStore,
 		objectStore:               objectStore,
 		bucket:                    bucket,
 		restoreLister:             restoreInformer.Lister(),
@@ -220,7 +220,7 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
 
 	// If the backup includes snapshots but we don't currently have a PVProvider, we don't
 	// want to orphan the snapshots so skip deletion.
-	if c.snapshotService == nil && len(backup.Status.VolumeBackups) > 0 {
+	if c.blockStore == nil && len(backup.Status.VolumeBackups) > 0 {
 		req, err = c.patchDeleteBackupRequest(req, func(r *v1.DeleteBackupRequest) {
 			r.Status.Phase = v1.DeleteBackupRequestPhaseProcessed
 			r.Status.Errors = []string{"unable to delete backup because it includes PV snapshots and Ark is not configured with a PersistentVolumeProvider"}
@@ -244,7 +244,7 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
 	log.Info("Removing PV snapshots")
 	for _, volumeBackup := range backup.Status.VolumeBackups {
 		log.WithField("snapshotID", volumeBackup.SnapshotID).Info("Removing snapshot associated with backup")
-		if err := c.snapshotService.DeleteSnapshot(volumeBackup.SnapshotID); err != nil {
+		if err := c.blockStore.DeleteSnapshot(volumeBackup.SnapshotID); err != nil {
 			errs = append(errs, errors.Wrapf(err, "error deleting snapshot %s", volumeBackup.SnapshotID).Error())
 		}
 	}

pkg/controller/backup_deletion_controller_test.go

@@ -48,7 +48,7 @@ func TestBackupDeletionControllerProcessQueueItem(t *testing.T) {
 		sharedInformers.Ark().V1().DeleteBackupRequests(),
 		client.ArkV1(), // deleteBackupRequestClient
 		client.ArkV1(), // backupClient
-		nil,            // snapshotService
+		nil,            // blockStore
 		nil,            // backupService
 		"bucket",
 		sharedInformers.Ark().V1().Restores(),
@@ -108,7 +108,7 @@ func TestBackupDeletionControllerProcessQueueItem(t *testing.T) {
 type backupDeletionControllerTestData struct {
 	client          *fake.Clientset
 	sharedInformers informers.SharedInformerFactory
-	snapshotService *arktest.FakeSnapshotService
+	blockStore      *arktest.FakeBlockStore
 	controller      *backupDeletionController
 	req             *v1.DeleteBackupRequest
 }
@@ -116,19 +116,19 @@ type backupDeletionControllerTestData struct {
 func setupBackupDeletionControllerTest(objects ...runtime.Object) *backupDeletionControllerTestData {
 	client := fake.NewSimpleClientset(objects...)
 	sharedInformers := informers.NewSharedInformerFactory(client, 0)
-	snapshotService := &arktest.FakeSnapshotService{SnapshotsTaken: sets.NewString()}
+	blockStore := &arktest.FakeBlockStore{SnapshotsTaken: sets.NewString()}
 	req := pkgbackup.NewDeleteBackupRequest("foo", "uid")
 
 	data := &backupDeletionControllerTestData{
 		client:          client,
 		sharedInformers: sharedInformers,
-		snapshotService: snapshotService,
+		blockStore:      blockStore,
 		controller: NewBackupDeletionController(
 			arktest.NewLogger(),
 			sharedInformers.Ark().V1().DeleteBackupRequests(),
 			client.ArkV1(), // deleteBackupRequestClient
 			client.ArkV1(), // backupClient
-			snapshotService,
+			blockStore,
 			nil, // objectStore
 			"bucket",
 			sharedInformers.Ark().V1().Restores(),
@@ -305,9 +305,9 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 		assert.Equal(t, expectedActions, td.client.Actions())
 	})
 
-	t.Run("no snapshot service, backup has snapshots", func(t *testing.T) {
+	t.Run("no block store, backup has snapshots", func(t *testing.T) {
 		td := setupBackupDeletionControllerTest()
-		td.controller.snapshotService = nil
+		td.controller.blockStore = nil
 
 		td.client.PrependReactor("get", "backups", func(action core.Action) (bool, runtime.Object, error) {
 			backup := arktest.NewTestBackup().WithName("backup-1").WithSnapshot("pv-1", "snap-1").Backup
@@ -364,7 +364,7 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 		td.client.PrependReactor("get", "backups", func(action core.Action) (bool, runtime.Object, error) {
 			return true, backup, nil
 		})
-		td.snapshotService.SnapshotsTaken.Insert("snap-1")
+		td.blockStore.SnapshotsTaken.Insert("snap-1")
 
 		td.client.PrependReactor("patch", "deletebackuprequests", func(action core.Action) (bool, runtime.Object, error) {
 			return true, td.req, nil
@@ -438,7 +438,7 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 		arktest.CompareActions(t, expectedActions, td.client.Actions())
 
 		// Make sure snapshot was deleted
-		assert.Equal(t, 0, td.snapshotService.SnapshotsTaken.Len())
+		assert.Equal(t, 0, td.blockStore.SnapshotsTaken.Len())
 	})
 }
 
@@ -560,7 +560,7 @@ func TestBackupDeletionControllerDeleteExpiredRequests(t *testing.T) {
 				sharedInformers.Ark().V1().DeleteBackupRequests(),
 				client.ArkV1(), // deleteBackupRequestClient
 				client.ArkV1(), // backupClient
-				nil,            // snapshotService
+				nil,            // blockStore
 				nil,            // backupService
 				"bucket",
 				sharedInformers.Ark().V1().Restores(),