Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ go 1.27

require (
github.com/zeebo/xxh3 v1.1.0
golang.org/x/sync v0.25.0
google.golang.org/grpc v1.85.0
google.golang.org/protobuf v1.36.12
)

require (
Expand All @@ -13,5 +15,4 @@ require (
golang.org/x/sys v0.50.0 // indirect
golang.org/x/text v0.44.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20261110000943-09e21b237f2c // indirect
google.golang.org/protobuf v1.36.12 // indirect
)
12 changes: 2 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,22 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
github.com/klauspost/cpuid/v2 v2.4.2 h1:xRw7IZEsAgVCp6trS/DgWbTAqpixhmywgVgBjYGg1bQ=
github.com/klauspost/cpuid/v2 v2.4.2/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU=
github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU=
golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
golang.org/x/net v0.62.0 h1:18ELalfM5+XNRwzM2nYqXsZQ9ByS1uhj2O/U7+5jqRY=
golang.org/x/net v0.62.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI=
golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=
golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
golang.org/x/sync v0.25.0 h1:dJnifr0nMV8/SBnBvdo4eSGGnrc3O4FFx6IqvtLcmRs=
golang.org/x/sync v0.25.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
golang.org/x/sys v0.50.0 h1:dkKZEFTEKaLr1sjhs0WiKqoi8Jj5nHbS3Njmx1UoMJs=
golang.org/x/sys v0.50.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
golang.org/x/text v0.44.0 h1:YItdp/mQNGnsmrgpcdA5yQ3bnRxCfo/Tj/iByGW9GGo=
golang.org/x/text v0.44.0/go.mod h1:S4FR1waQ9LbjQTls97SyRjDaUUVkaM+cXwwuG/G+MwY=
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260817212433-ac3dfec99bb1 h1:utmqiUzZAEINbLmRyAt1QjVkMyLQ+lvIwCpLaB1rZfw=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260817212433-ac3dfec99bb1/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20261110000943-09e21b237f2c h1:XXChExL+Tm7Ubp0x0VXUEncPLHrkXIgoVWqnxmKNbAA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20261110000943-09e21b237f2c/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc=
google.golang.org/grpc v1.85.0 h1:BPBCfuVRQ1qvBhKDOq9uvQllMvO59rKsYhXpp7Dd8vw=
Expand Down
3 changes: 2 additions & 1 deletion internal/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

"github.com/Skoowshot/qrix-runtime/internal/app/server"
"github.com/Skoowshot/qrix-runtime/internal/app/service"
"github.com/Skoowshot/qrix-runtime/internal/workspace"
)

Expand All @@ -22,7 +23,7 @@ func NewApp() *App {

func (app *App) Start() error {
wsRegistry := workspace.NewRegistry()
wsService := workspace.NewService(wsRegistry)
wsService := service.NewWorkspace(wsRegistry)

ctrlServer, err := server.ListenControl(":7178", wsService)
if err != nil {
Expand Down
5 changes: 3 additions & 2 deletions internal/app/grpchandler/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ import (
"log/slog"

workspacev1 "github.com/Skoowshot/qrix-runtime/gen/go/workspace/v1"
"github.com/Skoowshot/qrix-runtime/internal/app/service"
"github.com/Skoowshot/qrix-runtime/internal/workspace"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)

type Workspace struct {
service *workspace.Service
service *service.Workspace
workspacev1.UnimplementedWorkspaceServiceServer
}

func NewWorkspace(service *workspace.Service) *Workspace {
func NewWorkspace(service *service.Workspace) *Workspace {
return &Workspace{
service: service,
}
Expand Down
3 changes: 2 additions & 1 deletion internal/app/grpchandler/workspace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"

workspacev1 "github.com/Skoowshot/qrix-runtime/gen/go/workspace/v1"
"github.com/Skoowshot/qrix-runtime/internal/app/service"
"github.com/Skoowshot/qrix-runtime/internal/workspace"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down Expand Up @@ -98,7 +99,7 @@ func setupClient(t *testing.T) workspacev1.WorkspaceServiceClient {
lis := bufconn.Listen(1024 * 1024)
srv := grpc.NewServer()

wsSvc := workspace.NewService(workspace.NewRegistry())
wsSvc := service.NewWorkspace(workspace.NewRegistry())
workspacev1.RegisterWorkspaceServiceServer(srv, NewWorkspace(wsSvc))

go func() { _ = srv.Serve(lis) }()
Expand Down
4 changes: 2 additions & 2 deletions internal/app/server/control.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

workspacev1 "github.com/Skoowshot/qrix-runtime/gen/go/workspace/v1"
"github.com/Skoowshot/qrix-runtime/internal/app/grpchandler"
"github.com/Skoowshot/qrix-runtime/internal/workspace"
"github.com/Skoowshot/qrix-runtime/internal/app/service"
"google.golang.org/grpc"
)

Expand All @@ -17,7 +17,7 @@ type Control struct {

func ListenControl(
addr string,
wsService *workspace.Service,
wsService *service.Workspace,
) (*Control, error) {
lis, err := net.Listen("tcp", addr)
if err != nil {
Expand Down
44 changes: 44 additions & 0 deletions internal/app/service/workspace.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package service

import (
"context"
"fmt"

"github.com/Skoowshot/qrix-runtime/internal/workspace"
)

type Workspace struct {
registry *workspace.Registry
}

func NewWorkspace(registry *workspace.Registry) *Workspace {
return &Workspace{
registry: registry,
}
}

func (s *Workspace) Create(ctx context.Context, name workspace.Name) (workspace.ID, error) {
if err := ctx.Err(); err != nil {
return 0, err
}

ws := workspace.NewWorkspace()

id, err := s.registry.Put(name, ws)
if err != nil {
return 0, fmt.Errorf("put workspace to registry: %w", err)
}
return id, nil
}

func (s *Workspace) GetByName(ctx context.Context, name workspace.Name) (workspace.ID, error) {
if err := ctx.Err(); err != nil {
return 0, err
}

id, ok := s.registry.GetID(name)
if !ok {
return 0, workspace.ErrNotFound
}
return id, nil
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package workspace
package service

import (
"context"
"errors"
"testing"

"github.com/Skoowshot/qrix-runtime/internal/workspace"
)

func TestService_Create(t *testing.T) {
tests := []struct {
name string
wsName Name
setup func(t *testing.T, svc *Service)
wsName workspace.Name
setup func(t *testing.T, svc *Workspace)
ctx func() context.Context
expectedErr error
}{
Expand All @@ -26,7 +28,7 @@ func TestService_Create(t *testing.T) {
wsName: "alpha",
setup: setupWorkspace("alpha"),
ctx: context.Background,
expectedErr: ErrNameAlreadyExists,
expectedErr: workspace.ErrNameAlreadyExists,
},
{
name: "canceled context returns error",
Expand All @@ -39,7 +41,7 @@ func TestService_Create(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
svc := NewService(NewRegistry())
svc := NewWorkspace(workspace.NewRegistry())
if tt.setup != nil {
tt.setup(t, svc)
}
Expand All @@ -58,8 +60,8 @@ func TestService_Create(t *testing.T) {
func TestService_GetByName(t *testing.T) {
tests := []struct {
name string
wsName Name
setup func(t *testing.T, svc *Service)
wsName workspace.Name
setup func(t *testing.T, svc *Workspace)
ctx func() context.Context
expectedErr error
}{
Expand All @@ -75,7 +77,7 @@ func TestService_GetByName(t *testing.T) {
wsName: "missing",
setup: nil,
ctx: context.Background,
expectedErr: ErrNotFound,
expectedErr: workspace.ErrNotFound,
},
{
name: "canceled context returns error",
Expand All @@ -88,7 +90,7 @@ func TestService_GetByName(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
svc := NewService(NewRegistry())
svc := NewWorkspace(workspace.NewRegistry())
if tt.setup != nil {
tt.setup(t, svc)
}
Expand All @@ -104,8 +106,8 @@ func TestService_GetByName(t *testing.T) {
}
}

func setupWorkspace(name Name) func(t *testing.T, svc *Service) {
return func(t *testing.T, svc *Service) {
func setupWorkspace(name workspace.Name) func(t *testing.T, svc *Workspace) {
return func(t *testing.T, svc *Workspace) {
t.Helper()
if _, err := svc.Create(context.Background(), name); err != nil {
t.Fatalf("failed to setup workspace %q: %v", name, err)
Expand Down
42 changes: 0 additions & 42 deletions internal/workspace/service.go

This file was deleted.

Loading