Refactor plugin management

Refactor plugin management:
- support multiple plugins per executable
- support restarting a plugin process in the event it terminates
- simplify plugin lifecycle management by using separate managers for
  each scope (server vs backup vs restore)

Signed-off-by: Andy Goldstein <andy.goldstein@gmail.com>

pkg/controller/backup_deletion_controller_test.go

@@ -23,10 +23,12 @@ import (
 
 	"github.com/heptio/ark/pkg/apis/ark/v1"
 	pkgbackup "github.com/heptio/ark/pkg/backup"
+	"github.com/heptio/ark/pkg/cloudprovider"
 	"github.com/heptio/ark/pkg/generated/clientset/versioned/fake"
 	informers "github.com/heptio/ark/pkg/generated/informers/externalversions"
 	arktest "github.com/heptio/ark/pkg/util/test"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -106,7 +108,6 @@ func TestBackupDeletionControllerProcessQueueItem(t *testing.T) {
 type backupDeletionControllerTestData struct {
 	client          *fake.Clientset
 	sharedInformers informers.SharedInformerFactory
-	backupService   *arktest.BackupService
 	snapshotService *arktest.FakeSnapshotService
 	controller      *backupDeletionController
 	req             *v1.DeleteBackupRequest
@@ -115,14 +116,12 @@ type backupDeletionControllerTestData struct {
 func setupBackupDeletionControllerTest(objects ...runtime.Object) *backupDeletionControllerTestData {
 	client := fake.NewSimpleClientset(objects...)
 	sharedInformers := informers.NewSharedInformerFactory(client, 0)
-	backupService := &arktest.BackupService{}
 	snapshotService := &arktest.FakeSnapshotService{SnapshotsTaken: sets.NewString()}
 	req := pkgbackup.NewDeleteBackupRequest("foo", "uid")
 
 	data := &backupDeletionControllerTestData{
 		client:          client,
 		sharedInformers: sharedInformers,
-		backupService:   backupService,
 		snapshotService: snapshotService,
 		controller: NewBackupDeletionController(
 			arktest.NewLogger(),
@@ -130,7 +129,7 @@ func setupBackupDeletionControllerTest(objects ...runtime.Object) *backupDeletio
 			client.ArkV1(), // deleteBackupRequestClient
 			client.ArkV1(), // backupClient
 			snapshotService,
-			backupService,
+			nil, // objectStore
 			"bucket",
 			sharedInformers.Ark().V1().Restores(),
 			client.ArkV1(), // restoreClient
@@ -150,7 +149,6 @@ func setupBackupDeletionControllerTest(objects ...runtime.Object) *backupDeletio
 func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 	t.Run("missing spec.backupName", func(t *testing.T) {
 		td := setupBackupDeletionControllerTest()
-		defer td.backupService.AssertExpectations(t)
 
 		td.req.Spec.BackupName = ""
 
@@ -171,7 +169,6 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 
 	t.Run("existing deletion requests for the backup are deleted", func(t *testing.T) {
 		td := setupBackupDeletionControllerTest()
-		defer td.backupService.AssertExpectations(t)
 
 		// add the backup to the tracker so the execution of processRequest doesn't progress
 		// past checking for an in-progress backup. this makes validation easier.
@@ -227,7 +224,6 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 
 	t.Run("deleting an in progress backup isn't allowed", func(t *testing.T) {
 		td := setupBackupDeletionControllerTest()
-		defer td.backupService.AssertExpectations(t)
 
 		td.controller.backupTracker.Add(td.req.Namespace, td.req.Spec.BackupName)
 
@@ -248,7 +244,6 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 
 	t.Run("patching to InProgress fails", func(t *testing.T) {
 		td := setupBackupDeletionControllerTest()
-		defer td.backupService.AssertExpectations(t)
 
 		td.client.PrependReactor("patch", "deletebackuprequests", func(action core.Action) (bool, runtime.Object, error) {
 			return true, nil, errors.New("bad")
@@ -261,7 +256,6 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 	t.Run("patching backup to Deleting fails", func(t *testing.T) {
 		backup := arktest.NewTestBackup().WithName("foo").WithSnapshot("pv-1", "snap-1").Backup
 		td := setupBackupDeletionControllerTest(backup)
-		defer td.backupService.AssertExpectations(t)
 
 		td.client.PrependReactor("patch", "deletebackuprequests", func(action core.Action) (bool, runtime.Object, error) {
 			return true, td.req, nil
@@ -276,7 +270,6 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 
 	t.Run("unable to find backup", func(t *testing.T) {
 		td := setupBackupDeletionControllerTest()
-		defer td.backupService.AssertExpectations(t)
 
 		td.client.PrependReactor("get", "backups", func(action core.Action) (bool, runtime.Object, error) {
 			return true, nil, apierrors.NewNotFound(v1.SchemeGroupVersion.WithResource("backups").GroupResource(), "foo")
@@ -315,7 +308,6 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 	t.Run("no snapshot service, backup has snapshots", func(t *testing.T) {
 		td := setupBackupDeletionControllerTest()
 		td.controller.snapshotService = nil
-		defer td.backupService.AssertExpectations(t)
 
 		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
@@ -366,8 +358,6 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 		td.sharedInformers.Ark().V1().Restores().Informer().GetStore().Add(restore2)
 		td.sharedInformers.Ark().V1().Restores().Informer().GetStore().Add(restore3)
 
-		defer td.backupService.AssertExpectations(t)
-
 		// Clear out req labels to make sure the controller adds them
 		td.req.Labels = make(map[string]string)
 
@@ -384,7 +374,11 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
 			return true, backup, nil
 		})
 
-		td.backupService.On("DeleteBackupDir", td.controller.bucket, td.req.Spec.BackupName).Return(nil)
+		td.controller.deleteBackupDir = func(_ logrus.FieldLogger, _ cloudprovider.ObjectStore, bucket, backupName string) error {
+			require.Equal(t, "bucket", bucket)
+			require.Equal(t, td.req.Spec.BackupName, backupName)
+			return nil
+		}
 
 		err := td.controller.processRequest(td.req)
 		require.NoError(t, err)