download request: fix setting of log level for plugin manager

Signed-off-by: Steve Kriss <[email protected]>
vmware-tanzu · Aug 28, 2018 · cf7c858 · cf7c858
1 parent 3234124
commit cf7c858
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go
@@ -742,6 +742,7 @@ func (s *server) runControllers(config *api.Config) error {
 		s.sharedInformerFactory.Ark().V1().Backups(),
 		s.pluginRegistry,
 		s.logger,
+		s.logLevel,
 	)
 	wg.Add(1)
 	go func() {

diff --git a/pkg/controller/download_request_controller.go b/pkg/controller/download_request_controller.go
@@ -50,8 +50,7 @@ type downloadRequestController struct {
 	createSignedURL       cloudprovider.CreateSignedURLFunc
 	backupLocationLister  listers.BackupStorageLocationLister
 	backupLister          listers.BackupLister
-	pluginRegistry        plugin.Registry
-	newPluginManager      func(logger logrus.FieldLogger, logLevel logrus.Level, pluginRegistry plugin.Registry) plugin.Manager
+	newPluginManager      func(logrus.FieldLogger) plugin.Manager
 }
 
 // NewDownloadRequestController creates a new DownloadRequestController.
@@ -63,6 +62,7 @@ func NewDownloadRequestController(
 	backupInformer informers.BackupInformer,
 	pluginRegistry plugin.Registry,
 	logger logrus.FieldLogger,
+	logLevel logrus.Level,
 ) Interface {
 	c := &downloadRequestController{
 		genericController:     newGenericController("downloadrequest", logger),
@@ -74,8 +74,10 @@ func NewDownloadRequestController(
 
 		// use variables to refer to these functions so they can be
 		// replaced with fakes for testing.
-		createSignedURL:  cloudprovider.CreateSignedURL,
-		newPluginManager: plugin.NewManager,
+		createSignedURL: cloudprovider.CreateSignedURL,
+		newPluginManager: func(logger logrus.FieldLogger) plugin.Manager {
+			return plugin.NewManager(logger, logLevel, pluginRegistry)
+		},
 
 		clock: &clock.RealClock{},
 	}
@@ -143,7 +145,7 @@ const signedURLTTL = 10 * time.Minute
 
 // generatePreSignedURL generates a pre-signed URL for downloadRequest, changes the phase to
 // Processed, and persists the changes to storage.
-func (c *downloadRequestController) generatePreSignedURL(downloadRequest *v1.DownloadRequest, log *logrus.Entry) error {
+func (c *downloadRequestController) generatePreSignedURL(downloadRequest *v1.DownloadRequest, log logrus.FieldLogger) error {
 	update := downloadRequest.DeepCopy()
 
 	var (
@@ -173,7 +175,7 @@ func (c *downloadRequestController) generatePreSignedURL(downloadRequest *v1.Dow
 		return errors.WithStack(err)
 	}
 
-	pluginManager := c.newPluginManager(log, log.Level, c.pluginRegistry)
+	pluginManager := c.newPluginManager(log)
 	defer pluginManager.CleanupClients()
 
 	objectStore, err := getObjectStoreForLocation(backupLocation, pluginManager)

diff --git a/pkg/controller/download_request_controller_test.go b/pkg/controller/download_request_controller_test.go
@@ -61,6 +61,7 @@ func newDownloadRequestTestHarness(t *testing.T) *downloadRequestTestHarness {
 			informerFactory.Ark().V1().Backups(),
 			nil,
 			arktest.NewLogger(),
+			logrus.InfoLevel,
 		).(*downloadRequestController)
 	)
 
@@ -69,9 +70,7 @@ func newDownloadRequestTestHarness(t *testing.T) *downloadRequestTestHarness {
 
 	controller.clock = clock.NewFakeClock(clockTime)
 
-	controller.newPluginManager = func(_ logrus.FieldLogger, _ logrus.Level, _ plugin.Registry) plugin.Manager {
-		return pluginManager
-	}
+	controller.newPluginManager = func(_ logrus.FieldLogger) plugin.Manager { return pluginManager }
 
 	pluginManager.On("CleanupClients").Return()
 	objectStore.On("Init", mock.Anything).Return(nil)