diff --git a/cmd/soundtouch-cli/cmd_setup.go b/cmd/soundtouch-cli/cmd_setup.go index 7368915..0f3f580 100644 --- a/cmd/soundtouch-cli/cmd_setup.go +++ b/cmd/soundtouch-cli/cmd_setup.go @@ -780,13 +780,16 @@ func validateServiceURL(serviceURL string) error { if err != nil { return fmt.Errorf("invalid --service-url %q: %w", serviceURL, err) } + if parsed.Hostname() == "" { hint := "" if parsed.Scheme != "" && parsed.Opaque != "" { hint = fmt.Sprintf(" (did you mean %s://%s?)", parsed.Scheme, strings.TrimPrefix(parsed.Opaque, "/")) } + return fmt.Errorf("invalid --service-url %q: no hostname found%s", serviceURL, hint) } + return nil } @@ -1359,6 +1362,7 @@ func renderPlanSteps(steps []planStep, includePair bool) { } else { PrintSuccess("Speaker is already migrated. No action required.") } + return } diff --git a/pkg/service/setup/setup.go b/pkg/service/setup/setup.go index 3dad65d..7ff7dc3 100644 --- a/pkg/service/setup/setup.go +++ b/pkg/service/setup/setup.go @@ -601,6 +601,7 @@ func (m *Manager) isResolvConfMigrated(client SSHClient, summary *MigrationSumma if targetHost == "" { return false } + if strings.Contains(summary.CurrentResolvConf, targetHost) && summary.CACertTrusted { return true }