Migrate to simple (#50)

Author: majst01

examples/go/ip-list.go

@@ -5,7 +5,6 @@ import (
 	"log/slog"
 	"os"
 
-	"connectrpc.com/connect"
 	"github.com/metal-stack/api/go/client"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
 )
@@ -25,15 +24,15 @@ func main() {
 	}
 
 	ctx := context.Background()
-	resp, err := c.Apiv2().IP().List(ctx, connect.NewRequest(&apiv2.IPServiceListRequest{
+	resp, err := c.Apiv2().IP().List(ctx, &apiv2.IPServiceListRequest{
 		Project: project,
-	}))
+	})
 
 	if err != nil {
 		panic(err)
 	}
 
-	for _, ip := range resp.Msg.Ips {
+	for _, ip := range resp.Ips {
 		slog.Info("ip", "address", ip.Ip, "id", ip.Uuid, "name", ip.Name)
 	}
 }

go/client/client_test.go

@@ -55,26 +55,26 @@ func Test_Client(t *testing.T) {
 		Log: log,
 	})
 	require.NoError(t, err)
-	v, err := c.Apiv2().Version().Get(t.Context(), connect.NewRequest(&apiv2.VersionServiceGetRequest{}))
+	v, err := c.Apiv2().Version().Get(t.Context(), &apiv2.VersionServiceGetRequest{})
 	require.NoError(t, err)
 	require.NotNil(t, v)
-	require.Equal(t, "1.0", v.Msg.Version.Version)
+	require.Equal(t, "1.0", v.Version.Version)
 	require.False(t, ts.wasCalled)
 	require.Equal(t, tokenString, vs.token)
 
 	time.Sleep(300 * time.Millisecond)
-	v, err = c.Apiv2().Version().Get(t.Context(), connect.NewRequest(&apiv2.VersionServiceGetRequest{}))
+	v, err = c.Apiv2().Version().Get(t.Context(), &apiv2.VersionServiceGetRequest{})
 	require.NoError(t, err)
 	require.NotNil(t, v)
-	require.Equal(t, "1.0", v.Msg.Version.Version)
+	require.Equal(t, "1.0", v.Version.Version)
 	require.False(t, ts.wasCalled)
 	require.Equal(t, tokenString, vs.token)
 
 	time.Sleep(1 * time.Second)
-	v, err = c.Apiv2().Version().Get(t.Context(), connect.NewRequest(&apiv2.VersionServiceGetRequest{}))
+	v, err = c.Apiv2().Version().Get(t.Context(), &apiv2.VersionServiceGetRequest{})
 	require.NoError(t, err)
 	require.NotNil(t, v)
-	require.Equal(t, "1.0", v.Msg.Version.Version)
+	require.Equal(t, "1.0", v.Version.Version)
 
 	require.True(t, ts.wasCalled)
 	require.NotEqual(t, tokenString, vs.token, "token must have changed")
@@ -103,53 +103,55 @@ type mockVersionService struct {
 	token string
 }
 
-func (m *mockVersionService) Get(ctx context.Context, req *connect.Request[apiv2.VersionServiceGetRequest]) (*connect.Response[apiv2.VersionServiceGetResponse], error) {
-	authHeader := req.Header().Get("Authorization")
+func (m *mockVersionService) Get(ctx context.Context, req *apiv2.VersionServiceGetRequest) (*apiv2.VersionServiceGetResponse, error) {
+	callinfo, _ := connect.CallInfoForHandlerContext(ctx)
+	authHeader := callinfo.RequestHeader().Get("Authorization")
+
 	_, token, found := strings.Cut(authHeader, "Bearer ")
 
 	if !found {
 		return nil, fmt.Errorf("unable to extract token from header:%s", authHeader)
 	}
 
 	m.token = token
-	return connect.NewResponse(&apiv2.VersionServiceGetResponse{Version: &apiv2.Version{Version: "1.0"}}), nil
+	return &apiv2.VersionServiceGetResponse{Version: &apiv2.Version{Version: "1.0"}}, nil
 }
 
 type mockTokenService struct {
 	wasCalled bool
 }
 
 // Create implements apiv2connect.TokenServiceHandler.
-func (m *mockTokenService) Create(context.Context, *connect.Request[apiv2.TokenServiceCreateRequest]) (*connect.Response[apiv2.TokenServiceCreateResponse], error) {
+func (m *mockTokenService) Create(context.Context, *apiv2.TokenServiceCreateRequest) (*apiv2.TokenServiceCreateResponse, error) {
 	panic("unimplemented")
 }
 
 // Get implements apiv2connect.TokenServiceHandler.
-func (m *mockTokenService) Get(context.Context, *connect.Request[apiv2.TokenServiceGetRequest]) (*connect.Response[apiv2.TokenServiceGetResponse], error) {
+func (m *mockTokenService) Get(context.Context, *apiv2.TokenServiceGetRequest) (*apiv2.TokenServiceGetResponse, error) {
 	panic("unimplemented")
 }
 
 // List implements apiv2connect.TokenServiceHandler.
-func (m *mockTokenService) List(context.Context, *connect.Request[apiv2.TokenServiceListRequest]) (*connect.Response[apiv2.TokenServiceListResponse], error) {
+func (m *mockTokenService) List(context.Context, *apiv2.TokenServiceListRequest) (*apiv2.TokenServiceListResponse, error) {
 	panic("unimplemented")
 }
 
 // Refresh implements apiv2connect.TokenServiceHandler.
-func (m *mockTokenService) Refresh(ctx context.Context, _ *connect.Request[apiv2.TokenServiceRefreshRequest]) (*connect.Response[apiv2.TokenServiceRefreshResponse], error) {
+func (m *mockTokenService) Refresh(ctx context.Context, _ *apiv2.TokenServiceRefreshRequest) (*apiv2.TokenServiceRefreshResponse, error) {
 	token, err := generateToken(2 * time.Second)
 	if err != nil {
 		return nil, err
 	}
 	m.wasCalled = true
-	return connect.NewResponse(&apiv2.TokenServiceRefreshResponse{Token: &apiv2.Token{}, Secret: token}), nil
+	return &apiv2.TokenServiceRefreshResponse{Token: &apiv2.Token{}, Secret: token}, nil
 }
 
 // Revoke implements apiv2connect.TokenServiceHandler.
-func (m *mockTokenService) Revoke(context.Context, *connect.Request[apiv2.TokenServiceRevokeRequest]) (*connect.Response[apiv2.TokenServiceRevokeResponse], error) {
+func (m *mockTokenService) Revoke(context.Context, *apiv2.TokenServiceRevokeRequest) (*apiv2.TokenServiceRevokeResponse, error) {
 	panic("unimplemented")
 }
 
 // Update implements apiv2connect.TokenServiceHandler.
-func (m *mockTokenService) Update(context.Context, *connect.Request[apiv2.TokenServiceUpdateRequest]) (*connect.Response[apiv2.TokenServiceUpdateResponse], error) {
+func (m *mockTokenService) Update(context.Context, *apiv2.TokenServiceUpdateRequest) (*apiv2.TokenServiceUpdateResponse, error) {
 	panic("unimplemented")
 }

go/client/conn.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"connectrpc.com/connect"
-
 	"github.com/golang-jwt/jwt/v5"
 	api "github.com/metal-stack/api/go/metalstack/api/v2"
 )
@@ -22,7 +21,7 @@ type (
 		BaseURL string
 		Token   string
 
-		// Optional client Interceptors 
+		// Optional client Interceptors
 		Interceptors []connect.Interceptor
 
 		UserAgent string
@@ -129,12 +128,12 @@ func (c *client) renewTokenIfNeeded(replaceBefore time.Duration) error {
 	c.Lock()
 	defer c.Unlock()
 
-	resp, err := c.Apiv2().Token().Refresh(context.Background(), connect.NewRequest(&api.TokenServiceRefreshRequest{}))
+	resp, err := c.Apiv2().Token().Refresh(context.Background(), &api.TokenServiceRefreshRequest{})
 	if err != nil {
 		return fmt.Errorf("unable to refresh token %w", err)
 	}
 
-	c.config.Token = resp.Msg.Secret
+	c.config.Token = resp.Secret
 	err = c.config.parse()
 	if err != nil {
 		return fmt.Errorf("unable to parse token %w", err)

go/client/token-persistent-funcs_test.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	"connectrpc.com/connect"
 	"github.com/metal-stack/api/go/client"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
 	"github.com/metal-stack/api/go/metalstack/api/v2/apiv2connect"
@@ -56,18 +55,18 @@ func TestNewFilesystemTokenPersiter(t *testing.T) {
 		Log: log,
 	})
 	require.NoError(t, err)
-	v, err := c.Apiv2().Version().Get(t.Context(), connect.NewRequest(&apiv2.VersionServiceGetRequest{}))
+	v, err := c.Apiv2().Version().Get(t.Context(), &apiv2.VersionServiceGetRequest{})
 	require.NoError(t, err)
 	require.NotNil(t, v)
-	require.Equal(t, "1.0", v.Msg.Version.Version)
+	require.Equal(t, "1.0", v.Version.Version)
 	require.False(t, ts.wasCalled)
 	require.Equal(t, tokenString, vs.token)
 
 	time.Sleep(2 * time.Second)
-	v, err = c.Apiv2().Version().Get(t.Context(), connect.NewRequest(&apiv2.VersionServiceGetRequest{}))
+	v, err = c.Apiv2().Version().Get(t.Context(), &apiv2.VersionServiceGetRequest{})
 	require.NoError(t, err)
 	require.NotNil(t, v)
-	require.Equal(t, "1.0", v.Msg.Version.Version)
+	require.Equal(t, "1.0", v.Version.Version)
 	require.True(t, ts.wasCalled)
 	require.NotEqual(t, tokenString, vs.token, "token must have changed")