philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: make connection method using system 'ssh' the default (add ssh+go:// fallback)

Browse Source
This commit is contained in:
Pasha Sviderski
2026-03-27 20:27:36 +10:00
parent 0a9a1db815
commit 06c2bc55f2
60 changed files with 206 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cli/connect.go
+12 -8
View File
@@ -57,9 +57,9 @@ func connectClusterWithProgress(ctx context.Context, conn config.MachineConnecti
}
func connectCluster(ctx context.Context, conn config.MachineConnection) (*client.Client, error) {
// Determine which SSH type is configured
// Determine which SSH type is configured.
var sshDest config.SSHDestination
var useSSHCLI bool
var useGoSSH bool
// Validate connection configuration early to provide clear error messages.
if err := conn.Validate(); err != nil {
@@ -67,11 +67,15 @@ func connectCluster(ctx context.Context, conn config.MachineConnection) (*client
}
if conn.SSH != "" {
// SSH uses the system ssh CLI command (default).
sshDest = conn.SSH
useSSHCLI = false
} else if conn.SSHCLI != "" {
// SSHCLI is a backward-compatible alias for SSH.
sshDest = conn.SSHCLI
useSSHCLI = true
} else if conn.SSHGo != "" {
// SSHGo uses Go's built-in SSH library.
sshDest = conn.SSHGo
useGoSSH = true
} else if conn.TCP != nil && conn.TCP.IsValid() {
return client.New(ctx, connector.NewTCPConnector(*conn.TCP))
} else if conn.Unix != "" {
@@ -95,11 +99,11 @@ func connectCluster(ctx context.Context, conn config.MachineConnection) (*client
KeyPath: keyPath,
}
// Create appropriate connector based on type
if useSSHCLI {
return client.New(ctx, connector.NewSSHCLIConnector(sshConfig))
// Create appropriate connector based on type.
if useGoSSH {
return client.New(ctx, connector.NewSSHConnector(sshConfig))
}
return client.New(ctx, connector.NewSSHConnector(sshConfig))
return client.New(ctx, connector.NewSSHCLIConnector(sshConfig))
}
// connectModel is a TUI model for connecting to a cluster with a progress spinner.