[CE] Test tenancies for exported-services config manager (#20678)

Sync controller tests from ENT

internal/multicluster/internal/controllers/v1compat/controller.go

@@ -6,8 +6,11 @@ package v1compat
 import (
 	"context"
 	"fmt"
+	"slices"
 	"sort"
 
+	"golang.org/x/exp/maps"
+
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/internal/controller"
@@ -25,6 +28,7 @@ const (
 	controllerMetaKey = "managed-by-controller"
 )
 
+//go:generate mockery --name AggregatedConfig --inpackage --with-expecter --filename mock_AggregatedConfig.go
 type AggregatedConfig interface {
 	Start(context.Context)
 	GetExportedServicesConfigEntry(context.Context, string, *acl.EnterpriseMeta) (*structs.ExportedServicesConfigEntry, error)
@@ -87,7 +91,9 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c
 	entMeta.OverridePartition(req.ID.Tenancy.Partition)
 	existing, err := r.config.GetExportedServicesConfigEntry(ctx, req.ID.Tenancy.Partition, entMeta)
 	if err != nil {
-		rt.Logger.Error("error getting exported service config entry", "error", err)
+		// When we can't read the existing exported-services we purposely allow
+		// reconciler to continue so we can still write a new one
+		rt.Logger.Warn("error getting exported service config entry but continuing reconcile", "error", err)
 	}
 
 	if existing != nil && existing.Meta["managed-by-controller"] != ControllerName {
@@ -117,7 +123,6 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c
 		},
 		index.IndexQueryOptions{Prefix: true},
 	)
-
 	if err != nil {
 		rt.Logger.Error("error retrieving partition exported services", "error", err)
 		return err
@@ -133,9 +138,8 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c
 		},
 		index.IndexQueryOptions{Prefix: true},
 	)
-
 	if err != nil {
-		rt.Logger.Error("error retrieving namespace exported service", "error", err)
+		rt.Logger.Error("error retrieving namespace exported services", "error", err)
 		return err
 	}
 
@@ -149,7 +153,6 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c
 		},
 		index.IndexQueryOptions{Prefix: true},
 	)
-
 	if err != nil {
 		rt.Logger.Error("error retrieving exported services", "error", err)
 		return err
@@ -243,24 +246,24 @@ func (c *exportConsumers) addConsumers(consumers []*pbmulticluster.ExportedServi
 func (c *exportConsumers) configEntryConsumers() []structs.ServiceConsumer {
 	consumers := make([]structs.ServiceConsumer, 0, len(c.partitions)+len(c.peers)+len(c.samenessGroups))
 
-	partitions := keys(c.partitions)
-	sort.Strings(partitions)
+	partitions := maps.Keys(c.partitions)
+	slices.Sort(partitions)
 	for _, consumer := range partitions {
 		consumers = append(consumers, structs.ServiceConsumer{
 			Partition: consumer,
 		})
 	}
 
-	peers := keys(c.peers)
-	sort.Strings(peers)
+	peers := maps.Keys(c.peers)
+	slices.Sort(peers)
 	for _, consumer := range peers {
 		consumers = append(consumers, structs.ServiceConsumer{
 			Peer: consumer,
 		})
 	}
 
-	samenessGroups := keys(c.samenessGroups)
-	sort.Strings(samenessGroups)
+	samenessGroups := maps.Keys(c.samenessGroups)
+	slices.Sort(samenessGroups)
 	for _, consumer := range samenessGroups {
 		consumers = append(consumers, structs.ServiceConsumer{
 			SamenessGroup: consumer,
@@ -316,8 +319,8 @@ func (t *exportTracker) allExports() []structs.ExportedService {
 		})
 	}
 
-	namespaces := keys(t.namespaces)
-	sort.Strings(namespaces)
+	namespaces := maps.Keys(t.namespaces)
+	slices.Sort(namespaces)
 	for _, ns := range namespaces {
 		exports = append(exports, structs.ExportedService{
 			Name:      "*",
@@ -326,7 +329,7 @@ func (t *exportTracker) allExports() []structs.ExportedService {
 		})
 	}
 
-	services := keys(t.services)
+	services := maps.Keys(t.services)
 	sort.Slice(services, func(i, j int) bool {
 		// the partitions must already be equal because we are only
 		// looking at resource exports for a single partition.