rename machines to connections in config

This commit is contained in:
Pavel Sviderski
2024-09-10 16:20:00 +10:00
parent ddf7d23351
commit 4e2640bbd2
4 changed files with 31 additions and 17 deletions
+2 -2
View File
@@ -3,8 +3,8 @@ package config
import "uncloud/internal/secret"
type Cluster struct {
Name string `toml:"-"`
Machines []MachineConnection `toml:"machines"`
Name string `toml:"-"`
Connections []MachineConnection `toml:"connections"`
// UserPrivateKey is the user's WireGuard private key used to connect to cluster machines.
UserPrivateKey secret.Secret `toml:"user_private_key"`
}
+3 -2
View File
@@ -33,8 +33,9 @@ func NewSSHDestination(user, host string, port int) SSHDestination {
}
func (d SSHDestination) Parse() (user string, host string, port int, err error) {
if strings.Contains(string(d), "@") {
user, host, _ = strings.Cut(string(d), "@")
host = string(d)
if strings.Contains(host, "@") {
user, host, _ = strings.Cut(host, "@")
}
h, p, sErr := net.SplitHostPort(host)
if sErr == nil {