Code review; rename, reorg, dereference

Author: sjberman

internal/mode/static/nginx/agent/command.go

@@ -47,10 +47,10 @@ func (cs *commandService) CreateConnection(
 		return nil, agentgrpc.ErrStatusInvalidConnection
 	}
 
-	hostname := req.GetResource().GetContainerInfo().GetHostname()
+	podName := req.GetResource().GetContainerInfo().GetHostname()
 
-	cs.logger.Info(fmt.Sprintf("Creating connection for nginx pod: %s", hostname))
-	cs.connTracker.Track(gi.IPAddress, hostname)
+	cs.logger.Info(fmt.Sprintf("Creating connection for nginx pod: %s", podName))
+	cs.connTracker.Track(gi.IPAddress, podName)
 
 	return &pb.CreateConnectionResponse{
 		Response: &pb.CommandResponse{
@@ -72,7 +72,7 @@ func (cs *commandService) Subscribe(in pb.CommandService_SubscribeServer) error
 
 	go cs.listenForDataPlaneResponse(ctx, in)
 
-	// wait for connection to be established
+	// wait for the agent to report itself
 	podName, err := cs.waitForConnection(ctx, gi)
 	if err != nil {
 		cs.logger.Error(err, "error waiting for connection")

internal/mode/static/nginx/agent/grpc/connections.go

@@ -46,9 +46,5 @@ func (c *ConnectionsTracker) GetConnection(address string) string {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
-	if val, ok := c.connections[address]; ok {
-		return val
-	}
-
-	return ""
+	return c.connections[address]
 }

internal/mode/static/nginx/agent/grpc/interceptor/interceptor.go

@@ -13,12 +13,6 @@ import (
 	grpcContext "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/agent/grpc/context"
 )
 
-type ContextSetter struct{}
-
-func NewContextSetter() *ContextSetter {
-	return &ContextSetter{}
-}
-
 // streamHandler is a struct that implements StreamHandler, allowing the interceptor to replace the context.
 type streamHandler struct {
 	grpc.ServerStream
@@ -29,7 +23,13 @@ func (sh *streamHandler) Context() context.Context {
 	return sh.ctx
 }
 
-func (c *ContextSetter) Stream() grpc.StreamServerInterceptor {
+type ContextSetter struct{}
+
+func NewContextSetter() ContextSetter {
+	return ContextSetter{}
+}
+
+func (c ContextSetter) Stream() grpc.StreamServerInterceptor {
 	return func(
 		srv interface{},
 		ss grpc.ServerStream,
@@ -47,7 +47,7 @@ func (c *ContextSetter) Stream() grpc.StreamServerInterceptor {
 	}
 }
 
-func (c *ContextSetter) Unary() grpc.UnaryServerInterceptor {
+func (c ContextSetter) Unary() grpc.UnaryServerInterceptor {
 	return func(
 		ctx context.Context,
 		req interface{},