Skip to content

Commit 2805dda

Browse files
spikecurtisspikecurtis
committed
Merge branch 'main' of https://github.com/coder/coder into spike/9165-provisioner-filesystem
2 parents 96e1e64 + 04d5e3f commit 2805dda

20 files changed

+2028
-454
lines changed

‎Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ coderd/apidoc/swagger.json: $(shell find ./scripts/apidocgen $(FIND_EXCLUSIONS)
564564
./scripts/apidocgen/generate.sh
565565
pnpm run format:write:only ./docs/api ./docs/manifest.json ./coderd/apidoc/swagger.json
566566

567-
update-golden-files: cli/testdata/.gen-golden helm/coder/tests/testdata/.gen-golden helm/provisioner/tests/testdata/.gen-golden scripts/ci-report/testdata/.gen-golden enterprise/cli/testdata/.gen-golden
567+
update-golden-files: cli/testdata/.gen-golden helm/coder/tests/testdata/.gen-golden helm/provisioner/tests/testdata/.gen-golden scripts/ci-report/testdata/.gen-golden enterprise/cli/testdata/.gen-golden coderd/.gen-golden
568568
.PHONY: update-golden-files
569569

570570
cli/testdata/.gen-golden: $(wildcard cli/testdata/*.golden) $(wildcard cli/*.tpl) $(GO_SRC_FILES) $(wildcard cli/*_test.go)
@@ -583,6 +583,10 @@ helm/provisioner/tests/testdata/.gen-golden: $(wildcard helm/provisioner/tests/t
583583
go test ./helm/provisioner/tests -run=TestUpdateGoldenFiles -update
584584
touch "$@"
585585

586+
coderd/.gen-golden: $(wildcard coderd/testdata/*/*.golden) $(GO_SRC_FILES) $(wildcard coderd/*_test.go)
587+
go test ./coderd -run="Test.*Golden$$" -update
588+
touch "$@"
589+
586590
scripts/ci-report/testdata/.gen-golden: $(wildcard scripts/ci-report/testdata/*) $(wildcard scripts/ci-report/*.go)
587591
go test ./scripts/ci-report -run=TestOutputMatchesGoldenFile -update
588592
touch "$@"

‎coderd/coderd_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package coderd_test
22

33
import (
44
"context"
5+
"flag"
56
"io"
67
"net/http"
78
"net/netip"
@@ -23,6 +24,9 @@ import (
2324
"github.com/coder/coder/v2/testutil"
2425
)
2526

27+
// updateGoldenFiles is a flag that can be set to update golden files.
28+
var updateGoldenFiles = flag.Bool("update", false, "Update golden files")
29+
2630
func TestMain(m *testing.M) {
2731
goleak.VerifyTestMain(m)
2832
}

‎coderd/database/db2sdk/db2sdk.go

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package db2sdk
33

44
import (
55
"encoding/json"
6-
"sort"
6+
"strings"
77

88
"github.com/google/uuid"
9+
"golang.org/x/exp/slices"
910

1011
"github.com/coder/coder/v2/coderd/database"
1112
"github.com/coder/coder/v2/coderd/parameter"
@@ -125,9 +126,34 @@ func Role(role rbac.Role) codersdk.Role {
125126
}
126127

127128
func TemplateInsightsParameters(parameterRows []database.GetTemplateParameterInsightsRow) ([]codersdk.TemplateParameterUsage, error) {
128-
parametersByNum := make(map[int64]*codersdk.TemplateParameterUsage)
129+
// Use a stable sort, similarly to how we would sort in the query, note that
130+
// we don't sort in the query because order varies depending on the table
131+
// collation.
132+
//
133+
// ORDER BY utp.name, utp.type, utp.display_name, utp.description, utp.options, wbp.value
134+
slices.SortFunc(parameterRows, func(a, b database.GetTemplateParameterInsightsRow) int {
135+
if a.Name != b.Name {
136+
return strings.Compare(a.Name, b.Name)
137+
}
138+
if a.Type != b.Type {
139+
return strings.Compare(a.Type, b.Type)
140+
}
141+
if a.DisplayName != b.DisplayName {
142+
return strings.Compare(a.DisplayName, b.DisplayName)
143+
}
144+
if a.Description != b.Description {
145+
return strings.Compare(a.Description, b.Description)
146+
}
147+
if string(a.Options) != string(b.Options) {
148+
return strings.Compare(string(a.Options), string(b.Options))
149+
}
150+
return strings.Compare(a.Value, b.Value)
151+
})
152+
153+
parametersUsage := []codersdk.TemplateParameterUsage{}
154+
indexByNum := make(map[int64]int)
129155
for _, param := range parameterRows {
130-
if _, ok := parametersByNum[param.Num]; !ok {
156+
if _, ok := indexByNum[param.Num]; !ok {
131157
var opts []codersdk.TemplateVersionParameterOption
132158
err := json.Unmarshal(param.Options, &opts)
133159
if err != nil {
@@ -139,28 +165,24 @@ func TemplateInsightsParameters(parameterRows []database.GetTemplateParameterIns
139165
return nil, err
140166
}
141167

142-
parametersByNum[param.Num] = &codersdk.TemplateParameterUsage{
168+
parametersUsage = append(parametersUsage, codersdk.TemplateParameterUsage{
143169
TemplateIDs: param.TemplateIDs,
144170
Name: param.Name,
145171
Type: param.Type,
146172
DisplayName: param.DisplayName,
147173
Description: plaintextDescription,
148174
Options: opts,
149-
}
175+
})
176+
indexByNum[param.Num] = len(parametersUsage) - 1
150177
}
151-
parametersByNum[param.Num].Values = append(parametersByNum[param.Num].Values, codersdk.TemplateParameterValue{
178+
179+
i := indexByNum[param.Num]
180+
parametersUsage[i].Values = append(parametersUsage[i].Values, codersdk.TemplateParameterValue{
152181
Value: param.Value,
153182
Count: param.Count,
154183
})
155184
}
156-
parametersUsage := []codersdk.TemplateParameterUsage{}
157-
for _, param := range parametersByNum {
158-
parametersUsage = append(parametersUsage, *param)
159-
}
160185

161-
sort.Slice(parametersUsage, func(i, j int) bool {
162-
return parametersUsage[i].Name < parametersUsage[j].Name
163-
})
164186
return parametersUsage, nil
165187
}
166188

‎coderd/database/dbfake/dbfake.go

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2018,6 +2018,10 @@ func (q *FakeQuerier) GetTemplateAppInsights(ctx context.Context, arg database.G
20182018
return nil, err
20192019
}
20202020

2021+
if len(arg.TemplateIDs) > 0 && !slices.Contains(arg.TemplateIDs, w.TemplateID) {
2022+
continue
2023+
}
2024+
20212025
app, _ := q.getWorkspaceAppByAgentIDAndSlugNoLock(ctx, database.GetWorkspaceAppByAgentIDAndSlugParams{
20222026
AgentID: s.AgentID,
20232027
Slug: s.SlugOrPort,
@@ -2095,6 +2099,8 @@ func (q *FakeQuerier) GetTemplateAppInsights(ctx context.Context, arg database.G
20952099
})
20962100
}
20972101

2102+
// NOTE(mafredri): Add sorting if we decide on how to handle PostgreSQL collations.
2103+
// ORDER BY access_method, slug_or_port, display_name, icon, is_app
20982104
return rows, nil
20992105
}
21002106

@@ -2264,38 +2270,31 @@ func (q *FakeQuerier) GetTemplateDailyInsights(ctx context.Context, arg database
22642270
}
22652271
ds.userSet[s.UserID] = struct{}{}
22662272
ds.templateIDSet[s.TemplateID] = struct{}{}
2267-
break
22682273
}
22692274
}
22702275

22712276
for _, s := range q.workspaceAppStats {
2272-
// (was.session_started_at >= ts.from_ AND was.session_started_at < ts.to_)
2273-
// OR (was.session_ended_at > ts.from_ AND was.session_ended_at < ts.to_)
2274-
// OR (was.session_started_at < ts.from_ AND was.session_ended_at >= ts.to_)
2275-
if !(((s.SessionStartedAt.After(arg.StartTime) || s.SessionStartedAt.Equal(arg.StartTime)) && s.SessionStartedAt.Before(arg.EndTime)) ||
2276-
(s.SessionEndedAt.After(arg.StartTime) && s.SessionEndedAt.Before(arg.EndTime)) ||
2277-
(s.SessionStartedAt.Before(arg.StartTime) && (s.SessionEndedAt.After(arg.EndTime) || s.SessionEndedAt.Equal(arg.EndTime)))) {
2277+
w, err := q.getWorkspaceByIDNoLock(ctx, s.WorkspaceID)
2278+
if err != nil {
2279+
return nil, err
2280+
}
2281+
2282+
if len(arg.TemplateIDs) > 0 && !slices.Contains(arg.TemplateIDs, w.TemplateID) {
22782283
continue
22792284
}
22802285

22812286
for _, ds := range dailyStats {
22822287
// (was.session_started_at >= ts.from_ AND was.session_started_at < ts.to_)
22832288
// OR (was.session_ended_at > ts.from_ AND was.session_ended_at < ts.to_)
22842289
// OR (was.session_started_at < ts.from_ AND was.session_ended_at >= ts.to_)
2285-
if !(((s.SessionStartedAt.After(arg.StartTime) || s.SessionStartedAt.Equal(arg.StartTime)) && s.SessionStartedAt.Before(arg.EndTime)) ||
2286-
(s.SessionEndedAt.After(arg.StartTime) && s.SessionEndedAt.Before(arg.EndTime)) ||
2287-
(s.SessionStartedAt.Before(arg.StartTime) && (s.SessionEndedAt.After(arg.EndTime) || s.SessionEndedAt.Equal(arg.EndTime)))) {
2290+
if !(((s.SessionStartedAt.After(ds.startTime) || s.SessionStartedAt.Equal(ds.startTime)) && s.SessionStartedAt.Before(ds.endTime)) ||
2291+
(s.SessionEndedAt.After(ds.startTime) && s.SessionEndedAt.Before(ds.endTime)) ||
2292+
(s.SessionStartedAt.Before(ds.startTime) && (s.SessionEndedAt.After(ds.endTime) || s.SessionEndedAt.Equal(ds.endTime)))) {
22882293
continue
22892294
}
22902295

2291-
w, err := q.getWorkspaceByIDNoLock(ctx, s.WorkspaceID)
2292-
if err != nil {
2293-
return nil, err
2294-
}
2295-
22962296
ds.userSet[s.UserID] = struct{}{}
22972297
ds.templateIDSet[w.TemplateID] = struct{}{}
2298-
break
22992298
}
23002299
}
23012300

@@ -2341,22 +2340,22 @@ func (q *FakeQuerier) GetTemplateInsights(_ context.Context, arg database.GetTem
23412340
if appUsageIntervalsByUser[s.UserID] == nil {
23422341
appUsageIntervalsByUser[s.UserID] = make(map[time.Time]*database.GetTemplateInsightsRow)
23432342
}
2344-
t := s.CreatedAt.Truncate(5 * time.Minute)
2343+
t := s.CreatedAt.Truncate(time.Minute)
23452344
if _, ok := appUsageIntervalsByUser[s.UserID][t]; !ok {
23462345
appUsageIntervalsByUser[s.UserID][t] = &database.GetTemplateInsightsRow{}
23472346
}
23482347

23492348
if s.SessionCountJetBrains > 0 {
2350-
appUsageIntervalsByUser[s.UserID][t].UsageJetbrainsSeconds = 300
2349+
appUsageIntervalsByUser[s.UserID][t].UsageJetbrainsSeconds = 60
23512350
}
23522351
if s.SessionCountVSCode > 0 {
2353-
appUsageIntervalsByUser[s.UserID][t].UsageVscodeSeconds = 300
2352+
appUsageIntervalsByUser[s.UserID][t].UsageVscodeSeconds = 60
23542353
}
23552354
if s.SessionCountReconnectingPTY > 0 {
2356-
appUsageIntervalsByUser[s.UserID][t].UsageReconnectingPtySeconds = 300
2355+
appUsageIntervalsByUser[s.UserID][t].UsageReconnectingPtySeconds = 60
23572356
}
23582357
if s.SessionCountSSH > 0 {
2359-
appUsageIntervalsByUser[s.UserID][t].UsageSshSeconds = 300
2358+
appUsageIntervalsByUser[s.UserID][t].UsageSshSeconds = 60
23602359
}
23612360
}
23622361

@@ -2430,7 +2429,8 @@ func (q *FakeQuerier) GetTemplateParameterInsights(ctx context.Context, arg data
24302429
if tvp.TemplateVersionID != tv.ID {
24312430
continue
24322431
}
2433-
key := fmt.Sprintf("%s:%s:%s:%s", tvp.Name, tvp.DisplayName, tvp.Description, tvp.Options)
2432+
// GROUP BY tvp.name, tvp.type, tvp.display_name, tvp.description, tvp.options
2433+
key := fmt.Sprintf("%s:%s:%s:%s:%s", tvp.Name, tvp.Type, tvp.DisplayName, tvp.Description, tvp.Options)
24342434
if _, ok := uniqueTemplateParams[key]; !ok {
24352435
num++
24362436
uniqueTemplateParams[key] = &database.GetTemplateParameterInsightsRow{
@@ -2480,6 +2480,8 @@ func (q *FakeQuerier) GetTemplateParameterInsights(ctx context.Context, arg data
24802480
}
24812481
}
24822482

2483+
// NOTE(mafredri): Add sorting if we decide on how to handle PostgreSQL collations.
2484+
// ORDER BY utp.name, utp.type, utp.display_name, utp.description, utp.options, wbp.value
24832485
return rows, nil
24842486
}
24852487

‎coderd/database/queries.sql.go

Lines changed: 15 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)