cluster_resolver: move balancer config types into cluster_resolver pa…

…ckage and unexport (#4607)
grpc · Jul 22, 2021 · 582ef45 · 582ef45
1 parent c513103
commit 582ef45
Show file tree

Hide file tree

Showing 15 changed files with 371 additions and 450 deletions.
diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer.go b/xds/internal/balancer/cdsbalancer/cdsbalancer.go
@@ -35,7 +35,6 @@ import (
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/serviceconfig"
 	"google.golang.org/grpc/xds/internal/balancer/clusterresolver"
-	"google.golang.org/grpc/xds/internal/balancer/clusterresolver/balancerconfig"
 	"google.golang.org/grpc/xds/internal/xdsclient"
 )
 
@@ -304,12 +303,12 @@ func (b *cdsBalancer) handleWatchUpdate(update clusterHandlerUpdate) {
 		b.logger.Infof("Created child policy %p of type %s", b.childLB, clusterresolver.Name)
 	}
 
-	dms := make([]balancerconfig.DiscoveryMechanism, len(update.updates))
+	dms := make([]clusterresolver.DiscoveryMechanism, len(update.updates))
 	for i, cu := range update.updates {
 		switch cu.ClusterType {
 		case xdsclient.ClusterTypeEDS:
-			dms[i] = balancerconfig.DiscoveryMechanism{
-				Type:                  balancerconfig.DiscoveryMechanismTypeEDS,
+			dms[i] = clusterresolver.DiscoveryMechanism{
+				Type:                  clusterresolver.DiscoveryMechanismTypeEDS,
 				Cluster:               cu.ClusterName,
 				EDSServiceName:        cu.EDSServiceName,
 				MaxConcurrentRequests: cu.MaxRequests,
@@ -322,8 +321,8 @@ func (b *cdsBalancer) handleWatchUpdate(update clusterHandlerUpdate) {
 
 			}
 		case xdsclient.ClusterTypeLogicalDNS:
-			dms[i] = balancerconfig.DiscoveryMechanism{
-				Type:        balancerconfig.DiscoveryMechanismTypeLogicalDNS,
+			dms[i] = clusterresolver.DiscoveryMechanism{
+				Type:        clusterresolver.DiscoveryMechanismTypeLogicalDNS,
 				DNSHostname: cu.DNSHostName,
 			}
 		default:

diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
@@ -36,7 +36,6 @@ import (
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/serviceconfig"
 	"google.golang.org/grpc/xds/internal/balancer/clusterresolver"
-	"google.golang.org/grpc/xds/internal/balancer/clusterresolver/balancerconfig"
 	xdstestutils "google.golang.org/grpc/xds/internal/testutils"
 	"google.golang.org/grpc/xds/internal/testutils/fakeclient"
 	"google.golang.org/grpc/xds/internal/xdsclient"
@@ -198,8 +197,8 @@ func cdsCCS(cluster string, xdsC xdsclient.XDSClient) balancer.ClientConnState {
 // edsCCS is a helper function to construct a good update passed from the
 // cdsBalancer to the edsBalancer.
 func edsCCS(service string, countMax *uint32, enableLRS bool) balancer.ClientConnState {
-	discoveryMechanism := balancerconfig.DiscoveryMechanism{
-		Type:                  balancerconfig.DiscoveryMechanismTypeEDS,
+	discoveryMechanism := clusterresolver.DiscoveryMechanism{
+		Type:                  clusterresolver.DiscoveryMechanismTypeEDS,
 		Cluster:               service,
 		MaxConcurrentRequests: countMax,
 	}
@@ -208,7 +207,7 @@ func edsCCS(service string, countMax *uint32, enableLRS bool) balancer.ClientCon
 
 	}
 	lbCfg := &clusterresolver.LBConfig{
-		DiscoveryMechanisms: []balancerconfig.DiscoveryMechanism{discoveryMechanism},
+		DiscoveryMechanisms: []clusterresolver.DiscoveryMechanism{discoveryMechanism},
 	}
 
 	return balancer.ClientConnState{

diff --git a/xds/internal/balancer/clusterresolver/balancerconfig/type.go b/xds/internal/balancer/clusterresolver/balancerconfig/type.go
diff --git a/xds/internal/balancer/clusterresolver/balancerconfig/type_test.go b/xds/internal/balancer/clusterresolver/balancerconfig/type_test.go
diff --git a/xds/internal/balancer/clusterresolver/clusterresolver.go b/xds/internal/balancer/clusterresolver/clusterresolver.go
@@ -34,7 +34,6 @@ import (
 	"google.golang.org/grpc/internal/pretty"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/serviceconfig"
-	"google.golang.org/grpc/xds/internal/balancer/clusterresolver/balancerconfig"
 	"google.golang.org/grpc/xds/internal/balancer/priority"
 	"google.golang.org/grpc/xds/internal/xdsclient"
 )
@@ -138,7 +137,7 @@ type clusterResolverBalancer struct {
 	attrsWithClient *attributes.Attributes // Attributes with xdsClient attached to be passed to the child policies.
 
 	child               balancer.Balancer
-	priorities          []balancerconfig.PriorityConfig
+	priorities          []priorityConfig
 	watchUpdateReceived bool
 }
 
@@ -210,7 +209,7 @@ func (b *clusterResolverBalancer) updateChildConfig() error {
 		b.child = newChildBalancer(b.priorityBuilder, b.cc, b.bOpts)
 	}
 
-	childCfgBytes, addrs, err := balancerconfig.BuildPriorityConfigJSON(b.priorities, b.config.EndpointPickingPolicy)
+	childCfgBytes, addrs, err := buildPriorityConfigJSON(b.priorities, b.config.EndpointPickingPolicy)
 	if err != nil {
 		return fmt.Errorf("failed to build priority balancer config: %v", err)
 	}

diff --git a/xds/internal/balancer/clusterresolver/clusterresolver_test.go b/xds/internal/balancer/clusterresolver/clusterresolver_test.go
@@ -33,7 +33,6 @@ import (
 	"google.golang.org/grpc/internal/testutils"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/xds/internal"
-	"google.golang.org/grpc/xds/internal/balancer/clusterresolver/balancerconfig"
 	"google.golang.org/grpc/xds/internal/testutils/fakeclient"
 	"google.golang.org/grpc/xds/internal/xdsclient"
 
@@ -492,9 +491,9 @@ func (s) TestClientWatchEDS(t *testing.T) {
 
 func newLBConfigWithOneEDS(edsServiceName string) *LBConfig {
 	return &LBConfig{
-		DiscoveryMechanisms: []balancerconfig.DiscoveryMechanism{{
+		DiscoveryMechanisms: []DiscoveryMechanism{{
 			Cluster:        testClusterName,
-			Type:           balancerconfig.DiscoveryMechanismTypeEDS,
+			Type:           DiscoveryMechanismTypeEDS,
 			EDSServiceName: edsServiceName,
 		}},
 	}