fixex

Signed-off-by: Rutik7066 <[email protected]>
daytonaio · Jan 24, 2025 · a8025af · a8025af
1 parent 7dd63d8
commit a8025af
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -78,6 +78,7 @@ require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/UserExistsError/conpty v0.1.4 // indirect
 	github.com/akutz/memconn v0.1.0 // indirect
 	github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect

diff --git a/go.sum b/go.sum
@@ -626,6 +626,8 @@ github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78=
 github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
+github.com/UserExistsError/conpty v0.1.4 h1:+3FhJhiqhyEJa+K5qaK3/w6w+sN3Nh9O9VbJyBS02to=
+github.com/UserExistsError/conpty v0.1.4/go.mod h1:PDglKIkX3O/2xVk0MV9a6bCWxRmPVfxqZoTG/5sSd9I=
 github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
 github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=

diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -112,11 +112,11 @@ func (a *Agent) startWorkspaceMode() error {
 			if exists {
 				log.Info("Repository already exists. Skipping clone...")
 			} else {
-        if stat, err := os. Stat(a.Config.WorkspaceDir); err == nil {
-          ownerVid, err := fs.GetFileUid(stat)
-          if err != nil {
-            log.Error(err)
-          }
+				if stat, err := os.Stat(a.Config.WorkspaceDir); err == nil {
+					ownerUid, err := fs.GetFileUid(stat)
+					if err != nil {
+						log.Error(err)
+					}
 					if ownerUid != uint32(os.Getuid()) {
 						chownCmd := exec.Command("sudo", "chown", "-R", fmt.Sprintf("%s:%s", a.Workspace.User, a.Workspace.User), a.Config.WorkspaceDir)
 						err = chownCmd.Run()

diff --git a/pkg/agent/ssh/server.go b/pkg/agent/ssh/server.go
@@ -9,13 +9,12 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
-	"strings"
-
 
 	"github.com/daytonaio/daytona/pkg/agent/ssh/config"
 	"github.com/daytonaio/daytona/pkg/common"
 	"github.com/gliderlabs/ssh"
 	"github.com/pkg/sftp"
+	"golang.org/x/sys/unix"
 
 	log "github.com/sirupsen/logrus"
 )