controllers: take a newPluginManager func in constructors

Signed-off-by: Steve Kriss <steve@heptio.com>
This commit is contained in:
Steve Kriss
2018-08-25 12:53:56 -07:00
parent 6445dbf1c7
commit 729d733986
11 changed files with 40 additions and 78 deletions

View File

@@ -105,13 +105,10 @@ func TestFetchBackupInfo(t *testing.T) {
false,
logger,
logrus.InfoLevel,
nil, //pluginRegistry
func(logrus.FieldLogger) plugin.Manager { return pluginManager },
"default",
metrics.NewServerMetrics(),
).(*restoreController)
c.newPluginManager = func(logger logrus.FieldLogger, logLevel logrus.Level, pluginRegistry plugin.Registry) plugin.Manager {
return pluginManager
}
if test.backupServiceError == nil {
pluginManager.On("GetObjectStore", "myCloud").Return(objectStore, nil)
@@ -200,13 +197,10 @@ func TestProcessRestoreSkips(t *testing.T) {
false, // pvProviderExists
logger,
logrus.InfoLevel,
nil, // pluginRegistry
func(logrus.FieldLogger) plugin.Manager { return pluginManager },
"default",
metrics.NewServerMetrics(),
).(*restoreController)
c.newPluginManager = func(logger logrus.FieldLogger, logLevel logrus.Level, pluginRegistry plugin.Registry) plugin.Manager {
return pluginManager
}
if test.restore != nil {
sharedInformers.Ark().V1().Restores().Informer().GetStore().Add(test.restore)
@@ -427,13 +421,10 @@ func TestProcessRestore(t *testing.T) {
test.allowRestoreSnapshots,
logger,
logrus.InfoLevel,
nil, // pluginRegistry
func(logrus.FieldLogger) plugin.Manager { return pluginManager },
"default",
metrics.NewServerMetrics(),
).(*restoreController)
c.newPluginManager = func(logger logrus.FieldLogger, logLevel logrus.Level, pluginRegistry plugin.Registry) plugin.Manager {
return pluginManager
}
if test.location != nil {
sharedInformers.Ark().V1().BackupStorageLocations().Informer().GetStore().Add(test.location)