chore(vpn/tunnel): sort outgoing fqdns by length #16520
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -402,6 +403,9 @@ func (u *updater) createPeerUpdateLocked(update tailnet.WorkspaceUpdate) *PeerUp | |||
| for name := range agent.Hosts { | |||
| fqdn = append(fqdn, name.WithTrailingDot()) | |||
| } | |||
| sort.Slice(fqdn, func(i, j int) bool { | |||
| return len(fqdn[i]) < len(fqdn[j]) | |||
There was a problem hiding this comment.
Wouldn't a better sort be by the amount of periods?
There was a problem hiding this comment.
Not necessarily? If we have:
dev.wsname.ethan.coder
dev.wsname.me.coder
I'd want the latter to be shown. I guess we could do number of periods AND length?
There was a problem hiding this comment.
Actually, I don't think it's worth doing that. We want the shortest name because that's what looks the best in the UI. With all the hostnames we set currently, the shortest name is always going to have the least periods. If we ever change that, we can revisit this.
deansheather
approved these changes
Feb 11, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On the Mac app, we want to display the shortest FQDN - we might as well do the sorting as they leave the tunnel.
Right now it's coming from a map, so it's they arrive in a random order each peer update.