convert restorers to plugins

Signed-off-by: Steve Kriss <steve@heptio.com>
2026-01-05 04:55:22 +00:00 · 2017-11-21 09:24:43 -08:00
parent 932b8259ae
commit 179b95c81d
37 changed files with 1648 additions and 1406 deletions
--- a/pkg/controller/backup_controller_test.go
+++ b/pkg/controller/backup_controller_test.go
@@ -25,7 +25,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/clock"
 	core "k8s.io/client-go/testing"

-	"github.com/sirupsen/logrus"
 	testlogger "github.com/sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -37,6 +36,7 @@ import (
 	"github.com/heptio/ark/pkg/generated/clientset/versioned/fake"
 	"github.com/heptio/ark/pkg/generated/clientset/versioned/scheme"
 	informers "github.com/heptio/ark/pkg/generated/informers/externalversions"
+	"github.com/heptio/ark/pkg/restore"
 	. "github.com/heptio/ark/pkg/util/test"
 )

@@ -49,94 +49,6 @@ func (b *fakeBackupper) Backup(backup *v1.Backup, data, log io.Writer, actions [
 	return args.Error(0)
 }

-// Manager is an autogenerated mock type for the Manager type
-type Manager struct {
-	mock.Mock
-}
-
-// CloseBackupItemActions provides a mock function with given fields: backupName
-func (_m *Manager) CloseBackupItemActions(backupName string) error {
-	ret := _m.Called(backupName)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(backupName)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// GetBackupItemActions provides a mock function with given fields: backupName, logger, level
-func (_m *Manager) GetBackupItemActions(backupName string, logger logrus.FieldLogger, level logrus.Level) ([]backup.ItemAction, error) {
-	ret := _m.Called(backupName, logger, level)
-
-	var r0 []backup.ItemAction
-	if rf, ok := ret.Get(0).(func(string, logrus.FieldLogger, logrus.Level) []backup.ItemAction); ok {
-		r0 = rf(backupName, logger, level)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]backup.ItemAction)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(string, logrus.FieldLogger, logrus.Level) error); ok {
-		r1 = rf(backupName, logger, level)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// GetBlockStore provides a mock function with given fields: name
-func (_m *Manager) GetBlockStore(name string) (cloudprovider.BlockStore, error) {
-	ret := _m.Called(name)
-
-	var r0 cloudprovider.BlockStore
-	if rf, ok := ret.Get(0).(func(string) cloudprovider.BlockStore); ok {
-		r0 = rf(name)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(cloudprovider.BlockStore)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(name)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// GetObjectStore provides a mock function with given fields: name
-func (_m *Manager) GetObjectStore(name string) (cloudprovider.ObjectStore, error) {
-	ret := _m.Called(name)
-
-	var r0 cloudprovider.ObjectStore
-	if rf, ok := ret.Get(0).(func(string) cloudprovider.ObjectStore); ok {
-		r0 = rf(name)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(cloudprovider.ObjectStore)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(name)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 func TestProcessBackup(t *testing.T) {
 	tests := []struct {
 		name             string
@@ -243,7 +155,7 @@ func TestProcessBackup(t *testing.T) {
 				cloudBackups    = &BackupService{}
 				sharedInformers = informers.NewSharedInformerFactory(client, 0)
 				logger, _       = testlogger.NewNullLogger()
-				pluginManager   = &Manager{}
+				pluginManager   = &MockManager{}
 			)

 			c := NewBackupController(
@@ -284,7 +196,7 @@ func TestProcessBackup(t *testing.T) {

 				cloudBackups.On("UploadBackup", "bucket", backup.Name, mock.Anything, mock.Anything, mock.Anything).Return(nil)

-				pluginManager.On("GetBackupItemActions", backup.Name, logger, logger.Level).Return(nil, nil)
+				pluginManager.On("GetBackupItemActions", backup.Name).Return(nil, nil)
 				pluginManager.On("CloseBackupItemActions", backup.Name).Return(nil)
 			}

@@ -353,3 +265,128 @@ func TestProcessBackup(t *testing.T) {
 		})
 	}
 }
+
+// MockManager is an autogenerated mock type for the Manager type
+type MockManager struct {
+	mock.Mock
+}
+
+// CloseBackupItemActions provides a mock function with given fields: backupName
+func (_m *MockManager) CloseBackupItemActions(backupName string) error {
+	ret := _m.Called(backupName)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(string) error); ok {
+		r0 = rf(backupName)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// GetBackupItemActions provides a mock function with given fields: backupName, logger, level
+func (_m *MockManager) GetBackupItemActions(backupName string) ([]backup.ItemAction, error) {
+	ret := _m.Called(backupName)
+
+	var r0 []backup.ItemAction
+	if rf, ok := ret.Get(0).(func(string) []backup.ItemAction); ok {
+		r0 = rf(backupName)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]backup.ItemAction)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(string) error); ok {
+		r1 = rf(backupName)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// CloseRestoreItemActions provides a mock function with given fields: restoreName
+func (_m *MockManager) CloseRestoreItemActions(restoreName string) error {
+	ret := _m.Called(restoreName)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(string) error); ok {
+		r0 = rf(restoreName)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// GetRestoreItemActions provides a mock function with given fields: restoreName, logger, level
+func (_m *MockManager) GetRestoreItemActions(restoreName string) ([]restore.ItemAction, error) {
+	ret := _m.Called(restoreName)
+
+	var r0 []restore.ItemAction
+	if rf, ok := ret.Get(0).(func(string) []restore.ItemAction); ok {
+		r0 = rf(restoreName)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]restore.ItemAction)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(string) error); ok {
+		r1 = rf(restoreName)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetBlockStore provides a mock function with given fields: name
+func (_m *MockManager) GetBlockStore(name string) (cloudprovider.BlockStore, error) {
+	ret := _m.Called(name)
+
+	var r0 cloudprovider.BlockStore
+	if rf, ok := ret.Get(0).(func(string) cloudprovider.BlockStore); ok {
+		r0 = rf(name)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(cloudprovider.BlockStore)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(string) error); ok {
+		r1 = rf(name)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetObjectStore provides a mock function with given fields: name
+func (_m *MockManager) GetObjectStore(name string) (cloudprovider.ObjectStore, error) {
+	ret := _m.Called(name)
+
+	var r0 cloudprovider.ObjectStore
+	if rf, ok := ret.Get(0).(func(string) cloudprovider.ObjectStore); ok {
+		r0 = rf(name)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(cloudprovider.ObjectStore)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(string) error); ok {
+		r1 = rf(name)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}