rudimentary 'zrok agent status' implementation (#463)

agent/agent.go

@@ -42,7 +42,7 @@ func (a *Agent) Run() error {
 	a.agentSocket = agentSocket
 
 	srv := grpc.NewServer()
-	agentGrpc.RegisterAgentServer(srv, &agentGrpcImpl{})
+	agentGrpc.RegisterAgentServer(srv, &agentGrpcImpl{a: a})
 	if err := srv.Serve(l); err != nil {
 		return err
 	}

agent/agentGrpc/agent.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 option go_package = "github.com/openziti/zrok/agent/agentGrpc";
 
 service Agent {
+	rpc Status(StatusRequest) returns (StatusReply) {}
 	rpc Version(VersionRequest) returns (VersionReply) {}
 }
 
@@ -17,20 +18,18 @@ message ShareDetail {
 	string shareMode = 2;
 	string backendMode = 3;
 	bool reserved = 4;
-	string uniqueName = 5;
-	repeated string frontendEndpoint = 6;
-	string backendEndpoint = 7;
-	bool closed = 8;
-	string status = 9;
+	repeated string frontendEndpoint = 5;
+	string backendEndpoint = 6;
+	bool closed = 7;
+	string status = 8;
 }
 
 message StatusRequest {
-	repeated AccessDetail accesses = 1;
-	repeated ShareDetail shares = 2;
 }
 
 message StatusReply {
-	repeated string v = 1;
+	repeated AccessDetail accesses = 1;
+	repeated ShareDetail shares = 2;
 }
 
 message VersionRequest {

agent/model.go

@@ -1,16 +1,20 @@
 package agent
 
 import (
+	"github.com/openziti/zrok/agent/agentGrpc"
 	"github.com/openziti/zrok/sdk/golang/sdk"
 	"time"
 )
 
 type share struct {
-	token string
+	token  string
+	target string
 
 	basicAuth                 []string
 	frontendSelection         []string
+	shareMode                 sdk.ShareMode
 	backendMode               sdk.BackendMode
+	reserved                  bool
 	insecure                  bool
 	oauthProvider             string
 	oauthEmailAddressPatterns []string
@@ -25,3 +29,8 @@ type access struct {
 	bindAddress     string
 	responseHeaders []string
 }
+
+type agentGrpcImpl struct {
+	agentGrpc.UnimplementedAgentServer
+	a *Agent
+}

agent/status.go

@@ -0,0 +1,32 @@
+package agent
+
+import (
+	"context"
+	"github.com/openziti/zrok/agent/agentGrpc"
+)
+
+func (i *agentGrpcImpl) Status(_ context.Context, _ *agentGrpc.StatusRequest) (*agentGrpc.StatusReply, error) {
+	var accesses []*agentGrpc.AccessDetail
+	for token, acc := range i.a.accesses {
+		accesses = append(accesses, &agentGrpc.AccessDetail{
+			Token:           token,
+			BindAddress:     acc.bindAddress,
+			ResponseHeaders: acc.responseHeaders,
+		})
+	}
+
+	var shares []*agentGrpc.ShareDetail
+	for token, shr := range i.a.shares {
+		shares = append(shares, &agentGrpc.ShareDetail{
+			Token:            token,
+			ShareMode:        string(shr.shareMode),
+			BackendMode:      string(shr.backendMode),
+			Reserved:         shr.reserved,
+			FrontendEndpoint: shr.frontendSelection,
+			BackendEndpoint:  shr.target,
+			Closed:           shr.closed,
+		})
+	}
+
+	return &agentGrpc.StatusReply{Accesses: accesses, Shares: shares}, nil
+}

agent/grpcImpl.go → agent/version.go

@@ -7,11 +7,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-type agentGrpcImpl struct {
-	agentGrpc.UnimplementedAgentServer
-}
-
-func (s *agentGrpcImpl) Version(_ context.Context, _ *agentGrpc.VersionRequest) (*agentGrpc.VersionReply, error) {
+func (i *agentGrpcImpl) Version(_ context.Context, _ *agentGrpc.VersionRequest) (*agentGrpc.VersionReply, error) {
 	v := build.String()
 	logrus.Infof("responding to version inquiry with '%v'", v)
 	return &agentGrpc.VersionReply{V: v}, nil