051253396c
When the orchestrator imports `block/core/internal/api/orchestrator/v1` transitively through other core packages and also generates its own bindings for the same files (accounts.proto etc.), proto registration panics at startup: "file ... is already registered". Tests in the orchestrator confirmed this. Fix: - buf generate now uses --path to limit core's output to proto/orchestrator/v1/plugin_registry.proto (see new `make proto`). - Adds a minimal MyAccount message and PluginAuthService.ListMyAccounts RPC to plugin_registry.proto (already pushed to block/proto) so the CLI's account picker no longer needs accounts.proto generated. - CLI switches back to cli.Auth.ListMyAccounts; orchclient.Client drops the Account field. Side effect: every previously-generated orchestrator/v1 binding besides plugin_registry is removed from this module. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
43 lines
1.3 KiB
Go
43 lines
1.3 KiB
Go
package orchclient
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
|
|
"connectrpc.com/connect"
|
|
"git.dev.alexdunmow.com/block/core/internal/api/orchestrator/v1/orchestratorv1connect"
|
|
)
|
|
|
|
type Client struct {
|
|
Host string
|
|
Token string
|
|
Auth orchestratorv1connect.PluginAuthServiceClient
|
|
Scope orchestratorv1connect.PluginScopeServiceClient
|
|
Reg orchestratorv1connect.PluginRegistryServiceClient
|
|
Pub orchestratorv1connect.PluginPublishServiceClient
|
|
}
|
|
|
|
func New(host, token string) *Client {
|
|
httpClient := &http.Client{}
|
|
opts := []connect.ClientOption{
|
|
connect.WithInterceptors(bearerInterceptor(token)),
|
|
}
|
|
c := &Client{Host: host, Token: token}
|
|
c.Auth = orchestratorv1connect.NewPluginAuthServiceClient(httpClient, host, opts...)
|
|
c.Scope = orchestratorv1connect.NewPluginScopeServiceClient(httpClient, host, opts...)
|
|
c.Reg = orchestratorv1connect.NewPluginRegistryServiceClient(httpClient, host, opts...)
|
|
c.Pub = orchestratorv1connect.NewPluginPublishServiceClient(httpClient, host, opts...)
|
|
return c
|
|
}
|
|
|
|
func bearerInterceptor(token string) connect.Interceptor {
|
|
return connect.UnaryInterceptorFunc(func(next connect.UnaryFunc) connect.UnaryFunc {
|
|
return func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) {
|
|
if token != "" {
|
|
req.Header().Set("Authorization", "Bearer "+token)
|
|
}
|
|
return next(ctx, req)
|
|
}
|
|
})
|
|
}
|