Use generic local grpc proxy in local daemon

Author: janekbaraniewski

pkg/daemon/local/daemon.go

@@ -23,12 +23,12 @@ import (
 )
 
 type Daemon struct {
-	socketListener         net.Listener
-	tsServer               *tsnet.Server
-	localServer            *localServer
-	credentialsServerProxy *LocalCredentialsServerProxy
-	rootDir                string
-	log                    log.Logger
+	socketListener  net.Listener
+	tsServer        *tsnet.Server
+	localServer     *localServer
+	grpcServerProxy *LocalGRPCProxy
+	rootDir         string
+	log             log.Logger
 }
 
 type InitConfig struct {
@@ -63,18 +63,18 @@ func Init(ctx context.Context, config InitConfig) (*Daemon, error) {
 		return nil, fmt.Errorf("create local server: %w", err)
 	}
 
-	credentialsProxy, err := NewLocalCredentialsServerProxy(tsServer, log)
+	grpcProxy, err := NewLocalGRPCProxy(tsServer, log)
 	if err != nil {
 		return nil, fmt.Errorf("create local credentials server: %w", err)
 	}
 
 	return &Daemon{
-		socketListener:         socketListener,
-		tsServer:               tsServer,
-		localServer:            localServer,
-		credentialsServerProxy: credentialsProxy,
-		rootDir:                config.RootDir,
-		log:                    log,
+		socketListener:  socketListener,
+		tsServer:        tsServer,
+		localServer:     localServer,
+		grpcServerProxy: grpcProxy,
+		rootDir:         config.RootDir,
+		log:             log,
 	}, nil
 }
 func (d *Daemon) Start(ctx context.Context) error {
@@ -94,7 +94,7 @@ func (d *Daemon) Start(ctx context.Context) error {
 	}()
 	go func() {
 		d.log.Info("Start credentials server")
-		errChan <- d.credentialsServerProxy.Listen(ctx)
+		errChan <- d.grpcServerProxy.Listen(ctx)
 	}()
 	defer func() {
 		d.log.Info("Cleaning up daemon resources")

pkg/daemon/local/credentials_proxy.go renamed to pkg/daemon/local/grpc_proxy.go

@@ -21,25 +21,25 @@ const (
 	DefaultTargetHost          string = "localhost"
 )
 
-type LocalCredentialsServerProxy struct {
+type LocalGRPCProxy struct {
 	log        log.Logger
 	tsServer   *tsnet.Server
 	grpcServer *grpc.Server
 	ln         net.Listener
 }
 
-func NewLocalCredentialsServerProxy(tsServer *tsnet.Server, logger log.Logger) (*LocalCredentialsServerProxy, error) {
+func NewLocalGRPCProxy(tsServer *tsnet.Server, logger log.Logger) (*LocalGRPCProxy, error) {
 	logger.Infof("NewLocalCredentialsServerProxy: initializing local reverse proxy")
 	if tsServer == nil {
 		return nil, fmt.Errorf("tsnet.Server cannot be nil")
 	}
-	return &LocalCredentialsServerProxy{
+	return &LocalGRPCProxy{
 		log:      logger,
 		tsServer: tsServer,
 	}, nil
 }
 
-func (s *LocalCredentialsServerProxy) Listen(ctx context.Context) error {
+func (s *LocalGRPCProxy) Listen(ctx context.Context) error {
 	s.log.Infof("LocalCredentialsServerProxy: Starting reverse proxy on tsnet port %d", LocalCredentialsServerPort)
 
 	listenAddr := fmt.Sprintf(":%d", LocalCredentialsServerPort)
@@ -100,7 +100,7 @@ func (s *LocalCredentialsServerProxy) Listen(ctx context.Context) error {
 	return nil
 }
 
-func (s *LocalCredentialsServerProxy) Stop() {
+func (s *LocalGRPCProxy) Stop() {
 	s.log.Info("LocalCredentialsServerProxy: Stopping reverse proxy...")
 	if s.grpcServer != nil {
 		stopped := make(chan struct{})