Skip to content

xds: Envoy proto sync to 2024-11-11 #11816

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 7 commits into from
Jan 17, 2025

Conversation

shivaspeaks
Copy link
Member

@shivaspeaks shivaspeaks commented Jan 10, 2025

envoyproxy/envoy: Sync protos to the latest imported version envoyproxy/envoy@0b90f64 (commit 2024-11-11).

Should be a noop, just a routine xDS proto update to make upcoming xDS-HTTP CONNECT related imports simpler.

@shivaspeaks
Copy link
Member Author

shivaspeaks commented Jan 10, 2025

The failure is due to the deprecation of setMetadata() in Builder. See rbac.proto

I tried to replace it with sourced_metadata but little did I know it takes some more effort from reading documents to adding a new parser for SOURCED_METADATA here

private static Matcher parsePermission(Permission permission) {
and also deleting the deprecated METADATA.

For now I can add a suppress warning for deprecation to the test method and create a tracking issue to this.

cc @ejona86 @kannanjgithub

@ejona86
Copy link
Member

ejona86 commented Jan 10, 2025

We need to still support the old field, so @SuppressWarnings is appropriate. However, it is best to only suppress a single line. You can only do suppressions on declarations, though, so the code would need to change to be more like @SuppressWarnings("deprecation") Permission metadata = Permission.newBuilder().setMetadata(metadataMatcher).build(). Create a new issue to track implementing sourced_metadata.

@ejona86
Copy link
Member

ejona86 commented Jan 10, 2025

(And implementing sourced_metadata would be cross-language, so would have a gRFC. The issue can mention that.)

@shivaspeaks shivaspeaks changed the title xds: Envoy proto sync to 2024-12-09 xds: Envoy proto sync to 2024-11-11 Jan 16, 2025
Copy link
Member

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

Make sure to delete the tar.gz; that should not be checked into the repository.

@shivaspeaks shivaspeaks merged commit b44ebce into grpc:master Jan 17, 2025
16 checks passed
larry-safran pushed a commit to larry-safran/grpc-java that referenced this pull request Feb 5, 2025
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 29, 2025
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants