Store GatewayKey in proxycfg snapshot for re-use

agent/proxycfg/manager_test.go

@@ -239,6 +239,7 @@ func TestManager_BasicLifecycle(t *testing.T) {
 					IntentionsSet:          true,
 				},
 				Datacenter: "dc1",
+				Locality:   GatewayKey{Datacenter: "dc1", Partition: structs.PartitionOrDefault("")},
 			},
 		},
 		{
@@ -296,6 +297,7 @@ func TestManager_BasicLifecycle(t *testing.T) {
 					IntentionsSet:          true,
 				},
 				Datacenter: "dc1",
+				Locality:   GatewayKey{Datacenter: "dc1", Partition: structs.PartitionOrDefault("")},
 			},
 		},
 	}

agent/proxycfg/mesh_gateway.go

@@ -144,7 +144,7 @@ func (s *handlerMeshGateway) handleUpdate(ctx context.Context, u cache.UpdateEve
 		for dc, nodes := range dcIndexedNodes.DatacenterNodes {
 			snap.MeshGateway.HostnameDatacenters[dc] = hostnameEndpoints(
 				s.logger.Named(logging.MeshGateway),
-				GatewayKey{Partition: snap.ProxyID.PartitionOrDefault(), Datacenter: snap.Datacenter},
+				snap.Locality,
 				nodes,
 			)
 		}
@@ -327,7 +327,7 @@ func (s *handlerMeshGateway) handleUpdate(ctx context.Context, u cache.UpdateEve
 				snap.MeshGateway.GatewayGroups[key] = resp.Nodes
 				snap.MeshGateway.HostnameDatacenters[key] = hostnameEndpoints(
 					s.logger.Named(logging.MeshGateway),
-					GatewayKey{Partition: snap.ProxyID.PartitionOrDefault(), Datacenter: snap.Datacenter},
+					snap.Locality,
 					resp.Nodes,
 				)
 			}

agent/proxycfg/snapshot.go

@@ -408,6 +408,7 @@ type ConfigSnapshot struct {
 	Proxy                 structs.ConnectProxyConfig
 	Datacenter            string
 	IntentionDefaultAllow bool
+	Locality              GatewayKey
 
 	ServerSNIFn ServerSNIFunc
 	Roots       *structs.IndexedCARoots

agent/proxycfg/state.go

@@ -254,6 +254,7 @@ func newConfigSnapshotFromServiceInstance(s serviceInstance, config stateConfig)
 		TaggedAddresses:       s.taggedAddresses,
 		Proxy:                 s.proxyCfg,
 		Datacenter:            config.source.Datacenter,
+		Locality:              GatewayKey{Datacenter: config.source.Datacenter, Partition: s.proxyID.PartitionOrDefault()},
 		ServerSNIFn:           config.serverSNIFn,
 		IntentionDefaultAllow: config.intentionDefaultAllow,
 	}

agent/proxycfg/terminating_gateway.go

@@ -286,7 +286,7 @@ func (s *handlerTerminatingGateway) handleUpdate(ctx context.Context, u cache.Up
 			snap.TerminatingGateway.ServiceGroups[sn] = resp.Nodes
 			snap.TerminatingGateway.HostnameServices[sn] = hostnameEndpoints(
 				s.logger,
-				GatewayKey{Partition: snap.ProxyID.PartitionOrDefault(), Datacenter: snap.Datacenter},
+				snap.Locality,
 				resp.Nodes,
 			)
 		}

agent/proxycfg/testing.go

@@ -13,6 +13,7 @@ import (
 	"github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
 
+	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/cache"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/connect"
@@ -674,6 +675,7 @@ func TestConfigSnapshot(t testing.T) *ConfigSnapshot {
 	upstreams := structs.TestUpstreams(t)
 
 	return &ConfigSnapshot{
+		Locality: GatewayKey{Datacenter: "dc1", Partition: acl.DefaultPartitionName},
 		Kind:     structs.ServiceKindConnectProxy,
 		Service:  "web-sidecar-proxy",
 		ProxyID:  structs.NewServiceID("web-sidecar-proxy", nil),
@@ -798,6 +800,7 @@ func testConfigSnapshotDiscoveryChain(t testing.T, variation string, additionalE
 	roots, leaf := TestCerts(t)
 
 	snap := &ConfigSnapshot{
+		Locality: GatewayKey{Datacenter: "dc1", Partition: acl.DefaultPartitionName},
 		Kind:     structs.ServiceKindConnectProxy,
 		Service:  "web-sidecar-proxy",
 		ProxyID:  structs.NewServiceID("web-sidecar-proxy", nil),
@@ -1510,6 +1513,7 @@ func TestConfigSnapshotMeshGatewayNoServices(t testing.T) *ConfigSnapshot {
 func testConfigSnapshotMeshGateway(t testing.T, populateServices bool, useFederationStates bool) *ConfigSnapshot {
 	roots, _ := TestCerts(t)
 	snap := &ConfigSnapshot{
+		Locality: GatewayKey{Datacenter: "dc1", Partition: acl.DefaultPartitionName},
 		Kind:     structs.ServiceKindMeshGateway,
 		Service:  "mesh-gateway",
 		ProxyID:  structs.NewServiceID("mesh-gateway", nil),
@@ -1721,6 +1725,7 @@ func testConfigSnapshotIngressGateway(
 	roots, leaf := TestCerts(t)
 
 	snap := &ConfigSnapshot{
+		Locality:   GatewayKey{Datacenter: "dc1", Partition: acl.DefaultPartitionName},
 		Kind:       structs.ServiceKindIngressGateway,
 		Service:    "ingress-gateway",
 		ProxyID:    structs.NewServiceID("ingress-gateway", nil),
@@ -1760,6 +1765,7 @@ func testConfigSnapshotIngressGateway(
 
 func TestConfigSnapshotExposeConfig(t testing.T) *ConfigSnapshot {
 	return &ConfigSnapshot{
+		Locality: GatewayKey{Datacenter: "dc1", Partition: acl.DefaultPartitionName},
 		Kind:     structs.ServiceKindConnectProxy,
 		Service:  "web-proxy",
 		ProxyID:  structs.NewServiceID("web-proxy", nil),
@@ -1801,6 +1807,7 @@ func testConfigSnapshotTerminatingGateway(t testing.T, populateServices bool) *C
 	roots, _ := TestCerts(t)
 
 	snap := &ConfigSnapshot{
+		Locality: GatewayKey{Datacenter: "dc1", Partition: acl.DefaultPartitionName},
 		Kind:     structs.ServiceKindTerminatingGateway,
 		Service:  "terminating-gateway",
 		ProxyID:  structs.NewServiceID("terminating-gateway", nil),
@@ -2035,6 +2042,7 @@ func testConfigSnapshotTerminatingGateway(t testing.T, populateServices bool) *C
 
 func TestConfigSnapshotGRPCExposeHTTP1(t testing.T) *ConfigSnapshot {
 	return &ConfigSnapshot{
+		Locality: GatewayKey{Datacenter: "dc1", Partition: acl.DefaultPartitionName},
 		Kind:     structs.ServiceKindConnectProxy,
 		Service:  "grpc-proxy",
 		ProxyID:  structs.NewServiceID("grpc-proxy", nil),

agent/xds/clusters.go

@@ -299,10 +299,9 @@ func (s *ResourceGenerator) makeGatewayServiceClusters(
 			hostnameEndpoints = cfgSnap.TerminatingGateway.HostnameServices[svc]
 		}
 
-		localKey := proxycfg.GatewayKey{Partition: cfgSnap.ProxyID.PartitionOrDefault(), Datacenter: cfgSnap.Datacenter}
 		var isRemote bool
 		if len(services[svc]) > 0 {
-			isRemote = !localKey.Matches(services[svc][0].Node.Datacenter, services[svc][0].Node.PartitionOrDefault())
+			isRemote = !cfgSnap.Locality.Matches(services[svc][0].Node.Datacenter, services[svc][0].Node.PartitionOrDefault())
 		}
 
 		opts := gatewayClusterOpts{

agent/xds/endpoints.go

@@ -51,7 +51,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotConnectProxy(cfgSnap *proxycfg.
 		es := s.endpointsFromDiscoveryChain(
 			id,
 			chain,
-			proxycfg.GatewayKey{Datacenter: cfgSnap.Datacenter, Partition: cfgSnap.ProxyID.PartitionOrDefault()},
+			cfgSnap.Locality,
 			cfgSnap.ConnectProxy.UpstreamConfig[id],
 			cfgSnap.ConnectProxy.WatchedUpstreamEndpoints[id],
 			cfgSnap.ConnectProxy.WatchedGatewayEndpoints[id],
@@ -79,7 +79,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotConnectProxy(cfgSnap *proxycfg.
 				[]loadAssignmentEndpointGroup{
 					{Endpoints: endpoints},
 				},
-				proxycfg.GatewayKey{Datacenter: cfgSnap.Datacenter, Partition: cfgSnap.ProxyID.PartitionOrDefault()},
+				cfgSnap.Locality,
 			)
 			resources = append(resources, la)
 		}
@@ -140,7 +140,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotMeshGateway(cfgSnap *proxycfg.C
 				[]loadAssignmentEndpointGroup{
 					{Endpoints: endpoints},
 				},
-				proxycfg.GatewayKey{Datacenter: cfgSnap.Datacenter, Partition: cfgSnap.ProxyID.PartitionOrDefault()},
+				cfgSnap.Locality,
 			)
 			resources = append(resources, la)
 		}
@@ -155,7 +155,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotMeshGateway(cfgSnap *proxycfg.C
 				[]loadAssignmentEndpointGroup{
 					{Endpoints: endpoints},
 				},
-				proxycfg.GatewayKey{Datacenter: cfgSnap.Datacenter, Partition: cfgSnap.ProxyID.PartitionOrDefault()},
+				cfgSnap.Locality,
 			)
 			resources = append(resources, la)
 		}
@@ -256,7 +256,7 @@ func (s *ResourceGenerator) endpointsFromServicesAndResolvers(
 			la := makeLoadAssignment(
 				clusterName,
 				groups,
-				proxycfg.GatewayKey{Datacenter: cfgSnap.Datacenter, Partition: cfgSnap.ProxyID.PartitionOrDefault()},
+				cfgSnap.Locality,
 			)
 			resources = append(resources, la)
 		}