stubserver: support xds-enabled grpc server #7613
Merged
Conversation
This file contains 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 ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #7613 +/- ##
==========================================
- Coverage 82.01% 81.84% -0.18%
==========================================
Files 361 361
Lines 27813 27817 +4
==========================================
- Hits 22812 22767 -45
- Misses 3822 3853 +31
- Partials 1179 1197 +18
|
dfawley
reviewed
Sep 12, 2024
internal/stubserver/stubserver.go
Outdated
| @@ -39,6 +40,15 @@ import ( | |||
| testpb "google.golang.org/grpc/interop/grpc_testing" | |||
| ) | |||
|
|
|||
| // StoppableServiceRegistrar is an interface that extends the grpc.ServiceRegistrar | |||
| // interface with additional methods to stop and gracefully stop the server. | |||
| type StoppableServiceRegistrar interface { | |||
There was a problem hiding this comment.
How do you feel about calling this GRPCServer
internal/stubserver/stubserver.go
Outdated
| @@ -154,9 +171,14 @@ func (ss *StubServer) StartHandlerServer(sopts ...grpc.ServerOption) error { | |||
| return err | |||
| } | |||
|
|
|||
| handler, ok := ss.S.(interface{ http.Handler }) | |||
| if !ok { | |||
| return fmt.Errorf("server of type %T does not implement http.Handler", ss.S) | |||
There was a problem hiding this comment.
panic instead? This is a programming error?
There was a problem hiding this comment.
Switched to panic. The ServeHTTP method is only supported by the grpc.Server and not by the xds.GRPCServer, but I think it's fine to panic here since tests shouldn't be trying to server HTTP using an xds-enabled grpc server.
dfawley
approved these changes
Sep 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #7291
RELEASE NOTES: none