fix: updates to match main repo

Signed-off-by: Ivan Dagelic <[email protected]>
daytonaio · Jul 31, 2024 · 18fd8db · 18fd8db
1 parent d38f742
commit 18fd8db
Show file tree

Hide file tree

Showing 5 changed files with 21 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.22.0
+	github.com/daytonaio/daytona v0.23.2-0.20240731203426-19d9ac5ef798
 	github.com/docker/docker v26.1.0+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
@@ -673,8 +673,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.22.0 h1:JW9VY3iNZv0lAc06hux5hnJBaCQnmti35D4ZGKT7OjU=
-github.com/daytonaio/daytona v0.22.0/go.mod h1:Wt2JaDzVbwyOKSj4/g//+TQrdZk0WP6IvUgUDanHVHI=
+github.com/daytonaio/daytona v0.23.2-0.20240731203426-19d9ac5ef798 h1:7yiEQ2w1UWooNb2GkuIqBY4r8lVFhiuWS+jc4RKSv8E=
+github.com/daytonaio/daytona v0.23.2-0.20240731203426-19d9ac5ef798/go.mod h1:8yXvTGwapmO6ygfj2jMR9wWwjbpW7HBGNm8ALAeqFMQ=
 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.0+incompatible h1:W1G9MPNbskA6VZWL7b3ZljTh0pXI68FpINx0GKaOdaM=

diff --git a/pkg/provider/create.go b/pkg/provider/create.go
@@ -68,7 +68,7 @@ func (p DockerProvider) CreateProject(projectReq *provider.ProjectRequest) (*pro
 
 	var sshClient *ssh.Client
 	if projectReq.Project.Target == "local" {
-		if projectReq.Project.Build == nil {
+		if projectReq.Project.BuildConfig == nil {
 			p.setLocalEnvOverride(projectReq.Project)
 		}
 	} else {

diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -21,6 +21,7 @@ import (
 	provider_util "github.com/daytonaio/daytona/pkg/provider/util"
 	"github.com/daytonaio/daytona/pkg/ssh"
 	"github.com/daytonaio/daytona/pkg/workspace"
+	"github.com/daytonaio/daytona/pkg/workspace/project"
 )
 
 type DockerProvider struct {
@@ -162,7 +163,7 @@ func (p DockerProvider) StartProject(projectReq *provider.ProjectRequest) (*prov
 	var sshClient *ssh.Client
 
 	if projectReq.Project.Target == "local" {
-		if projectReq.Project.Build == nil {
+		if projectReq.Project.BuildConfig == nil {
 			parsed, err := url.Parse(downloadUrl)
 			if err != nil {
 				return new(provider_util.Empty), err
@@ -245,7 +246,7 @@ func (p DockerProvider) DestroyProject(projectReq *provider.ProjectRequest) (*pr
 	return new(provider_util.Empty), nil
 }
 
-func (p DockerProvider) GetProjectInfo(projectReq *provider.ProjectRequest) (*workspace.ProjectInfo, error) {
+func (p DockerProvider) GetProjectInfo(projectReq *provider.ProjectRequest) (*project.ProjectInfo, error) {
 	dockerClient, err := p.getClient(projectReq.TargetOptions)
 	if err != nil {
 		return nil, err
@@ -271,7 +272,7 @@ func (p DockerProvider) getClient(targetOptionsJson string) (docker.IDockerClien
 }
 
 // If the project is running locally, we override the env vars to use the host.docker.internal address
-func (p DockerProvider) setLocalEnvOverride(project *workspace.Project) {
+func (p DockerProvider) setLocalEnvOverride(project *project.Project) {
 	project.EnvVars["DAYTONA_SERVER_URL"] = fmt.Sprintf("http://host.docker.internal:%d", *p.ServerPort)
 	project.EnvVars["DAYTONA_SERVER_API_URL"] = fmt.Sprintf("http://host.docker.internal:%d", *p.ApiPort)
 }

diff --git a/pkg/provider/provider_test.go b/pkg/provider/provider_test.go
@@ -11,6 +11,8 @@ import (
 	"github.com/daytonaio/daytona/pkg/gitprovider"
 	"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"
@@ -24,27 +26,29 @@ var targetOptions = &provider_types.TargetOptions{}
 var sockDir = "/tmp/target-socks"
 var optionsString string
 
-var project1 = &workspace.Project{
-	Name: "test",
-	Repository: &gitprovider.GitRepository{
-		Id:   "123",
-		Url:  "https://github.com/daytonaio/daytona",
-		Name: "daytona",
+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",
 	},
-	Image:       "daytonaio/workspace-project:latest",
 	WorkspaceId: "123",
 }
 
 var workspace1 = &workspace.Workspace{
 	Id:     "123",
 	Name:   "test",
 	Target: "local",
-	Projects: []*workspace.Project{
+	Projects: []*project.Project{
 		project1,
 	},
 }
 
-func GetContainerName(project *workspace.Project) string {
+func GetContainerName(project *project.Project) string {
 	dockerClient := docker.NewDockerClient(docker.DockerClientConfig{})
 
 	return dockerClient.GetProjectContainerName(project)