mirror of
https://github.com/openziti/zrok.git
synced 2025-06-27 13:11:27 +02:00
factor out unix domain grpc client (#463)
This commit is contained in:
parent
84c7e26202
commit
e0592a3625
33
agent/agentClient/agentClient.go
Normal file
33
agent/agentClient/agentClient.go
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
package agentClient
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"github.com/openziti/zrok/agent/agentGrpc"
|
||||||
|
"github.com/openziti/zrok/environment/env_core"
|
||||||
|
"github.com/openziti/zrok/tui"
|
||||||
|
"google.golang.org/grpc"
|
||||||
|
"google.golang.org/grpc/credentials/insecure"
|
||||||
|
"google.golang.org/grpc/resolver"
|
||||||
|
"net"
|
||||||
|
)
|
||||||
|
|
||||||
|
func NewClient(root env_core.Root) (client agentGrpc.AgentClient, conn *grpc.ClientConn, err error) {
|
||||||
|
agentSocket, err := root.AgentSocket()
|
||||||
|
if err != nil {
|
||||||
|
tui.Error("error getting agent socket", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
opts := []grpc.DialOption{
|
||||||
|
grpc.WithContextDialer(func(_ context.Context, addr string) (net.Conn, error) {
|
||||||
|
return net.Dial("unix", addr)
|
||||||
|
}),
|
||||||
|
grpc.WithTransportCredentials(insecure.NewCredentials()),
|
||||||
|
}
|
||||||
|
resolver.SetDefaultScheme("passthrough")
|
||||||
|
conn, err = grpc.NewClient(agentSocket, opts...)
|
||||||
|
if err != nil {
|
||||||
|
tui.Error("error connecting to agent socket", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return agentGrpc.NewAgentClient(conn), conn, nil
|
||||||
|
}
|
@ -2,14 +2,11 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"github.com/openziti/zrok/agent/agentClient"
|
||||||
"github.com/openziti/zrok/agent/agentGrpc"
|
"github.com/openziti/zrok/agent/agentGrpc"
|
||||||
"github.com/openziti/zrok/environment"
|
"github.com/openziti/zrok/environment"
|
||||||
"github.com/openziti/zrok/tui"
|
"github.com/openziti/zrok/tui"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"google.golang.org/grpc"
|
|
||||||
"google.golang.org/grpc/credentials/insecure"
|
|
||||||
"google.golang.org/grpc/resolver"
|
|
||||||
"net"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@ -37,24 +34,11 @@ func (cmd *agentVersionCommand) run(_ *cobra.Command, _ []string) {
|
|||||||
tui.Error("error loading zrokdir", err)
|
tui.Error("error loading zrokdir", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
agentSocket, err := root.AgentSocket()
|
client, conn, err := agentClient.NewClient(root)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tui.Error("error getting agent socket", err)
|
tui.Error("error getting agent client", err)
|
||||||
}
|
|
||||||
|
|
||||||
opts := []grpc.DialOption{
|
|
||||||
grpc.WithContextDialer(func(_ context.Context, addr string) (net.Conn, error) {
|
|
||||||
return net.Dial("unix", addr)
|
|
||||||
}),
|
|
||||||
grpc.WithTransportCredentials(insecure.NewCredentials()),
|
|
||||||
}
|
|
||||||
resolver.SetDefaultScheme("passthrough")
|
|
||||||
conn, err := grpc.NewClient(agentSocket, opts...)
|
|
||||||
if err != nil {
|
|
||||||
tui.Error("error connecting to agent socket", err)
|
|
||||||
}
|
}
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
client := agentGrpc.NewAgentClient(conn)
|
|
||||||
|
|
||||||
v, err := client.Version(context.Background(), &agentGrpc.VersionRequest{})
|
v, err := client.Version(context.Background(), &agentGrpc.VersionRequest{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user