Print IP instead of Port for non-local SSH

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

pkg/hostagent/events/events.go

@@ -16,7 +16,8 @@ type Status struct {
 
 	Errors []string `json:"errors,omitempty"`
 
-	SSHLocalPort int `json:"sshLocalPort,omitempty"`
+	SSHIPAddress string `json:"sshIPAddress,omitempty"`
+	SSHLocalPort int    `json:"sshLocalPort,omitempty"`
 }
 
 type Event struct {

pkg/hostagent/hostagent.go

@@ -372,8 +372,21 @@ func (a *HostAgent) Run(ctx context.Context) error {
 	return a.startRoutinesAndWait(ctx, errCh)
 }
 
+func getIP(address string) string {
+	ip := net.ParseIP(address)
+	if ip != nil {
+		return address
+	}
+	ips, err := net.LookupIP(address)
+	if err == nil && len(ips) > 0 {
+		return ips[0].String()
+	}
+	return address
+}
+
 func (a *HostAgent) startRoutinesAndWait(ctx context.Context, errCh <-chan error) error {
 	stBase := events.Status{
+		SSHIPAddress: getIP(a.instSSHAddress),
 		SSHLocalPort: a.sshLocalPort,
 	}
 	stBooting := stBase

pkg/instance/start.go

@@ -288,7 +288,13 @@ func watchHostAgentEvents(ctx context.Context, inst *store.Instance, haStdoutPat
 	)
 	onEvent := func(ev hostagentevents.Event) bool {
 		if !printedSSHLocalPort && ev.Status.SSHLocalPort != 0 {
-			logrus.Infof("SSH Local Port: %d", ev.Status.SSHLocalPort)
+			if ev.Status.SSHIPAddress == "127.0.0.1" {
+				logrus.Infof("SSH Local Port: %d", ev.Status.SSHLocalPort)
+			} else if ev.Status.SSHLocalPort == 22 {
+				logrus.Infof("SSH IP Address: %s", ev.Status.SSHIPAddress)
+			} else {
+				logrus.Infof("SSH IP Address: %s Port: %d", ev.Status.SSHIPAddress, ev.Status.SSHLocalPort)
+			}
 			printedSSHLocalPort = true
 		}