Skip to content

Commit bc862fa

Browse files
coadlercoadler
authored
chore: upgrade tailscale to v1.46.1 (coder#8913)
1 parent 5b9dc2e commit bc862fa

File tree

25 files changed

+467
-297
lines changed

25 files changed

+467
-297
lines changed

‎cli/clibase/cmd.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import (
1414
"golang.org/x/exp/slices"
1515
"golang.org/x/xerrors"
1616
"gopkg.in/yaml.v3"
17+
18+
"github.com/coder/coder/coderd/util/slice"
1719
)
1820

1921
// Cmd describes an executable command.
@@ -102,11 +104,11 @@ func (c *Cmd) PrepareAll() error {
102104
}
103105
}
104106

105-
slices.SortFunc(c.Options, func(a, b Option) bool {
106-
return a.Name < b.Name
107+
slices.SortFunc(c.Options, func(a, b Option) int {
108+
return slice.Ascending(a.Name, b.Name)
107109
})
108-
slices.SortFunc(c.Children, func(a, b *Cmd) bool {
109-
return a.Name() < b.Name()
110+
slices.SortFunc(c.Children, func(a, b *Cmd) int {
111+
return slice.Ascending(a.Name(), b.Name())
110112
})
111113
for _, child := range c.Children {
112114
child.Parent = c

‎cli/configssh.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
"github.com/coder/coder/cli/clibase"
2626
"github.com/coder/coder/cli/cliui"
27+
"github.com/coder/coder/coderd/util/slice"
2728
"github.com/coder/coder/codersdk"
2829
)
2930

@@ -367,8 +368,8 @@ func (r *RootCmd) configSSH() *clibase.Cmd {
367368
}
368369

369370
// Ensure stable sorting of output.
370-
slices.SortFunc(workspaceConfigs, func(a, b sshWorkspaceConfig) bool {
371-
return a.Name < b.Name
371+
slices.SortFunc(workspaceConfigs, func(a, b sshWorkspaceConfig) int {
372+
return slice.Ascending(a.Name, b.Name)
372373
})
373374
for _, wc := range workspaceConfigs {
374375
sort.Strings(wc.Hosts)

‎cli/create.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/coder/coder/cli/clibase"
1414
"github.com/coder/coder/cli/cliui"
1515
"github.com/coder/coder/coderd/util/ptr"
16+
"github.com/coder/coder/coderd/util/slice"
1617
"github.com/coder/coder/codersdk"
1718
)
1819

@@ -81,8 +82,8 @@ func (r *RootCmd) create() *clibase.Cmd {
8182
return err
8283
}
8384

84-
slices.SortFunc(templates, func(a, b codersdk.Template) bool {
85-
return a.ActiveUserCount > b.ActiveUserCount
85+
slices.SortFunc(templates, func(a, b codersdk.Template) int {
86+
return slice.Descending(a.ActiveUserCount, b.ActiveUserCount)
8687
})
8788

8889
templateNames := make([]string, 0, len(templates))

‎coderd/apidoc/docs.go

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbfake/dbfake.go

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,8 @@ func uniqueSortedUUIDs(uuids []uuid.UUID) []uuid.UUID {
605605
for id := range set {
606606
unique = append(unique, id)
607607
}
608-
slices.SortFunc(unique, func(a, b uuid.UUID) bool {
609-
return a.String() < b.String()
608+
slices.SortFunc(unique, func(a, b uuid.UUID) int {
609+
return slice.Ascending(a.String(), b.String())
610610
})
611611
return unique
612612
}
@@ -2060,8 +2060,8 @@ func (q *FakeQuerier) GetTemplateDailyInsights(_ context.Context, arg database.G
20602060
for templateID := range ds.templateIDSet {
20612061
templateIDs = append(templateIDs, templateID)
20622062
}
2063-
slices.SortFunc(templateIDs, func(a, b uuid.UUID) bool {
2064-
return a.String() < b.String()
2063+
slices.SortFunc(templateIDs, func(a, b uuid.UUID) int {
2064+
return slice.Ascending(a.String(), b.String())
20652065
})
20662066
result = append(result, database.GetTemplateDailyInsightsRow{
20672067
StartTime: ds.startTime,
@@ -2119,8 +2119,8 @@ func (q *FakeQuerier) GetTemplateInsights(_ context.Context, arg database.GetTem
21192119
for templateID := range templateIDSet {
21202120
templateIDs = append(templateIDs, templateID)
21212121
}
2122-
slices.SortFunc(templateIDs, func(a, b uuid.UUID) bool {
2123-
return a.String() < b.String()
2122+
slices.SortFunc(templateIDs, func(a, b uuid.UUID) int {
2123+
return slice.Ascending(a.String(), b.String())
21242124
})
21252125
result := database.GetTemplateInsightsRow{
21262126
TemplateIDs: templateIDs,
@@ -2343,13 +2343,16 @@ func (q *FakeQuerier) GetTemplateVersionsByTemplateID(_ context.Context, arg dat
23432343
}
23442344

23452345
// Database orders by created_at
2346-
slices.SortFunc(version, func(a, b database.TemplateVersion) bool {
2346+
slices.SortFunc(version, func(a, b database.TemplateVersion) int {
23472347
if a.CreatedAt.Equal(b.CreatedAt) {
23482348
// Technically the postgres database also orders by uuid. So match
23492349
// that behavior
2350-
return a.ID.String() < b.ID.String()
2350+
return slice.Ascending(a.ID.String(), b.ID.String())
23512351
}
2352-
return a.CreatedAt.Before(b.CreatedAt)
2352+
if a.CreatedAt.Before(b.CreatedAt) {
2353+
return -1
2354+
}
2355+
return 1
23532356
})
23542357

23552358
if arg.AfterID != uuid.Nil {
@@ -2408,11 +2411,11 @@ func (q *FakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro
24082411
defer q.mutex.RUnlock()
24092412

24102413
templates := slices.Clone(q.templates)
2411-
slices.SortFunc(templates, func(i, j database.TemplateTable) bool {
2412-
if i.Name != j.Name {
2413-
return i.Name < j.Name
2414+
slices.SortFunc(templates, func(a, b database.TemplateTable) int {
2415+
if a.Name != b.Name {
2416+
return slice.Ascending(a.Name, b.Name)
24142417
}
2415-
return i.ID.String() < j.ID.String()
2418+
return slice.Ascending(a.ID.String(), b.ID.String())
24162419
})
24172420

24182421
return q.templatesWithUserNoLock(templates), nil
@@ -2525,8 +2528,8 @@ func (q *FakeQuerier) GetUserLatencyInsights(_ context.Context, arg database.Get
25252528
for templateID := range templateIDSet {
25262529
templateIDs = append(templateIDs, templateID)
25272530
}
2528-
slices.SortFunc(templateIDs, func(a, b uuid.UUID) bool {
2529-
return a.String() < b.String()
2531+
slices.SortFunc(templateIDs, func(a, b uuid.UUID) int {
2532+
return slice.Ascending(a.String(), b.String())
25302533
})
25312534
user, err := q.getUserByIDNoLock(userID)
25322535
if err != nil {
@@ -2542,8 +2545,8 @@ func (q *FakeQuerier) GetUserLatencyInsights(_ context.Context, arg database.Get
25422545
}
25432546
rows = append(rows, row)
25442547
}
2545-
slices.SortFunc(rows, func(a, b database.GetUserLatencyInsightsRow) bool {
2546-
return a.UserID.String() < b.UserID.String()
2548+
slices.SortFunc(rows, func(a, b database.GetUserLatencyInsightsRow) int {
2549+
return slice.Ascending(a.UserID.String(), b.UserID.String())
25472550
})
25482551

25492552
return rows, nil
@@ -2590,8 +2593,8 @@ func (q *FakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams
25902593
copy(users, q.users)
25912594

25922595
// Database orders by username
2593-
slices.SortFunc(users, func(a, b database.User) bool {
2594-
return strings.ToLower(a.Username) < strings.ToLower(b.Username)
2596+
slices.SortFunc(users, func(a, b database.User) int {
2597+
return slice.Ascending(strings.ToLower(a.Username), strings.ToLower(b.Username))
25952598
})
25962599

25972600
// Filter out deleted since they should never be returned..
@@ -2799,14 +2802,14 @@ func (q *FakeQuerier) GetWorkspaceAgentStats(_ context.Context, createdAfter tim
27992802

28002803
agentStatsCreatedAfter := make([]database.WorkspaceAgentStat, 0)
28012804
for _, agentStat := range q.workspaceAgentStats {
2802-
if agentStat.CreatedAt.After(createdAfter) {
2805+
if agentStat.CreatedAt.After(createdAfter) || agentStat.CreatedAt.Equal(createdAfter) {
28032806
agentStatsCreatedAfter = append(agentStatsCreatedAfter, agentStat)
28042807
}
28052808
}
28062809

28072810
latestAgentStats := map[uuid.UUID]database.WorkspaceAgentStat{}
28082811
for _, agentStat := range q.workspaceAgentStats {
2809-
if agentStat.CreatedAt.After(createdAfter) {
2812+
if agentStat.CreatedAt.After(createdAfter) || agentStat.CreatedAt.Equal(createdAfter) {
28102813
latestAgentStats[agentStat.AgentID] = agentStat
28112814
}
28122815
}
@@ -3132,9 +3135,8 @@ func (q *FakeQuerier) GetWorkspaceBuildsByWorkspaceID(_ context.Context,
31323135
}
31333136

31343137
// Order by build_number
3135-
slices.SortFunc(history, func(a, b database.WorkspaceBuild) bool {
3136-
// use greater than since we want descending order
3137-
return a.BuildNumber > b.BuildNumber
3138+
slices.SortFunc(history, func(a, b database.WorkspaceBuild) int {
3139+
return slice.Descending(a.BuildNumber, b.BuildNumber)
31383140
})
31393141

31403142
if params.AfterID != uuid.Nil {
@@ -3533,8 +3535,14 @@ func (q *FakeQuerier) InsertAuditLog(_ context.Context, arg database.InsertAudit
35333535
alog := database.AuditLog(arg)
35343536

35353537
q.auditLogs = append(q.auditLogs, alog)
3536-
slices.SortFunc(q.auditLogs, func(a, b database.AuditLog) bool {
3537-
return a.Time.Before(b.Time)
3538+
slices.SortFunc(q.auditLogs, func(a, b database.AuditLog) int {
3539+
if a.Time.Before(b.Time) {
3540+
return -1
3541+
} else if a.Time.Equal(b.Time) {
3542+
return 0
3543+
} else {
3544+
return 1
3545+
}
35383546
})
35393547

35403548
return alog, nil
@@ -5588,11 +5596,11 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
55885596
templates = append(templates, template)
55895597
}
55905598
if len(templates) > 0 {
5591-
slices.SortFunc(templates, func(i, j database.Template) bool {
5592-
if i.Name != j.Name {
5593-
return i.Name < j.Name
5599+
slices.SortFunc(templates, func(a, b database.Template) int {
5600+
if a.Name != b.Name {
5601+
return slice.Ascending(a.Name, b.Name)
55945602
}
5595-
return i.ID.String() < j.ID.String()
5603+
return slice.Ascending(a.ID.String(), b.ID.String())
55965604
})
55975605
return templates, nil
55985606
}

‎coderd/devtunnel/servers.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"golang.org/x/sync/errgroup"
1111
"golang.org/x/xerrors"
1212

13+
"github.com/coder/coder/coderd/util/slice"
1314
"github.com/coder/coder/cryptorand"
1415
)
1516

@@ -115,8 +116,8 @@ func FindClosestNode(nodes []Node) (Node, error) {
115116
return Node{}, err
116117
}
117118

118-
slices.SortFunc(nodes, func(i, j Node) bool {
119-
return i.AvgLatency < j.AvgLatency
119+
slices.SortFunc(nodes, func(a, b Node) int {
120+
return slice.Ascending(a.AvgLatency, b.AvgLatency)
120121
})
121122
return nodes[0], nil
122123
}

‎coderd/healthcheck/derp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func (r *DERPReport) Run(ctx context.Context, opts *DERPReportOptions) {
118118
mu.Unlock()
119119
}
120120
nc := &netcheck.Client{
121-
PortMapper: portmapper.NewClient(tslogger.WithPrefix(ncLogf, "portmap: "), nil),
121+
PortMapper: portmapper.NewClient(tslogger.WithPrefix(ncLogf, "portmap: "), nil, nil, nil),
122122
Logf: tslogger.WithPrefix(ncLogf, "netcheck: "),
123123
}
124124
ncReport, netcheckErr := nc.GetReport(ctx, opts.DERPMap)

‎coderd/insights.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/coder/coder/coderd/database/db2sdk"
1515
"github.com/coder/coder/coderd/httpapi"
1616
"github.com/coder/coder/coderd/rbac"
17+
"github.com/coder/coder/coderd/util/slice"
1718
"github.com/coder/coder/codersdk"
1819
)
1920

@@ -131,8 +132,8 @@ func (api *API) insightsUserLatency(rw http.ResponseWriter, r *http.Request) {
131132
for templateID := range templateIDSet {
132133
seenTemplateIDs = append(seenTemplateIDs, templateID)
133134
}
134-
slices.SortFunc(seenTemplateIDs, func(a, b uuid.UUID) bool {
135-
return a.String() < b.String()
135+
slices.SortFunc(seenTemplateIDs, func(a, b uuid.UUID) int {
136+
return slice.Ascending(a.String(), b.String())
136137
})
137138

138139
resp := codersdk.UserLatencyInsightsResponse{

‎coderd/metricscache/metricscache.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,14 @@ func convertDAUResponse[T dauRow](rows []T, tzOffset int) codersdk.DAUsResponse
146146
}
147147

148148
dates := maps.Keys(respMap)
149-
slices.SortFunc(dates, func(a, b time.Time) bool {
150-
return a.Before(b)
149+
slices.SortFunc(dates, func(a, b time.Time) int {
150+
if a.Before(b) {
151+
return -1
152+
} else if a.Equal(b) {
153+
return 0
154+
} else {
155+
return 1
156+
}
151157
})
152158

153159
var resp codersdk.DAUsResponse

0 commit comments

Comments
 (0)