Remove unnecessary nil checks on the manager provided to Run.

Author: joshlreese

providers/kind/provider.go

@@ -152,15 +152,13 @@ func (p *Provider) Run(ctx context.Context, mgr mcmanager.Manager) error {
 			p.log.Info("Added new cluster", "cluster", clusterName)
 
 			// engage manager
-			if mgr != nil {
-				if err := mgr.Engage(clusterCtx, clusterName, cl); err != nil {
-					log.Error(err, "failed to engage manager")
-					p.lock.Lock()
-					delete(p.clusters, clusterName)
-					delete(p.cancelFns, clusterName)
-					p.lock.Unlock()
-					return false, nil
-				}
+			if err := mgr.Engage(clusterCtx, clusterName, cl); err != nil {
+				log.Error(err, "failed to engage manager")
+				p.lock.Lock()
+				delete(p.clusters, clusterName)
+				delete(p.cancelFns, clusterName)
+				p.lock.Unlock()
+				return false, nil
 			}
 		}
 

providers/single/provider.go

@@ -46,10 +46,8 @@ func New(name string, cl cluster.Cluster) *Provider {
 
 // Run starts the provider and blocks.
 func (p *Provider) Run(ctx context.Context, mgr mcmanager.Manager) error {
-	if mgr != nil {
-		if err := mgr.Engage(ctx, p.name, p.cl); err != nil {
-			return err
-		}
+	if err := mgr.Engage(ctx, p.name, p.cl); err != nil {
+		return err
 	}
 	<-ctx.Done()
 	return nil