choose username according to whether verb yaml

brevdev · Aug 8, 2023 · e485f47 · e485f47
1 parent dcc6ec0
commit e485f47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/entity/entity.go b/pkg/entity/entity.go
@@ -305,6 +305,7 @@ type Workspace struct {
 	ExecsV1           *ExecsV1  `json:"execsV1"`
 	IDEConfig         IDEConfig `json:"ideConfig"`
 	SSHPort           int       `json:"sshPort"`
+	VerbYaml          string    `json:"verbYaml"`
 	// PrimaryApplicationId         string `json:"primaryApplicationId,omitempty"`
 	// LastOnlineAt         string `json:"lastOnlineAt,omitempty"`
 	// CreatedAt         string `json:"createdAt,omitempty"`

diff --git a/pkg/ssh/sshconfigurer.go b/pkg/ssh/sshconfigurer.go
@@ -279,11 +279,17 @@ func makeSSHConfigEntryV2(workspace entity.Workspace, privateKeyPath string) (st
 		}
 	} else {
 		hostname := workspace.GetHostname()
+		var userName string
+		if workspace.VerbYaml != "" {
+			userName = "root"
+		} else {
+			userName = "ubuntu"
+		}
 		port := workspace.GetPort()
 		entry = SSHConfigEntryV2{
 			Alias:        alias,
 			IdentityFile: privateKeyPath,
-			User:         "ubuntu", // todo param-user
+			User:         userName, // todo param-user
 			Dir:          workspace.GetProjectFolderPath(),
 			HostName:     hostname,
 			Port:         port,