xds/internal: remove Generic resource Decoder and add concrete functions #8652
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #8652 +/- ##
==========================================
+ Coverage 81.21% 81.52% +0.30%
==========================================
Files 416 416
Lines 41002 40921 -81
==========================================
+ Hits 33298 33359 +61
+ Misses 6226 6167 -59
+ Partials 1478 1395 -83
🚀 New features to boost your workflow:
|
easwars
added
Type: Internal Cleanup
easwars
reviewed
Oct 15, 2025
easwars
reviewed
Oct 16, 2025
Comment on lines
33
to
35
| // Producer watches resources via the external xdsclient API. | ||
| type Producer interface { | ||
| // WatchResource uses xDS to discover the resource associated with the | ||
| // provided resource name. The resource type implementation determines how | ||
| // xDS responses are are deserialized and validated, as received from the | ||
| // xDS management server. Upon receipt of a response from the management | ||
| // server, an appropriate callback on the watcher is invoked. | ||
| WatchResource(rType Type, resourceName string, watcher ResourceWatcher) (cancel func()) | ||
| } | ||
|
|
||
| // ProducerV2 is like Producer, but uses the external xdsclient API. | ||
| // | ||
| // Once all resource type implementations have been migrated to use the external | ||
| // xdsclient API, this interface will be renamed to Producer and the existing | ||
| // Producer interface will be deleted. | ||
| type ProducerV2 interface { | ||
| WatchResourceV2(typeURL, resourceName string, watcher xdsclient.ResourceWatcher) (cancel func()) | ||
| WatchResource(typeURL, resourceName string, watcher xdsclient.ResourceWatcher) (cancel func()) |
There was a problem hiding this comment.
Could you please retain the old comments of the Producer interface. The fact that this interface is using the external xdsclient API is not very important here. Thanks.
| } | ||
|
|
||
| r.applyRouteConfigUpdate(update) | ||
| r.applyRouteConfigUpdate(*update) |
There was a problem hiding this comment.
We should change applyRouteConfigUpdate to accept a pointer and change the currentRouteConfig field to hold a pointer as well. That we won't have to deref the pointer here.
internal/xds/xdsclient/client.go
Outdated
| // the watcher is canceled. Callers need to handle this case. | ||
| WatchResource(rType xdsresource.Type, resourceName string, watcher xdsresource.ResourceWatcher) (cancel func()) | ||
|
|
||
| // WatchResourceV2 matches the API of the external xdsclient interface. |
There was a problem hiding this comment.
We want to retain the old docstring for WatchResource. That contains a bunch of useful information.
dfawley
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses: #8381
RELEASE NOTES: None