review nits

Author: mjudeikis

providers/file/provider.go

@@ -136,15 +136,18 @@ type Provider struct {
 
 	log logr.Logger
 
-	clustersLock  sync.RWMutex
+	lock          sync.RWMutex
 	aware         multicluster.Aware
 	clusters      map[string]cluster.Cluster
 	clusterCancel map[string]func()
 }
 
 // Start starts the provider and updates the clusters and is blocking.
 func (p *Provider) Start(ctx context.Context, aware multicluster.Aware) error {
+	p.lock.Lock()
+	defer p.lock.Unlock()
 	p.aware = aware
+
 	if err := p.run(ctx); err != nil {
 		return fmt.Errorf("initial update failed: %w", err)
 	}
@@ -202,10 +205,10 @@ func (p *Provider) RunOnce(ctx context.Context) error {
 func (p *Provider) addCluster(ctx context.Context, name string, cl cluster.Cluster) {
 	ctx, cancel := context.WithCancel(ctx)
 
-	p.clustersLock.Lock()
+	p.lock.Lock()
 	p.clusters[name] = cl
 	p.clusterCancel[name] = cancel
-	p.clustersLock.Unlock()
+	p.lock.Unlock()
 
 	go func() {
 		if err := cl.Start(ctx); err != nil {
@@ -223,8 +226,8 @@ func (p *Provider) addCluster(ctx context.Context, name string, cl cluster.Clust
 }
 
 func (p *Provider) removeCluster(name string) {
-	p.clustersLock.Lock()
-	defer p.clustersLock.Unlock()
+	p.lock.Lock()
+	defer p.lock.Unlock()
 
 	if cancel, ok := p.clusterCancel[name]; ok {
 		cancel()
@@ -276,8 +279,8 @@ func (p *Provider) run(ctx context.Context) error {
 // If the cluster name is empty (""), it returns the first cluster
 // found.
 func (p *Provider) Get(_ context.Context, clusterName string) (cluster.Cluster, error) {
-	p.clustersLock.RLock()
-	defer p.clustersLock.RUnlock()
+	p.lock.RLock()
+	defer p.lock.RUnlock()
 
 	if clusterName == "" {
 		for _, cl := range p.clusters {
@@ -294,8 +297,8 @@ func (p *Provider) Get(_ context.Context, clusterName string) (cluster.Cluster,
 
 // IndexField indexes a field on all clusters.
 func (p *Provider) IndexField(ctx context.Context, obj client.Object, field string, extractValue client.IndexerFunc) error {
-	p.clustersLock.RLock()
-	defer p.clustersLock.RUnlock()
+	p.lock.RLock()
+	defer p.lock.RUnlock()
 
 	for name, cl := range p.clusters {
 		if err := cl.GetCache().IndexField(ctx, obj, field, extractValue); err != nil {
@@ -307,7 +310,7 @@ func (p *Provider) IndexField(ctx context.Context, obj client.Object, field stri
 
 // ClusterNames returns the names of all clusters known to the provider.
 func (p *Provider) ClusterNames() []string {
-	p.clustersLock.RLock()
-	defer p.clustersLock.RUnlock()
+	p.lock.RLock()
+	defer p.lock.RUnlock()
 	return slices.Sorted(maps.Keys(p.clusters))
 }

providers/namespace/provider.go

@@ -62,7 +62,9 @@ func New(cl cluster.Cluster) *Provider {
 
 // Start starts the provider and blocks.
 func (p *Provider) Start(ctx context.Context, aware multicluster.Aware) error {
+	p.lock.Lock()
 	p.aware = aware
+	p.lock.Unlock()
 
 	nsInf, err := p.cluster.GetCache().GetInformer(ctx, &corev1.Namespace{})
 	if err != nil {

providers/single/provider.go

@@ -30,9 +30,8 @@ var _ multicluster.Provider = &Provider{}
 
 // Provider is a provider that engages the passed cluster.
 type Provider struct {
-	name  string
-	cl    cluster.Cluster
-	aware multicluster.Aware
+	name string
+	cl   cluster.Cluster
 }
 
 // New returns a provider engaging the passed cluster under the given name.
@@ -49,9 +48,8 @@ func (p *Provider) Start(ctx context.Context, aware multicluster.Aware) error {
 	if aware == nil {
 		return fmt.Errorf("manager is not set")
 	}
-	p.aware = aware
 
-	if err := p.aware.Engage(ctx, p.name, p.cl); err != nil {
+	if err := aware.Engage(ctx, p.name, p.cl); err != nil {
 		return err
 	}
 	<-ctx.Done()