Merge pull request #995 from njhale/refactor-opstatus

refactor(operatorstatus): make monitor constructor variadic

Author: openshift-merge-robot

cmd/olm/main.go

@@ -204,7 +204,7 @@ func main() {
 
 		names := *writePackageServerStatusName
 		discovery := opClient.KubernetesInterface().Discovery()
-		monitor, sender := operatorstatus.NewMonitor(names, logger, discovery, configClient)
+		monitor, sender := operatorstatus.NewMonitor(logger, discovery, configClient, names)
 
 		handler := operatorstatus.NewCSVWatchNotificationHandler(logger, op.GetCSVSetGenerator(), op.GetReplaceFinder(), sender)
 		op.RegisterCSVWatchNotification(handler)

pkg/lib/operatorstatus/monitor.go

@@ -2,7 +2,6 @@ package operatorstatus
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	configv1 "github.com/openshift/api/config/v1"
@@ -26,10 +25,8 @@ const (
 // to send update notifications to it.
 //
 // The name of the clusteroperator resource to monitor is specified in name.
-func NewMonitor(name string, log *logrus.Logger, discovery discovery.DiscoveryInterface, configClient configv1client.ConfigV1Interface) (Monitor, Sender) {
+func NewMonitor(log *logrus.Logger, discovery discovery.DiscoveryInterface, configClient configv1client.ConfigV1Interface, names ...string) (Monitor, Sender) {
 	logger := log.WithField("monitor", "clusteroperator")
-	names := split(name)
-
 	logger.Infof("monitoring the following components %s", names)
 
 	monitor := &monitor{
@@ -208,17 +205,3 @@ func Waiting(clock clock.Clock, name string) *configv1.ClusterOperatorStatus {
 
 	return status
 }
-
-func split(n string) []string {
-	names := make([]string, 0)
-
-	values := strings.Split(n, ",")
-	for _, v := range values {
-		v = strings.TrimSpace(v)
-		if v != "" {
-			names = append(names, v)
-		}
-	}
-
-	return names
-}