api: fix v3 delta gRPC ADS support.#10678
Merged
htuch merged 2 commits intoenvoyproxy:masterfrom Apr 7, 2020
Merged
Conversation
Fixes envoyproxy#10651. Risk level: Low Testing: Extended api_version_integration_test to cover this regression. Signed-off-by: Harvey Tuch <htuch@google.com>
Member
Author
|
@mattklein123 this is a small fix that I think can intercept 1.14.0. |
mattklein123
reviewed
Apr 7, 2020
Comment on lines
+271
to
+275
| dyn_resources.ads_config().transport_api_version() == | ||
| envoy::config::core::v3::ApiVersion::V3 | ||
| ? "envoy.service.discovery.v3.AggregatedDiscoveryService.DeltaAggregatedResources" | ||
| : "envoy.service.discovery.v2.AggregatedDiscoveryService." | ||
| "DeltaAggregatedResources"), |
Member
There was a problem hiding this comment.
Would it be better to put this logic in type_to_endpoint.cc so that we have all of the version selection logic in one place? WDYT?
Member
Author
There was a problem hiding this comment.
Possibly, but ADS is an exception; there is no mapping from type to endpoint... we would probably want to rename that module.
Member
There was a problem hiding this comment.
Up to you. I think it would be better to co-locate this type of selection logic. Maybe at least put in a TODO if you don't want to do it now?
Member
Author
There was a problem hiding this comment.
TODOs added, I think this depends on where we go with #10650.
Signed-off-by: Harvey Tuch <htuch@google.com>
Contributor
|
/azp run envoy-presubmit |
|
Azure Pipelines successfully started running 1 pipeline(s). |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Fixes #10651.
Risk level: Low
Testing: Extended api_version_integration_test to cover this regression.
Signed-off-by: Harvey Tuch htuch@google.com