Skip to content

Commit 33ec81b

Browse files
CynicDogCynicDog
authored
xds: move all functionality from xds/internal to internal/xds (#8515)
Fixes #7290, ensuring that only user-facing functionality remains in the top-level xds package. Updates all import paths and aliases to reference the new internal/xds package, using aliases (e.g., `internal` → `xds` or `xdsinternal`) where needed to minimize changes to call sites. No functional changes intended; this is purely a package path reorganization. RELEASE NOTES: none
1 parent 9ac0ec8 commit 33ec81b

File tree

236 files changed

+502
-518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+502
-518
lines changed

‎.github/workflows/testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
echo -e "\n-- Running Interop Test --"
126126
interop/interop_test.sh
127127
echo -e "\n-- Running xDS E2E Test --"
128-
xds/internal/test/e2e/run.sh
128+
internal/xds/test/e2e/run.sh
129129
echo -e "\n-- Running protoc-gen-go-grpc test --"
130130
./scripts/vet-proto.sh -install
131131
cmd/protoc-gen-go-grpc/protoc-gen-go-grpc_test.sh

‎gcp/observability/go.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -892,6 +892,7 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH
892892
github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
893893
github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
894894
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
895+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv1aFbZMiM9vblcSArJRf2Irls=
895896
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
896897
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
897898
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
@@ -918,9 +919,11 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB
918919
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
919920
github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
920921
github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
922+
github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
921923
github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
922924
github.com/envoyproxy/go-control-plane/envoy v1.32.2/go.mod h1:eR2SOX2IedqlPvmiKjUH7Wu//S602JKI7HPC/L3SRq8=
923925
github.com/envoyproxy/go-control-plane/envoy v1.32.3/go.mod h1:F6hWupPfh75TBXGKA++MCT/CZHFq5r9/uwt/kQYkZfE=
926+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A=
924927
github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw=
925928
github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
926929
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
@@ -929,6 +932,7 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+
929932
github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
930933
github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
931934
github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
935+
github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
932936
github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
933937
github.com/esiqveland/notify v0.11.0/go.mod h1:63UbVSaeJwF0LVJARHFuPgUAoM7o1BEvCZyknsuonBc=
934938
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -1253,6 +1257,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
12531257
github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
12541258
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
12551259
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
1260+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
12561261
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
12571262
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
12581263
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=

‎xds/internal/balancer/balancer.go renamed to ‎internal/xds/balancer/balancer.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ package balancer
2222
import (
2323
_ "google.golang.org/grpc/balancer/leastrequest" // Register the least_request_experimental balancer
2424
_ "google.golang.org/grpc/balancer/weightedtarget" // Register the weighted_target balancer
25-
_ "google.golang.org/grpc/xds/internal/balancer/cdsbalancer" // Register the CDS balancer
26-
_ "google.golang.org/grpc/xds/internal/balancer/clusterimpl" // Register the xds_cluster_impl balancer
27-
_ "google.golang.org/grpc/xds/internal/balancer/clustermanager" // Register the xds_cluster_manager balancer
28-
_ "google.golang.org/grpc/xds/internal/balancer/clusterresolver" // Register the xds_cluster_resolver balancer
29-
_ "google.golang.org/grpc/xds/internal/balancer/outlierdetection" // Register the outlier_detection balancer
30-
_ "google.golang.org/grpc/xds/internal/balancer/priority" // Register the priority balancer
25+
_ "google.golang.org/grpc/internal/xds/balancer/cdsbalancer" // Register the CDS balancer
26+
_ "google.golang.org/grpc/internal/xds/balancer/clusterimpl" // Register the xds_cluster_impl balancer
27+
_ "google.golang.org/grpc/internal/xds/balancer/clustermanager" // Register the xds_cluster_manager balancer
28+
_ "google.golang.org/grpc/internal/xds/balancer/clusterresolver" // Register the xds_cluster_resolver balancer
29+
_ "google.golang.org/grpc/internal/xds/balancer/outlierdetection" // Register the outlier_detection balancer
30+
_ "google.golang.org/grpc/internal/xds/balancer/priority" // Register the priority balancer
3131
)

‎xds/internal/balancer/cdsbalancer/aggregate_cluster_test.go renamed to ‎internal/xds/balancer/cdsbalancer/aggregate_cluster_test.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
"google.golang.org/grpc/internal/stubserver"
3232
"google.golang.org/grpc/internal/testutils"
3333
"google.golang.org/grpc/internal/testutils/xds/e2e"
34+
xdsinternal "google.golang.org/grpc/internal/xds"
35+
"google.golang.org/grpc/internal/xds/balancer/clusterresolver"
36+
"google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version"
3437
"google.golang.org/grpc/serviceconfig"
3538
"google.golang.org/grpc/status"
36-
"google.golang.org/grpc/xds/internal"
37-
"google.golang.org/grpc/xds/internal/balancer/clusterresolver"
38-
"google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version"
3939

4040
v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
4141
v3endpointpb "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
@@ -88,7 +88,7 @@ func (s) TestAggregateClusterSuccess_LeafNode(t *testing.T) {
8888
Type: clusterresolver.DiscoveryMechanismTypeEDS,
8989
EDSServiceName: serviceName,
9090
OutlierDetection: json.RawMessage(`{}`),
91-
TelemetryLabels: internal.UnknownCSMLabels,
91+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
9292
}},
9393
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
9494
},
@@ -98,7 +98,7 @@ func (s) TestAggregateClusterSuccess_LeafNode(t *testing.T) {
9898
Type: clusterresolver.DiscoveryMechanismTypeEDS,
9999
EDSServiceName: serviceName + "-new",
100100
OutlierDetection: json.RawMessage(`{}`),
101-
TelemetryLabels: internal.UnknownCSMLabels,
101+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
102102
}},
103103
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
104104
},
@@ -113,7 +113,7 @@ func (s) TestAggregateClusterSuccess_LeafNode(t *testing.T) {
113113
Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS,
114114
DNSHostname: "dns_host:8080",
115115
OutlierDetection: json.RawMessage(`{}`),
116-
TelemetryLabels: internal.UnknownCSMLabels,
116+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
117117
}},
118118
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
119119
},
@@ -123,7 +123,7 @@ func (s) TestAggregateClusterSuccess_LeafNode(t *testing.T) {
123123
Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS,
124124
DNSHostname: "dns_host_new:8080",
125125
OutlierDetection: json.RawMessage(`{}`),
126-
TelemetryLabels: internal.UnknownCSMLabels,
126+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
127127
}},
128128
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
129129
},
@@ -218,14 +218,14 @@ func (s) TestAggregateClusterSuccess_ThenUpdateChildClusters(t *testing.T) {
218218
Type: clusterresolver.DiscoveryMechanismTypeEDS,
219219
EDSServiceName: serviceName,
220220
OutlierDetection: json.RawMessage(`{}`),
221-
TelemetryLabels: internal.UnknownCSMLabels,
221+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
222222
},
223223
{
224224
Cluster: dnsClusterName,
225225
Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS,
226226
DNSHostname: fmt.Sprintf("%s:%d", dnsHostName, dnsPort),
227227
OutlierDetection: json.RawMessage(`{}`),
228-
TelemetryLabels: internal.UnknownCSMLabels,
228+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
229229
},
230230
},
231231
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
@@ -256,14 +256,14 @@ func (s) TestAggregateClusterSuccess_ThenUpdateChildClusters(t *testing.T) {
256256
Type: clusterresolver.DiscoveryMechanismTypeEDS,
257257
EDSServiceName: serviceName,
258258
OutlierDetection: json.RawMessage(`{}`),
259-
TelemetryLabels: internal.UnknownCSMLabels,
259+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
260260
},
261261
{
262262
Cluster: dnsClusterNameNew,
263263
Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS,
264264
DNSHostname: fmt.Sprintf("%s:%d", dnsHostNameNew, dnsPort),
265265
OutlierDetection: json.RawMessage(`{}`),
266-
TelemetryLabels: internal.UnknownCSMLabels,
266+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
267267
},
268268
},
269269
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
@@ -309,14 +309,14 @@ func (s) TestAggregateClusterSuccess_ThenChangeRootToEDS(t *testing.T) {
309309
Type: clusterresolver.DiscoveryMechanismTypeEDS,
310310
EDSServiceName: serviceName,
311311
OutlierDetection: json.RawMessage(`{}`),
312-
TelemetryLabels: internal.UnknownCSMLabels,
312+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
313313
},
314314
{
315315
Cluster: dnsClusterName,
316316
Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS,
317317
DNSHostname: fmt.Sprintf("%s:%d", dnsHostName, dnsPort),
318318
OutlierDetection: json.RawMessage(`{}`),
319-
TelemetryLabels: internal.UnknownCSMLabels,
319+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
320320
},
321321
},
322322
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
@@ -342,7 +342,7 @@ func (s) TestAggregateClusterSuccess_ThenChangeRootToEDS(t *testing.T) {
342342
Type: clusterresolver.DiscoveryMechanismTypeEDS,
343343
EDSServiceName: serviceName,
344344
OutlierDetection: json.RawMessage(`{}`),
345-
TelemetryLabels: internal.UnknownCSMLabels,
345+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
346346
}},
347347
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
348348
}
@@ -377,7 +377,7 @@ func (s) TestAggregatedClusterSuccess_SwitchBetweenLeafAndAggregate(t *testing.T
377377
Type: clusterresolver.DiscoveryMechanismTypeEDS,
378378
EDSServiceName: serviceName,
379379
OutlierDetection: json.RawMessage(`{}`),
380-
TelemetryLabels: internal.UnknownCSMLabels,
380+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
381381
}},
382382
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
383383
}
@@ -406,14 +406,14 @@ func (s) TestAggregatedClusterSuccess_SwitchBetweenLeafAndAggregate(t *testing.T
406406
Type: clusterresolver.DiscoveryMechanismTypeEDS,
407407
EDSServiceName: serviceName,
408408
OutlierDetection: json.RawMessage(`{}`),
409-
TelemetryLabels: internal.UnknownCSMLabels,
409+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
410410
},
411411
{
412412
Cluster: dnsClusterName,
413413
Type: clusterresolver.DiscoveryMechanismTypeLogicalDNS,
414414
DNSHostname: fmt.Sprintf("%s:%d", dnsHostName, dnsPort),
415415
OutlierDetection: json.RawMessage(`{}`),
416-
TelemetryLabels: internal.UnknownCSMLabels,
416+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
417417
},
418418
},
419419
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
@@ -437,7 +437,7 @@ func (s) TestAggregatedClusterSuccess_SwitchBetweenLeafAndAggregate(t *testing.T
437437
Type: clusterresolver.DiscoveryMechanismTypeEDS,
438438
EDSServiceName: serviceName,
439439
OutlierDetection: json.RawMessage(`{}`),
440-
TelemetryLabels: internal.UnknownCSMLabels,
440+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
441441
}},
442442
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
443443
}
@@ -590,7 +590,7 @@ func (s) TestAggregatedClusterSuccess_DiamondDependency(t *testing.T) {
590590
Type: clusterresolver.DiscoveryMechanismTypeEDS,
591591
EDSServiceName: serviceName,
592592
OutlierDetection: json.RawMessage(`{}`),
593-
TelemetryLabels: internal.UnknownCSMLabels,
593+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
594594
}},
595595
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
596596
}
@@ -658,14 +658,14 @@ func (s) TestAggregatedClusterSuccess_IgnoreDups(t *testing.T) {
658658
Type: clusterresolver.DiscoveryMechanismTypeEDS,
659659
EDSServiceName: serviceName,
660660
OutlierDetection: json.RawMessage(`{}`),
661-
TelemetryLabels: internal.UnknownCSMLabels,
661+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
662662
},
663663
{
664664
Cluster: clusterNameD,
665665
Type: clusterresolver.DiscoveryMechanismTypeEDS,
666666
EDSServiceName: serviceName,
667667
OutlierDetection: json.RawMessage(`{}`),
668-
TelemetryLabels: internal.UnknownCSMLabels,
668+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
669669
},
670670
},
671671
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
@@ -748,7 +748,7 @@ func (s) TestAggregatedCluster_NodeChildOfItself(t *testing.T) {
748748
Type: clusterresolver.DiscoveryMechanismTypeEDS,
749749
EDSServiceName: serviceName,
750750
OutlierDetection: json.RawMessage(`{}`),
751-
TelemetryLabels: internal.UnknownCSMLabels,
751+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
752752
}},
753753
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
754754
}
@@ -854,7 +854,7 @@ func (s) TestAggregatedCluster_CycleWithLeafNode(t *testing.T) {
854854
Type: clusterresolver.DiscoveryMechanismTypeEDS,
855855
EDSServiceName: serviceName,
856856
OutlierDetection: json.RawMessage(`{}`),
857-
TelemetryLabels: internal.UnknownCSMLabels,
857+
TelemetryLabels: xdsinternal.UnknownCSMLabels,
858858
}},
859859
XDSLBPolicy: json.RawMessage(`[{"xds_wrr_locality_experimental": {"childPolicy": [{"round_robin": {}}]}}]`),
860860
}

‎xds/internal/balancer/cdsbalancer/cdsbalancer.go renamed to ‎internal/xds/balancer/cdsbalancer/cdsbalancer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ import (
3535
"google.golang.org/grpc/internal/grpclog"
3636
"google.golang.org/grpc/internal/grpcsync"
3737
"google.golang.org/grpc/internal/pretty"
38+
"google.golang.org/grpc/internal/xds/balancer/clusterresolver"
39+
"google.golang.org/grpc/internal/xds/xdsclient"
40+
"google.golang.org/grpc/internal/xds/xdsclient/xdsresource"
3841
"google.golang.org/grpc/resolver"
3942
"google.golang.org/grpc/serviceconfig"
40-
"google.golang.org/grpc/xds/internal/balancer/clusterresolver"
41-
"google.golang.org/grpc/xds/internal/xdsclient"
42-
"google.golang.org/grpc/xds/internal/xdsclient/xdsresource"
4343
)
4444

4545
const (

‎xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go renamed to ‎internal/xds/balancer/cdsbalancer/cdsbalancer_security_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ import (
4545
"google.golang.org/grpc/internal/testutils"
4646
"google.golang.org/grpc/internal/testutils/xds/e2e"
4747
"google.golang.org/grpc/internal/xds/bootstrap"
48+
"google.golang.org/grpc/internal/xds/xdsclient"
4849
"google.golang.org/grpc/peer"
4950
"google.golang.org/grpc/resolver"
5051
"google.golang.org/grpc/resolver/manual"
5152
"google.golang.org/grpc/serviceconfig"
5253
"google.golang.org/grpc/testdata"
53-
"google.golang.org/grpc/xds/internal/xdsclient"
5454

5555
v3clusterpb "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
5656
v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"

‎xds/internal/balancer/cdsbalancer/cdsbalancer_test.go renamed to ‎internal/xds/balancer/cdsbalancer/cdsbalancer_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ import (
3939
"google.golang.org/grpc/internal/stubserver"
4040
"google.golang.org/grpc/internal/testutils"
4141
"google.golang.org/grpc/internal/testutils/xds/e2e"
42+
xdsinternal "google.golang.org/grpc/internal/xds"
43+
"google.golang.org/grpc/internal/xds/balancer/clusterresolver"
4244
"google.golang.org/grpc/internal/xds/bootstrap"
45+
"google.golang.org/grpc/internal/xds/xdsclient"
46+
"google.golang.org/grpc/internal/xds/xdsclient/xdsresource"
47+
"google.golang.org/grpc/internal/xds/xdsclient/xdsresource/version"
4348
"google.golang.org/grpc/resolver"
4449
"google.golang.org/grpc/resolver/manual"
4550
"google.golang.org/grpc/serviceconfig"
4651
"google.golang.org/grpc/status"
47-
xdsinternal "google.golang.org/grpc/xds/internal"
48-
"google.golang.org/grpc/xds/internal/balancer/clusterresolver"
49-
"google.golang.org/grpc/xds/internal/xdsclient"
50-
"google.golang.org/grpc/xds/internal/xdsclient/xdsresource"
51-
"google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version"
5252
"google.golang.org/protobuf/types/known/durationpb"
5353
"google.golang.org/protobuf/types/known/wrapperspb"
5454

‎xds/internal/balancer/cdsbalancer/cluster_watcher.go renamed to ‎internal/xds/balancer/cdsbalancer/cluster_watcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package cdsbalancer
1919
import (
2020
"context"
2121

22-
"google.golang.org/grpc/xds/internal/xdsclient/xdsresource"
22+
"google.golang.org/grpc/internal/xds/xdsclient/xdsresource"
2323
)
2424

2525
// clusterWatcher implements the xdsresource.ClusterWatcher interface, and is

‎xds/internal/balancer/cdsbalancer/logging.go renamed to ‎internal/xds/balancer/cdsbalancer/logging.go

File renamed without changes.

‎xds/internal/balancer/clusterimpl/balancer_test.go renamed to ‎internal/xds/balancer/clusterimpl/balancer_test.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,13 @@ import (
3838
"google.golang.org/grpc/internal/grpctest"
3939
internalserviceconfig "google.golang.org/grpc/internal/serviceconfig"
4040
"google.golang.org/grpc/internal/testutils"
41-
"google.golang.org/grpc/internal/xds"
41+
xdsinternal "google.golang.org/grpc/internal/xds"
4242
"google.golang.org/grpc/internal/xds/bootstrap"
43+
"google.golang.org/grpc/internal/xds/clients"
44+
"google.golang.org/grpc/internal/xds/testutils/fakeclient"
45+
"google.golang.org/grpc/internal/xds/xdsclient"
4346
"google.golang.org/grpc/resolver"
4447
"google.golang.org/grpc/serviceconfig"
45-
xdsinternal "google.golang.org/grpc/xds/internal"
46-
"google.golang.org/grpc/xds/internal/clients"
47-
"google.golang.org/grpc/xds/internal/testutils/fakeclient"
48-
"google.golang.org/grpc/xds/internal/xdsclient"
4948

5049
v3orcapb "github.com/cncf/xds/go/xds/data/orca/v3"
5150
"github.com/google/go-cmp/cmp"
@@ -729,7 +728,7 @@ func (s) TestClusterNameInAddressAttributes(t *testing.T) {
729728
if got, want := addrs1[0].Addr, testBackendEndpoints[0].Addresses[0].Addr; got != want {
730729
t.Fatalf("sc is created with addr %v, want %v", got, want)
731730
}
732-
cn, ok := xds.GetXDSHandshakeClusterName(addrs1[0].Attributes)
731+
cn, ok := xdsinternal.GetXDSHandshakeClusterName(addrs1[0].Attributes)
733732
if !ok || cn != testClusterName {
734733
t.Fatalf("sc is created with addr with cluster name %v, %v, want cluster name %v", cn, ok, testClusterName)
735734
}
@@ -760,7 +759,7 @@ func (s) TestClusterNameInAddressAttributes(t *testing.T) {
760759
t.Fatalf("sc is created with addr %v, want %v", got, want)
761760
}
762761
// New addresses should have the new cluster name.
763-
cn2, ok := xds.GetXDSHandshakeClusterName(addrs2[0].Attributes)
762+
cn2, ok := xdsinternal.GetXDSHandshakeClusterName(addrs2[0].Attributes)
764763
if !ok || cn2 != testClusterName2 {
765764
t.Fatalf("sc is created with addr with cluster name %v, %v, want cluster name %v", cn2, ok, testClusterName2)
766765
}

0 commit comments

Comments
 (0)