fix: prebuilds

Signed-off-by: Ivan Dagelic <[email protected]>
daytonaio · Aug 23, 2024 · 6ee0218 · 6ee0218
1 parent b51e5ef
commit 6ee0218
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/daytonaio/daytona-provider-docker
 go 1.22.2
 
 require (
-	github.com/daytonaio/daytona v0.25.2
+	github.com/daytonaio/daytona v0.25.2-0.20240823151247-446b29c84986
 	github.com/docker/docker v26.1.5+incompatible
 	github.com/hashicorp/go-hclog v1.6.3
 	github.com/hashicorp/go-plugin v1.6.0

diff --git a/go.sum b/go.sum
@@ -705,8 +705,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0=
 github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE=
-github.com/daytonaio/daytona v0.25.2 h1:ZCWo2HTPhY4LvnnkBMENnwkZLnJn/+tbP9NBofRh27Q=
-github.com/daytonaio/daytona v0.25.2/go.mod h1:3XRUqc4nlRNtGne8wMNtz+Oqj3SQqe4EDWUJC/eawpI=
+github.com/daytonaio/daytona v0.25.2-0.20240823151247-446b29c84986 h1:uiQMJp6IZsFEhY/LMzBZ0zUk9NbLqcuGN0HxbBJ6DxE=
+github.com/daytonaio/daytona v0.25.2-0.20240823151247-446b29c84986/go.mod h1:3XRUqc4nlRNtGne8wMNtz+Oqj3SQqe4EDWUJC/eawpI=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g=

diff --git a/pkg/provider/create.go b/pkg/provider/create.go
@@ -16,7 +16,7 @@ import (
 func (p DockerProvider) CreateWorkspace(workspaceReq *provider.WorkspaceRequest) (*provider_util.Empty, error) {
 	logWriter := io.MultiWriter(&log_writers.InfoLogWriter{})
 	if p.LogsDir != nil {
-		loggerFactory := logs.NewLoggerFactory(*p.LogsDir)
+		loggerFactory := logs.NewLoggerFactory(p.LogsDir, nil)
 		wsLogWriter := loggerFactory.CreateWorkspaceLogger(workspaceReq.Workspace.Id, logs.LogSourceProvider)
 		logWriter = io.MultiWriter(&log_writers.InfoLogWriter{}, wsLogWriter)
 		defer wsLogWriter.Close()
@@ -50,7 +50,7 @@ func (p DockerProvider) CreateProject(projectReq *provider.ProjectRequest) (*pro
 
 	logWriter := io.MultiWriter(&log_writers.InfoLogWriter{})
 	if p.LogsDir != nil {
-		loggerFactory := logs.NewLoggerFactory(*p.LogsDir)
+		loggerFactory := logs.NewLoggerFactory(p.LogsDir, nil)
 		projectLogWriter := loggerFactory.CreateProjectLogger(projectReq.Project.WorkspaceId, projectReq.Project.Name, logs.LogSourceProvider)
 		logWriter = io.MultiWriter(&log_writers.InfoLogWriter{}, projectLogWriter)
 		defer projectLogWriter.Close()

diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -153,7 +153,7 @@ func (p DockerProvider) StartProject(projectReq *provider.ProjectRequest) (*prov
 
 	logWriter := io.MultiWriter(&log_writers.InfoLogWriter{})
 	if p.LogsDir != nil {
-		loggerFactory := logs.NewLoggerFactory(*p.LogsDir)
+		loggerFactory := logs.NewLoggerFactory(p.LogsDir, nil)
 		projectLogWriter := loggerFactory.CreateProjectLogger(projectReq.Project.WorkspaceId, projectReq.Project.Name, logs.LogSourceProvider)
 		logWriter = io.MultiWriter(&log_writers.InfoLogWriter{}, projectLogWriter)
 		defer projectLogWriter.Close()
@@ -210,7 +210,7 @@ func (p DockerProvider) StopProject(projectReq *provider.ProjectRequest) (*provi
 
 	logWriter := io.MultiWriter(&log_writers.InfoLogWriter{})
 	if p.LogsDir != nil {
-		loggerFactory := logs.NewLoggerFactory(*p.LogsDir)
+		loggerFactory := logs.NewLoggerFactory(p.LogsDir, nil)
 		projectLogWriter := loggerFactory.CreateProjectLogger(projectReq.Project.WorkspaceId, projectReq.Project.Name, logs.LogSourceProvider)
 		logWriter = io.MultiWriter(&log_writers.InfoLogWriter{}, projectLogWriter)
 		defer projectLogWriter.Close()

diff --git a/pkg/provider/provider_test.go b/pkg/provider/provider_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/daytonaio/daytona/pkg/provider"
 	"github.com/daytonaio/daytona/pkg/workspace"
 	"github.com/daytonaio/daytona/pkg/workspace/project"
-	"github.com/daytonaio/daytona/pkg/workspace/project/config"
 
 	docker_provider "github.com/daytonaio/daytona-provider-docker/pkg/provider"
 	provider_types "github.com/daytonaio/daytona-provider-docker/pkg/types"
@@ -27,15 +26,13 @@ var sockDir = "/tmp/target-socks"
 var optionsString string
 
 var project1 = &project.Project{
-	ProjectConfig: config.ProjectConfig{
-		Name: "test",
-		Repository: &gitprovider.GitRepository{
-			Id:   "123",
-			Url:  "https://github.com/daytonaio/daytona",
-			Name: "daytona",
-		},
-		Image: "daytonaio/workspace-project:latest",
+	Name: "test",
+	Repository: &gitprovider.GitRepository{
+		Id:   "123",
+		Url:  "https://github.com/daytonaio/daytona",
+		Name: "daytona",
 	},
+	Image:       "daytonaio/workspace-project:latest",
 	WorkspaceId: "123",
 }