Push abstractions onto route path; cleanup storage (#115)

* push abstractions onto route path; cleanup storage * wip * dont return err --------- Co-authored-by: Luke Lombardi <[email protected]>
beam-cloud · Mar 26, 2024 · c8293df · c8293df
1 parent 314ae3d
commit c8293df
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 35 deletions.
diff --git a/internal/abstractions/endpoint/endpoint.go b/internal/abstractions/endpoint/endpoint.go
@@ -42,11 +42,11 @@ var RingBufferSize int = 10000000
 var RequestTimeout = 120 * time.Second
 
 type EndpointServiceOpts struct {
-	Config         types.AppConfig
-	RedisClient    *common.RedisClient
-	Scheduler      *scheduler.Scheduler
-	BaseRouteGroup *echo.Group
-	Tailscale      *network.Tailscale
+	Config      types.AppConfig
+	RedisClient *common.RedisClient
+	Scheduler   *scheduler.Scheduler
+	RouteGroup  *echo.Group
+	Tailscale   *network.Tailscale
 }
 
 func NewEndpointService(
@@ -78,7 +78,7 @@ func NewEndpointService(
 
 	// Register HTTP routes
 	authMiddleware := auth.AuthMiddleware(backendRepo)
-	registerEndpointRoutes(opts.BaseRouteGroup.Group(endpointRoutePrefix, authMiddleware), es)
+	registerEndpointRoutes(opts.RouteGroup.Group(endpointRoutePrefix, authMiddleware), es)
 
 	return es, nil
 }

diff --git a/internal/abstractions/endpoint/http.go b/internal/abstractions/endpoint/http.go
@@ -10,12 +10,12 @@ import (
 )
 
 type endpointGroup struct {
-	routerGroup *echo.Group
-	es          *RingBufferEndpointService
+	routeGroup *echo.Group
+	es         *RingBufferEndpointService
 }
 
 func registerEndpointRoutes(g *echo.Group, es *RingBufferEndpointService) *endpointGroup {
-	group := &endpointGroup{routerGroup: g, es: es}
+	group := &endpointGroup{routeGroup: g, es: es}
 
 	g.GET("/id/:stubId/", group.endpointRequest)
 	g.POST("/:deploymentName/v:version", group.endpointRequest)

diff --git a/internal/abstractions/function/function.go b/internal/abstractions/function/function.go
@@ -47,13 +47,13 @@ type RunCFunctionService struct {
 }
 
 type FunctionServiceOpts struct {
-	Config         types.AppConfig
-	RedisClient    *common.RedisClient
-	BackendRepo    repository.BackendRepository
-	ContainerRepo  repository.ContainerRepository
-	Scheduler      *scheduler.Scheduler
-	Tailscale      *network.Tailscale
-	BaseRouteGroup *echo.Group
+	Config        types.AppConfig
+	RedisClient   *common.RedisClient
+	BackendRepo   repository.BackendRepository
+	ContainerRepo repository.ContainerRepository
+	Scheduler     *scheduler.Scheduler
+	Tailscale     *network.Tailscale
+	RouteGroup    *echo.Group
 }
 
 func NewRuncFunctionService(ctx context.Context,
@@ -76,7 +76,7 @@ func NewRuncFunctionService(ctx context.Context,
 
 	// Register HTTP routes
 	authMiddleware := auth.AuthMiddleware(fs.backendRepo)
-	registerFunctionRoutes(opts.BaseRouteGroup.Group(functionRoutePrefix, authMiddleware), fs)
+	registerFunctionRoutes(opts.RouteGroup.Group(functionRoutePrefix, authMiddleware), fs)
 
 	return fs, nil
 }

diff --git a/internal/abstractions/taskqueue/http.go b/internal/abstractions/taskqueue/http.go
@@ -10,12 +10,12 @@ import (
 )
 
 type taskQueueGroup struct {
-	routerGroup *echo.Group
-	tq          *RedisTaskQueue
+	routeGroup *echo.Group
+	tq         *RedisTaskQueue
 }
 
 func registerTaskQueueRoutes(g *echo.Group, tq *RedisTaskQueue) *taskQueueGroup {
-	group := &taskQueueGroup{routerGroup: g, tq: tq}
+	group := &taskQueueGroup{routeGroup: g, tq: tq}
 
 	g.POST("/id/:stubId", group.TaskQueuePut)
 	g.POST("/:deploymentName/v:version", group.TaskQueuePut)

diff --git a/internal/abstractions/taskqueue/taskqueue.go b/internal/abstractions/taskqueue/taskqueue.go
@@ -52,7 +52,7 @@ func NewRedisTaskQueueService(
 	scheduler *scheduler.Scheduler,
 	containerRepo repository.ContainerRepository,
 	backendRepo repository.BackendRepository,
-	baseRouteGroup *echo.Group,
+	routeGroup *echo.Group,
 ) (TaskQueueService, error) {
 	keyEventChan := make(chan common.KeyEvent)
 	keyEventManager, err := common.NewKeyEventManager(rdb)
@@ -79,7 +79,7 @@ func NewRedisTaskQueueService(
 
 	// Register HTTP routes
 	authMiddleware := auth.AuthMiddleware(backendRepo)
-	registerTaskQueueRoutes(baseRouteGroup.Group(taskQueueRoutePrefix, authMiddleware), tq)
+	registerTaskQueueRoutes(routeGroup.Group(taskQueueRoutePrefix, authMiddleware), tq)
 
 	return tq, nil
 }

diff --git a/internal/api/v1/base.go b/internal/api/v1/base.go
@@ -2,4 +2,5 @@ package apiv1
 
 const (
 	HttpServerBaseRoute string = "/api/v1"
+	HttpServerRootRoute string = "/"
 )
diff --git a/internal/gateway/gateway.go b/internal/gateway/gateway.go
@@ -55,6 +55,7 @@ type Gateway struct {
 	ctx            context.Context
 	cancelFunc     context.CancelFunc
 	baseRouteGroup *echo.Group
+	rootRouteGroup *echo.Group
 }
 
 func NewGateway() (*Gateway, error) {
@@ -139,6 +140,7 @@ func (g *Gateway) initHttp() error {
 
 	authMiddleware := auth.AuthMiddleware(g.BackendRepo)
 	g.baseRouteGroup = e.Group(apiv1.HttpServerBaseRoute)
+	g.rootRouteGroup = e.Group(apiv1.HttpServerRootRoute)
 
 	apiv1.NewHealthGroup(g.baseRouteGroup.Group("/health"), g.redisClient)
 	apiv1.NewMachineGroup(g.baseRouteGroup.Group("/machine", authMiddleware), g.ProviderRepo, g.Tailscale, g.config)
@@ -196,33 +198,33 @@ func (g *Gateway) registerServices() error {
 
 	// Register function service
 	fs, err := function.NewRuncFunctionService(g.ctx, function.FunctionServiceOpts{
-		Config:         g.config,
-		RedisClient:    g.redisClient,
-		BackendRepo:    g.BackendRepo,
-		ContainerRepo:  g.ContainerRepo,
-		Scheduler:      g.Scheduler,
-		Tailscale:      g.Tailscale,
-		BaseRouteGroup: g.baseRouteGroup,
+		Config:        g.config,
+		RedisClient:   g.redisClient,
+		BackendRepo:   g.BackendRepo,
+		ContainerRepo: g.ContainerRepo,
+		Scheduler:     g.Scheduler,
+		Tailscale:     g.Tailscale,
+		RouteGroup:    g.rootRouteGroup,
 	})
 	if err != nil {
 		return err
 	}
 	pb.RegisterFunctionServiceServer(g.grpcServer, fs)
 
 	// Register task queue service
-	tq, err := taskqueue.NewRedisTaskQueueService(g.ctx, g.redisClient, g.Scheduler, g.ContainerRepo, g.BackendRepo, g.baseRouteGroup)
+	tq, err := taskqueue.NewRedisTaskQueueService(g.ctx, g.redisClient, g.Scheduler, g.ContainerRepo, g.BackendRepo, g.rootRouteGroup)
 	if err != nil {
 		return err
 	}
 	pb.RegisterTaskQueueServiceServer(g.grpcServer, tq)
 
 	// Register endpoint service
 	ws, err := endpoint.NewEndpointService(g.ctx, endpoint.EndpointServiceOpts{
-		Config:         g.config,
-		RedisClient:    g.redisClient,
-		Scheduler:      g.Scheduler,
-		BaseRouteGroup: g.baseRouteGroup,
-		Tailscale:      g.Tailscale,
+		Config:      g.config,
+		RedisClient: g.redisClient,
+		Scheduler:   g.Scheduler,
+		RouteGroup:  g.rootRouteGroup,
+		Tailscale:   g.Tailscale,
 	})
 	if err != nil {
 		return err

diff --git a/internal/worker/worker.go b/internal/worker/worker.go
@@ -745,6 +745,11 @@ func (s *Worker) shutdown() error {
 		return err
 	}
 
+	err = s.storage.Unmount(s.config.Storage.FilesystemPath)
+	if err != nil {
+		log.Printf("Failed to unmount storage: %v\n", err)
+	}
+
 	s.cancel()
 	return nil
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ package apiv1 @@
     const (
     	HttpServerBaseRoute string = "/api/v1"
+    	HttpServerRootRoute string = "/"
     )