mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-26 06:16:56 +09:00
chore(deps): update dependencies, migrate to connectrpc.com/connect v2 (#39854)
Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
1 parent
98c613d943
commit
7e164fe61a
23 files changed
+754
-655
No files matched your search
@@ -12,11 +12,16 @@ import (
|
||||
"gitea.dev/actionslib/ping/v1/pingv1connect"
|
||||
"gitea.dev/modules/log"
|
||||
|
||||
"connectrpc.com/connect"
|
||||
"connectrpc.com/connect/v2"
|
||||
"connectrpc.com/connect/v2/connecthttp"
|
||||
)
|
||||
|
||||
func NewPingServiceHandler() (string, http.Handler) {
|
||||
return pingv1connect.NewPingServiceHandler(&Service{})
|
||||
server := connect.NewServer()
|
||||
pingv1connect.RegisterPingServiceHandler(server, &Service{})
|
||||
mux := http.NewServeMux()
|
||||
connecthttp.Mount(mux, server)
|
||||
return "/" + pingv1connect.PingServiceName + "/", mux
|
||||
}
|
||||
|
||||
var _ pingv1connect.PingServiceHandler = (*Service)(nil)
|
||||
@@ -25,12 +30,13 @@ type Service struct{}
|
||||
|
||||
func (s *Service) Ping(
|
||||
ctx context.Context,
|
||||
req *connect.Request[pingv1.PingRequest],
|
||||
) (*connect.Response[pingv1.PingResponse], error) {
|
||||
log.Trace("Content-Type: %s", req.Header().Get("Content-Type"))
|
||||
log.Trace("User-Agent: %s", req.Header().Get("User-Agent"))
|
||||
res := connect.NewResponse(&pingv1.PingResponse{
|
||||
Data: fmt.Sprintf("Hello, %s!", req.Msg.Data),
|
||||
})
|
||||
req *pingv1.PingRequest,
|
||||
) (*pingv1.PingResponse, error) {
|
||||
info, _ := connect.CallInfoForServerContext(ctx)
|
||||
log.Trace("Content-Type: %s", info.RequestHeader().Get("Content-Type"))
|
||||
log.Trace("User-Agent: %s", info.RequestHeader().Get("User-Agent"))
|
||||
res := &pingv1.PingResponse{
|
||||
Data: fmt.Sprintf("Hello, %s!", req.Data),
|
||||
}
|
||||
return res, nil
|
||||
}
|
||||
@@ -11,17 +11,15 @@ import (
|
||||
pingv1 "gitea.dev/actionslib/ping/v1"
|
||||
"gitea.dev/actionslib/ping/v1/pingv1connect"
|
||||
|
||||
"connectrpc.com/connect"
|
||||
"connectrpc.com/connect/v2"
|
||||
"connectrpc.com/connect/v2/connecthttp"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestService(t *testing.T) {
|
||||
mux := http.NewServeMux()
|
||||
mux.Handle(pingv1connect.NewPingServiceHandler(
|
||||
&Service{},
|
||||
))
|
||||
MainServiceTest(t, mux)
|
||||
_, handler := NewPingServiceHandler()
|
||||
MainServiceTest(t, handler)
|
||||
}
|
||||
|
||||
func MainServiceTest(t *testing.T, h http.Handler) {
|
||||
@@ -31,31 +29,31 @@ func MainServiceTest(t *testing.T, h http.Handler) {
|
||||
server.StartTLS()
|
||||
defer server.Close()
|
||||
|
||||
connectClient := pingv1connect.NewPingServiceClient(
|
||||
connectClient := pingv1connect.NewPingServiceClient(connect.NewClient(connecthttp.NewTransport(
|
||||
server.Client(),
|
||||
server.URL,
|
||||
)
|
||||
)))
|
||||
|
||||
grpcClient := pingv1connect.NewPingServiceClient(
|
||||
grpcClient := pingv1connect.NewPingServiceClient(connect.NewClient(connecthttp.NewTransport(
|
||||
server.Client(),
|
||||
server.URL,
|
||||
connect.WithGRPC(),
|
||||
)
|
||||
connecthttp.WithGRPC(),
|
||||
)))
|
||||
|
||||
grpcWebClient := pingv1connect.NewPingServiceClient(
|
||||
grpcWebClient := pingv1connect.NewPingServiceClient(connect.NewClient(connecthttp.NewTransport(
|
||||
server.Client(),
|
||||
server.URL,
|
||||
connect.WithGRPCWeb(),
|
||||
)
|
||||
connecthttp.WithGRPCWeb(),
|
||||
)))
|
||||
|
||||
clients := []pingv1connect.PingServiceClient{connectClient, grpcClient, grpcWebClient}
|
||||
t.Run("ping request", func(t *testing.T) {
|
||||
for _, client := range clients {
|
||||
result, err := client.Ping(t.Context(), connect.NewRequest(&pingv1.PingRequest{
|
||||
result, err := client.Ping(t.Context(), &pingv1.PingRequest{
|
||||
Data: "foobar",
|
||||
}))
|
||||
})
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "Hello, foobar!", result.Msg.Data)
|
||||
assert.Equal(t, "Hello, foobar!", result.Data)
|
||||
}
|
||||
})
|
||||
}
|
||||
Reference in new issue
Block a user