more renaming

Author: sjberman

internal/controller/nginx/agent/command.go

@@ -77,7 +77,7 @@ func (cs *commandService) CreateConnection(
 		return nil, errors.New("empty connection request")
 	}
 
-	gi, ok := grpcContext.FromContext(ctx)
+	grpcInfo, ok := grpcContext.FromContext(ctx)
 	if !ok {
 		return nil, agentgrpc.ErrStatusInvalidConnection
 	}
@@ -105,7 +105,7 @@ func (cs *commandService) CreateConnection(
 		ParentType: depType,
 		InstanceID: getNginxInstanceID(resource.GetInstances()),
 	}
-	cs.connTracker.Track(gi.UUID, conn)
+	cs.connTracker.Track(grpcInfo.UUID, conn)
 
 	return &pb.CreateConnectionResponse{
 		Response: &pb.CommandResponse{
@@ -127,31 +127,31 @@ func (cs *commandService) CreateConnection(
 func (cs *commandService) Subscribe(in pb.CommandService_SubscribeServer) error {
 	ctx := in.Context()
 
-	gi, ok := grpcContext.FromContext(ctx)
+	grpcInfo, ok := grpcContext.FromContext(ctx)
 	if !ok {
 		return agentgrpc.ErrStatusInvalidConnection
 	}
-	defer cs.connTracker.RemoveConnection(gi.UUID)
+	defer cs.connTracker.RemoveConnection(grpcInfo.UUID)
 
 	// wait for the agent to report itself and nginx
-	conn, deployment, err := cs.waitForConnection(ctx, gi)
+	conn, deployment, err := cs.waitForConnection(ctx, grpcInfo)
 	if err != nil {
 		cs.logger.Error(err, "error waiting for connection")
 		return err
 	}
-	defer deployment.RemovePodStatus(gi.UUID)
+	defer deployment.RemovePodStatus(grpcInfo.UUID)
 
 	cs.logger.Info(
 		"Successfully connected to nginx agent",
 		conn.ParentType, conn.ParentName,
-		"uuid", gi.UUID,
+		"uuid", grpcInfo.UUID,
 	)
 
 	msgr := messenger.New(in)
 	go msgr.Run(ctx)
 
 	// apply current config before starting event loop
-	if err := cs.setInitialConfig(ctx, &gi, deployment, conn, msgr); err != nil {
+	if err := cs.setInitialConfig(ctx, &grpcInfo, deployment, conn, msgr); err != nil {
 		return err
 	}
 
@@ -193,7 +193,7 @@ func (cs *commandService) Subscribe(in pb.CommandService_SubscribeServer) error
 			cs.logger.V(1).Info("Sending configuration to agent", "requestType", msg.Type)
 			if err := msgr.Send(ctx, req); err != nil {
 				cs.logger.Error(err, "error sending request to agent")
-				deployment.SetPodErrorStatus(gi.UUID, err)
+				deployment.SetPodErrorStatus(grpcInfo.UUID, err)
 				channels.ResponseCh <- struct{}{}
 
 				return grpcStatus.Error(codes.Internal, err.Error())
@@ -203,8 +203,8 @@ func (cs *commandService) Subscribe(in pb.CommandService_SubscribeServer) error
 			// Only broadcast operations should signal ResponseCh for coordination.
 			pendingBroadcastRequest = &msg
 		case err = <-msgr.Errors():
-			cs.logger.Error(err, "connection error", conn.ParentType, conn.ParentName, "uuid", gi.UUID)
-			deployment.SetPodErrorStatus(gi.UUID, err)
+			cs.logger.Error(err, "connection error", conn.ParentType, conn.ParentName, "uuid", grpcInfo.UUID)
+			deployment.SetPodErrorStatus(grpcInfo.UUID, err)
 			select {
 			case channels.ResponseCh <- struct{}{}:
 			default:
@@ -225,9 +225,9 @@ func (cs *commandService) Subscribe(in pb.CommandService_SubscribeServer) error
 					continue
 				}
 				err := fmt.Errorf("msg: %s; error: %s", res.GetMessage(), res.GetError())
-				deployment.SetPodErrorStatus(gi.UUID, err)
+				deployment.SetPodErrorStatus(grpcInfo.UUID, err)
 			} else {
-				deployment.SetPodErrorStatus(gi.UUID, nil)
+				deployment.SetPodErrorStatus(grpcInfo.UUID, nil)
 			}
 
 			// Signal broadcast completion only for tracked broadcast operations.
@@ -239,7 +239,7 @@ func (cs *commandService) Subscribe(in pb.CommandService_SubscribeServer) error
 				cs.logger.V(1).Info(
 					"Received response for non-broadcast request (likely initial config)",
 					conn.ParentType, conn.ParentName,
-					"uuid", gi.UUID,
+					"uuid", grpcInfo.UUID,
 				)
 			}
 		}
@@ -537,7 +537,7 @@ func (cs *commandService) UpdateDataPlaneStatus(
 		return nil, errors.New("empty UpdateDataPlaneStatus request")
 	}
 
-	gi, ok := grpcContext.FromContext(ctx)
+	grpcInfo, ok := grpcContext.FromContext(ctx)
 	if !ok {
 		return nil, agentgrpc.ErrStatusInvalidConnection
 	}
@@ -547,7 +547,7 @@ func (cs *commandService) UpdateDataPlaneStatus(
 		return nil, grpcStatus.Errorf(codes.InvalidArgument, "request does not contain nginx instanceID")
 	}
 
-	cs.connTracker.SetInstanceID(gi.UUID, instanceID)
+	cs.connTracker.SetInstanceID(grpcInfo.UUID, instanceID)
 
 	return &pb.UpdateDataPlaneStatusResponse{}, nil
 }

internal/controller/nginx/agent/file.go

@@ -56,7 +56,7 @@ func (fs *fileService) GetFile(
 	ctx context.Context,
 	req *pb.GetFileRequest,
 ) (*pb.GetFileResponse, error) {
-	gi, ok := grpcContext.FromContext(ctx)
+	grpcInfo, ok := grpcContext.FromContext(ctx)
 	if !ok {
 		return nil, agentgrpc.ErrStatusInvalidConnection
 	}
@@ -65,7 +65,7 @@ func (fs *fileService) GetFile(
 		return nil, status.Error(codes.InvalidArgument, "invalid request")
 	}
 
-	contents, err := fs.getFileContents(req, gi.UUID)
+	contents, err := fs.getFileContents(req, grpcInfo.UUID)
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +84,7 @@ func (fs *fileService) GetFileStream(
 	req *pb.GetFileRequest,
 	server grpc.ServerStreamingServer[pb.FileDataChunk],
 ) error {
-	gi, ok := grpcContext.FromContext(server.Context())
+	grpcInfo, ok := grpcContext.FromContext(server.Context())
 	if !ok {
 		return agentgrpc.ErrStatusInvalidConnection
 	}
@@ -93,7 +93,7 @@ func (fs *fileService) GetFileStream(
 		return status.Error(codes.InvalidArgument, "invalid request")
 	}
 
-	contents, err := fs.getFileContents(req, gi.UUID)
+	contents, err := fs.getFileContents(req, grpcInfo.UUID)
 	if err != nil {
 		return err
 	}
@@ -187,12 +187,12 @@ func (fs *fileService) UpdateOverview(
 	ctx context.Context,
 	req *pb.UpdateOverviewRequest,
 ) (*pb.UpdateOverviewResponse, error) {
-	gi, ok := grpcContext.FromContext(ctx)
+	grpcInfo, ok := grpcContext.FromContext(ctx)
 	if !ok {
 		return &pb.UpdateOverviewResponse{}, agentgrpc.ErrStatusInvalidConnection
 	}
 
-	conn := fs.connTracker.GetConnection(gi.UUID)
+	conn := fs.connTracker.GetConnection(grpcInfo.UUID)
 	if conn.InstanceID == "" {
 		return &pb.UpdateOverviewResponse{}, status.Errorf(codes.NotFound, "connection not found")
 	}

internal/controller/nginx/agent/grpc/interceptor/interceptor.go

@@ -84,12 +84,12 @@ func (c ContextSetter) Unary(logger logr.Logger) grpc.UnaryServerInterceptor {
 // validateConnection checks that the connection is valid and returns a new
 // context containing information used by the gRPC command/file services.
 func (c ContextSetter) validateConnection(ctx context.Context) (context.Context, error) {
-	gi, err := getGrpcInfo(ctx)
+	grpcInfo, err := getGrpcInfo(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	return c.validateToken(ctx, gi)
+	return c.validateToken(ctx, grpcInfo)
 }
 
 func getGrpcInfo(ctx context.Context) (*grpcContext.GrpcInfo, error) {