Skip to content

xds: move all functionality from xds/internal to internal/xds - #8515

Merged
easwars merged 2 commits into
grpc:masterfrom
CynicDog:move-xds-internal-to-internal-xds
Aug 19, 2025
Merged

xds: move all functionality from xds/internal to internal/xds#8515
easwars merged 2 commits into
grpc:masterfrom
CynicDog:move-xds-internal-to-internal-xds

Conversation

@CynicDog

@CynicDog CynicDog commented Aug 15, 2025

Copy link
Copy Markdown
Contributor

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., internalxds or xdsinternal) where needed to minimize changes to call sites.

No functional changes intended; this is purely a package path reorganization.

RELEASE NOTES: none

@codecov

codecov Bot commented Aug 15, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 66.66667% with 10 lines in your changes missing coverage. Please review.
✅ Project coverage is 81.91%. Comparing base (9ac0ec8) to head (05072c9).
⚠️ Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
internal/xds/xds.go 60.86% 8 Missing and 1 partial ⚠️
internal/xds/balancer/clusterimpl/clusterimpl.go 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8515      +/-   ##
==========================================
+ Coverage   81.82%   81.91%   +0.09%     
==========================================
  Files         413      412       -1     
  Lines       40518    40518              
==========================================
+ Hits        33153    33190      +37     
+ Misses       5989     5937      -52     
- Partials     1376     1391      +15     
Files with missing lines Coverage Δ
internal/xds/balancer/cdsbalancer/cdsbalancer.go 83.91% <ø> (ø)
...ternal/xds/balancer/cdsbalancer/cluster_watcher.go 100.00% <ø> (ø)
internal/xds/balancer/cdsbalancer/logging.go 100.00% <ø> (ø)
internal/xds/balancer/clusterimpl/config.go 100.00% <ø> (ø)
internal/xds/balancer/clusterimpl/logging.go 100.00% <ø> (ø)
internal/xds/balancer/clusterimpl/picker.go 100.00% <100.00%> (ø)
...balancer/clustermanager/balancerstateaggregator.go 91.57% <ø> (ø)
...rnal/xds/balancer/clustermanager/clustermanager.go 75.22% <ø> (ø)
internal/xds/balancer/clustermanager/config.go 100.00% <ø> (ø)
internal/xds/balancer/clustermanager/picker.go 100.00% <ø> (ø)
... and 104 more

... and 12 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@easwars easwars changed the title Moves all functionality from xds/internal to internal/xds in line wit… xds: move all functionality from xds/internal to internal/xds Aug 15, 2025
@easwars easwars self-assigned this Aug 15, 2025
@easwars easwars added the Type: Internal Cleanup Refactors, etc label Aug 15, 2025
@easwars easwars added this to the 1.76 Release milestone Aug 15, 2025

@easwars easwars left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Just a few minor comments.

Comment thread gcp/observability/go.sum
Comment thread internal/xds/internal.go Outdated
Comment thread internal/xds/internal_test.go
Comment thread interop/observability/go.sum
@easwars easwars assigned CynicDog and unassigned easwars Aug 15, 2025

@easwars easwars left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your contribution.

@easwars easwars assigned dfawley and unassigned CynicDog Aug 17, 2025
@easwars

easwars commented Aug 17, 2025

Copy link
Copy Markdown
Contributor

Moving to @dfawley for a second set of eyes.

@dfawley dfawley left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to take a lot of getting used to...

@dfawley dfawley assigned CynicDog and unassigned dfawley Aug 18, 2025
@dfawley

dfawley commented Aug 18, 2025

Copy link
Copy Markdown
Member

Could you please resolve the conflicts @CynicDog ? Thank you!

…h the plan

in grpc#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.
…test.go`

Per code review feedback, consolidated the contents of
internal/xds/internal.go into internal/xds/xds.go and
internal/xds/internal_test.go into internal/xds/xds_test.go
to keep related functionality in a single file and improve
code organization.
@CynicDog
CynicDog force-pushed the move-xds-internal-to-internal-xds branch from b9f518f to 05072c9 Compare August 19, 2025 00:03
@CynicDog

Copy link
Copy Markdown
Contributor Author

Hi @dfawley, conflicts are now resolved and the branch has been rebased on top of the latest master. Thanks!

@arjan-bal arjan-bal assigned dfawley and unassigned CynicDog Aug 19, 2025
@easwars
easwars merged commit 33ec81b into grpc:master Aug 19, 2025
15 checks passed
dimpavloff pushed a commit to dimpavloff/grpc-go that referenced this pull request Aug 22, 2025
…pc#8515)

Fixes grpc#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
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Feb 16, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

xds: move functionality from xds/internal to internal/xds

3 participants