refactor: provisioner struct

Removed event_bus package as well

Signed-off-by: Toma Puljak <[email protected]>

pkg/server/api/controllers/workspace/workspace.go

@@ -9,13 +9,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/daytonaio/daytona/pkg/server/api/controllers/workspace/dto"
-	"github.com/daytonaio/daytona/pkg/server/db"
-	"github.com/daytonaio/daytona/pkg/server/provisioner"
 	"github.com/daytonaio/daytona/pkg/server/workspaceservice"
-	"github.com/daytonaio/daytona/pkg/types"
 	"github.com/gin-gonic/gin"
-	log "github.com/sirupsen/logrus"
 )
 
 // GetWorkspace 			godoc
@@ -53,41 +48,25 @@ func GetWorkspace(ctx *gin.Context) {
 //
 //	@id				ListWorkspaces
 func ListWorkspaces(ctx *gin.Context) {
-	workspaces, err := db.ListWorkspaces()
-	verbose := ctx.Query("verbose")
+	verboseQuery := ctx.Query("verbose")
+	verbose := false
+	var err error
+
+	if verboseQuery != "" {
+		verbose, err = strconv.ParseBool(verboseQuery)
+		if err != nil {
+			ctx.AbortWithError(http.StatusBadRequest, errors.New("invalid value for verbose flag"))
+			return
+		}
+	}
 
+	workspaceList, err := workspaceservice.ListWorkspaces(verbose)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, errors.New("failed to list workspaces"))
+		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to list workspaces: %s", err.Error()))
 		return
 	}
 
-	response := []dto.WorkspaceDTO{}
-
-	for _, workspace := range workspaces {
-		var workspaceInfo *types.WorkspaceInfo
-		if verbose != "" {
-			isVerbose, err := strconv.ParseBool(verbose)
-			if err != nil {
-				ctx.AbortWithError(http.StatusBadRequest, errors.New("invalid value for verbose flag"))
-				return
-			}
-
-			if isVerbose {
-				workspaceInfo, err = provisioner.GetWorkspaceInfo(workspace)
-				if err != nil {
-					log.Error(fmt.Errorf("failed to get workspace info for %s", workspace.Name))
-					// return
-				}
-			}
-		}
-
-		response = append(response, dto.WorkspaceDTO{
-			Workspace: *workspace,
-			Info:      workspaceInfo,
-		})
-	}
-
-	ctx.JSON(200, response)
+	ctx.JSON(200, workspaceList)
 }
 
 // RemoveWorkspace 			godoc

pkg/server/provisioner/create.go

@@ -0,0 +1,38 @@
+// Copyright 2024 Daytona Platforms Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package provisioner
+
+import (
+	"github.com/daytonaio/daytona/pkg/provider"
+	"github.com/daytonaio/daytona/pkg/provider/manager"
+	"github.com/daytonaio/daytona/pkg/types"
+)
+
+func (p *Provisioner) CreateWorkspace(workspace *types.Workspace, target *provider.ProviderTarget) error {
+	targetProvider, err := manager.GetProvider(target.ProviderInfo.Name)
+	if err != nil {
+		return err
+	}
+
+	_, err = (*targetProvider).CreateWorkspace(&provider.WorkspaceRequest{
+		TargetOptions: target.Options,
+		Workspace:     workspace,
+	})
+
+	return err
+}
+
+func (p *Provisioner) CreateProject(project *types.Project, target *provider.ProviderTarget) error {
+	targetProvider, err := manager.GetProvider(target.ProviderInfo.Name)
+	if err != nil {
+		return err
+	}
+
+	_, err = (*targetProvider).CreateProject(&provider.ProjectRequest{
+		TargetOptions: target.Options,
+		Project:       project,
+	})
+
+	return err
+}

pkg/server/provisioner/destroy.go

@@ -0,0 +1,38 @@
+// Copyright 2024 Daytona Platforms Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package provisioner
+
+import (
+	"github.com/daytonaio/daytona/pkg/provider"
+	"github.com/daytonaio/daytona/pkg/provider/manager"
+	"github.com/daytonaio/daytona/pkg/types"
+)
+
+func (p *Provisioner) DestroyWorkspace(workspace *types.Workspace, target *provider.ProviderTarget) error {
+	targetProvider, err := manager.GetProvider(target.ProviderInfo.Name)
+	if err != nil {
+		return err
+	}
+
+	_, err = (*targetProvider).DestroyWorkspace(&provider.WorkspaceRequest{
+		TargetOptions: target.Options,
+		Workspace:     workspace,
+	})
+
+	return err
+}
+
+func (p *Provisioner) DestroyProject(project *types.Project, target *provider.ProviderTarget) error {
+	targetProvider, err := manager.GetProvider(target.ProviderInfo.Name)
+	if err != nil {
+		return err
+	}
+
+	_, err = (*targetProvider).DestroyProject(&provider.ProjectRequest{
+		TargetOptions: target.Options,
+		Project:       project,
+	})
+
+	return err
+}

pkg/server/provisioner/info.go

@@ -0,0 +1,22 @@
+// Copyright 2024 Daytona Platforms Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package provisioner
+
+import (
+	"github.com/daytonaio/daytona/pkg/provider"
+	"github.com/daytonaio/daytona/pkg/provider/manager"
+	"github.com/daytonaio/daytona/pkg/types"
+)
+
+func (p *Provisioner) GetWorkspaceInfo(workspace *types.Workspace, target *provider.ProviderTarget) (*types.WorkspaceInfo, error) {
+	targetProvider, err := manager.GetProvider(target.ProviderInfo.Name)
+	if err != nil {
+		return nil, err
+	}
+
+	return (*targetProvider).GetWorkspaceInfo(&provider.WorkspaceRequest{
+		TargetOptions: target.Options,
+		Workspace:     workspace,
+	})
+}