Skip to content

Commit 55e6100

Browse files
mtojekmtojek
committed
Merge branch 'main' into 10712-api-health-settings-dismissed
2 parents 7f43838 + f431aa5 commit 55e6100

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1439
-622
lines changed

‎.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ helm/**/templates/*.yaml
8282

8383
# Testdata shouldn't be formatted.
8484
scripts/apitypings/testdata/**/*.ts
85+
enterprise/tailnet/testdata/*.golden.html
8586

8687
# Generated files shouldn't be formatted.
8788
site/e2e/provisionerGenerated.ts

‎.prettierignore.include

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ helm/**/templates/*.yaml
88

99
# Testdata shouldn't be formatted.
1010
scripts/apitypings/testdata/**/*.ts
11+
enterprise/tailnet/testdata/*.golden.html
1112

1213
# Generated files shouldn't be formatted.
1314
site/e2e/provisionerGenerated.ts

‎Makefile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,15 @@ coderd/apidoc/swagger.json: $(shell find ./scripts/apidocgen $(FIND_EXCLUSIONS)
595595
./scripts/apidocgen/generate.sh
596596
pnpm run format:write:only ./docs/api ./docs/manifest.json ./coderd/apidoc/swagger.json
597597

598-
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 provisioner/terraform/testdata/.gen-golden
598+
update-golden-files: \
599+
cli/testdata/.gen-golden \
600+
helm/coder/tests/testdata/.gen-golden \
601+
helm/provisioner/tests/testdata/.gen-golden \
602+
scripts/ci-report/testdata/.gen-golden \
603+
enterprise/cli/testdata/.gen-golden \
604+
enterprise/tailnet/testdata/.gen-golden \
605+
coderd/.gen-golden \
606+
provisioner/terraform/testdata/.gen-golden
599607
.PHONY: update-golden-files
600608

601609
cli/testdata/.gen-golden: $(wildcard cli/testdata/*.golden) $(wildcard cli/*.tpl) $(GO_SRC_FILES) $(wildcard cli/*_test.go)
@@ -606,6 +614,10 @@ enterprise/cli/testdata/.gen-golden: $(wildcard enterprise/cli/testdata/*.golden
606614
go test ./enterprise/cli -run="TestEnterpriseCommandHelp" -update
607615
touch "$@"
608616

617+
enterprise/tailnet/testdata/.gen-golden: $(wildcard enterprise/tailnet/testdata/*.golden.html) $(GO_SRC_FILES) $(wildcard enterprise/tailnet/*_test.go)
618+
go test ./enterprise/tailnet -run="TestDebugTemplate" -update
619+
touch "$@"
620+
609621
helm/coder/tests/testdata/.gen-golden: $(wildcard helm/coder/tests/testdata/*.yaml) $(wildcard helm/coder/tests/testdata/*.golden) $(GO_SRC_FILES) $(wildcard helm/coder/tests/*_test.go)
610622
go test ./helm/coder/tests -run=TestUpdateGoldenFiles -update
611623
touch "$@"

‎cli/agent_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestWorkspaceAgent(t *testing.T) {
3131

3232
client, db := coderdtest.NewWithDatabase(t, nil)
3333
user := coderdtest.CreateFirstUser(t, client)
34-
r := dbfake.NewWorkspaceBuilder(t, db).
34+
r := dbfake.Workspace(t, db).
3535
Seed(database.Workspace{
3636
OrganizationID: user.OrganizationID,
3737
OwnerID: user.UserID,
@@ -68,7 +68,7 @@ func TestWorkspaceAgent(t *testing.T) {
6868
AzureCertificates: certificates,
6969
})
7070
user := coderdtest.CreateFirstUser(t, client)
71-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
71+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
7272
OrganizationID: user.OrganizationID,
7373
OwnerID: user.UserID,
7474
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -105,7 +105,7 @@ func TestWorkspaceAgent(t *testing.T) {
105105
AWSCertificates: certificates,
106106
})
107107
user := coderdtest.CreateFirstUser(t, client)
108-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
108+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
109109
OrganizationID: user.OrganizationID,
110110
OwnerID: user.UserID,
111111
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -143,7 +143,7 @@ func TestWorkspaceAgent(t *testing.T) {
143143
})
144144
owner := coderdtest.CreateFirstUser(t, client)
145145
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
146-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
146+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
147147
OrganizationID: owner.OrganizationID,
148148
OwnerID: memberUser.ID,
149149
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -195,7 +195,7 @@ func TestWorkspaceAgent(t *testing.T) {
195195

196196
client, db := coderdtest.NewWithDatabase(t, nil)
197197
user := coderdtest.CreateFirstUser(t, client)
198-
r := dbfake.NewWorkspaceBuilder(t, db).
198+
r := dbfake.Workspace(t, db).
199199
Seed(database.Workspace{
200200
OrganizationID: user.OrganizationID,
201201
OwnerID: user.UserID,

‎cli/configssh_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestConfigSSH(t *testing.T) {
7777
})
7878
owner := coderdtest.CreateFirstUser(t, client)
7979
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
80-
r := dbfake.NewWorkspaceBuilder(t, db).
80+
r := dbfake.Workspace(t, db).
8181
Seed(database.Workspace{
8282
OrganizationID: owner.OrganizationID,
8383
OwnerID: memberUser.ID,
@@ -575,7 +575,7 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
575575
client, db := coderdtest.NewWithDatabase(t, nil)
576576
user := coderdtest.CreateFirstUser(t, client)
577577
if tt.hasAgent {
578-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
578+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
579579
OrganizationID: user.OrganizationID,
580580
OwnerID: user.UserID,
581581
}).WithAgent().Do()
@@ -695,11 +695,11 @@ func TestConfigSSH_Hostnames(t *testing.T) {
695695
owner := coderdtest.CreateFirstUser(t, client)
696696
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
697697

698-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
698+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
699699
OrganizationID: owner.OrganizationID,
700700
OwnerID: memberUser.ID,
701701
}).Do()
702-
dbfake.NewWorkspaceBuildBuilder(t, db, r.Workspace).Resource(resources...).Do()
702+
dbfake.WorkspaceBuild(t, db, r.Workspace).Resource(resources...).Do()
703703
sshConfigFile := sshConfigFileName(t)
704704

705705
inv, root := clitest.New(t, "config-ssh", "--ssh-config-file", sshConfigFile)

‎cli/gitssh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*agentsdk.Client, str
4848
require.NoError(t, err)
4949

5050
// setup template
51-
r := dbfake.NewWorkspaceBuilder(t, db).
51+
r := dbfake.Workspace(t, db).
5252
Seed(database.Workspace{
5353
OrganizationID: user.OrganizationID,
5454
OwnerID: user.UserID,

‎cli/list_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestList(t *testing.T) {
2525
client, db := coderdtest.NewWithDatabase(t, nil)
2626
owner := coderdtest.CreateFirstUser(t, client)
2727
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
28-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
28+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
2929
OrganizationID: owner.OrganizationID,
3030
OwnerID: memberUser.ID,
3131
}).WithAgent().Do()
@@ -52,7 +52,7 @@ func TestList(t *testing.T) {
5252
client, db := coderdtest.NewWithDatabase(t, nil)
5353
owner := coderdtest.CreateFirstUser(t, client)
5454
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
55-
dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
55+
dbfake.Workspace(t, db).Seed(database.Workspace{
5656
OrganizationID: owner.OrganizationID,
5757
OwnerID: memberUser.ID,
5858
}).WithAgent().Do()

‎cli/portforward_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ func runAgent(t *testing.T, client *codersdk.Client, owner uuid.UUID, db databas
305305
require.NoError(t, err, "specified user does not exist")
306306
require.Greater(t, len(user.OrganizationIDs), 0, "user has no organizations")
307307
orgID := user.OrganizationIDs[0]
308-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
308+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
309309
OrganizationID: orgID,
310310
OwnerID: owner,
311311
}).WithAgent().Do()

‎cli/schedule_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@ func setupTestSchedule(t *testing.T, sched *cron.Schedule) (ownerClient, memberC
3838
memberClient, memberUser := coderdtest.CreateAnotherUserMutators(t, ownerClient, owner.OrganizationID, nil, func(r *codersdk.CreateUserRequest) {
3939
r.Username = "testuser2" // ensure deterministic ordering
4040
})
41-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
41+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
4242
Name: "a-owner",
4343
OwnerID: owner.UserID,
4444
OrganizationID: owner.OrganizationID,
4545
AutostartSchedule: sql.NullString{String: sched.String(), Valid: true},
4646
Ttl: sql.NullInt64{Int64: 8 * time.Hour.Nanoseconds(), Valid: true},
4747
}).WithAgent().Do()
48-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
48+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
4949
Name: "b-owner",
5050
OwnerID: owner.UserID,
5151
OrganizationID: owner.OrganizationID,
5252
AutostartSchedule: sql.NullString{String: sched.String(), Valid: true},
5353
}).WithAgent().Do()
54-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
54+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
5555
Name: "c-member",
5656
OwnerID: memberUser.ID,
5757
OrganizationID: owner.OrganizationID,
5858
Ttl: sql.NullInt64{Int64: 8 * time.Hour.Nanoseconds(), Valid: true},
5959
}).WithAgent().Do()
60-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
60+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
6161
Name: "d-member",
6262
OwnerID: memberUser.ID,
6363
OrganizationID: owner.OrganizationID,

‎cli/ssh_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func setupWorkspaceForAgent(t *testing.T, mutations ...func([]*proto.Agent) []*p
5252
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
5353
first := coderdtest.CreateFirstUser(t, client)
5454
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
55-
r := dbfake.NewWorkspaceBuilder(t, store).
55+
r := dbfake.Workspace(t, store).
5656
Seed(database.Workspace{
5757
OrganizationID: first.OrganizationID,
5858
OwnerID: user.ID,
@@ -130,7 +130,7 @@ func TestSSH(t *testing.T) {
130130
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
131131
first := coderdtest.CreateFirstUser(t, client)
132132
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
133-
r := dbfake.NewWorkspaceBuilder(t, store).Seed(database.Workspace{
133+
r := dbfake.Workspace(t, store).Seed(database.Workspace{
134134
OrganizationID: first.OrganizationID,
135135
OwnerID: user.ID,
136136
}).WithAgent().Do()
@@ -154,7 +154,7 @@ func TestSSH(t *testing.T) {
154154
pty.WriteLine("echo hell'o'")
155155
pty.ExpectMatchContext(ctx, "hello")
156156

157-
_ = dbfake.NewWorkspaceBuildBuilder(t, store, r.Workspace).
157+
_ = dbfake.WorkspaceBuild(t, store, r.Workspace).
158158
Seed(database.WorkspaceBuild{
159159
Transition: database.WorkspaceTransitionStop,
160160
BuildNumber: 2,
@@ -469,7 +469,7 @@ func TestSSH(t *testing.T) {
469469
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
470470
first := coderdtest.CreateFirstUser(t, client)
471471
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
472-
r := dbfake.NewWorkspaceBuilder(t, store).Seed(database.Workspace{
472+
r := dbfake.Workspace(t, store).Seed(database.Workspace{
473473
OrganizationID: first.OrganizationID,
474474
OwnerID: user.ID,
475475
}).WithAgent().Do()
@@ -523,7 +523,7 @@ func TestSSH(t *testing.T) {
523523
err = session.Shell()
524524
require.NoError(t, err)
525525

526-
_ = dbfake.NewWorkspaceBuildBuilder(t, store, r.Workspace).
526+
_ = dbfake.WorkspaceBuild(t, store, r.Workspace).
527527
Seed(database.WorkspaceBuild{
528528
Transition: database.WorkspaceTransitionStop,
529529
BuildNumber: 2,

‎coderd/activitybump_internal_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func Test_ActivityBumpWorkspace(t *testing.T) {
258258
expectedDeadlineStart := start.Add(tt.expectedBump).Add(time.Minute * -1)
259259
expectedDeadlineEnd := end.Add(tt.expectedBump).Add(time.Minute)
260260
require.GreaterOrEqual(t, updatedBuild.Deadline, expectedDeadlineStart, "new deadline should be greater than or equal to start")
261-
require.LessOrEqual(t, updatedBuild.Deadline, expectedDeadlineEnd, "new deadline should be lesser than or equal to end")
261+
require.LessOrEqual(t, updatedBuild.Deadline, expectedDeadlineEnd, "new deadline should be less than or equal to end")
262262
})
263263
}
264264
}

‎coderd/apidoc/docs.go

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

‎coderd/apidoc/swagger.json

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

‎coderd/audit/diff.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ type Auditable interface {
1818
database.AuditableGroup |
1919
database.License |
2020
database.WorkspaceProxy |
21-
database.AuditOAuthConvertState
21+
database.AuditOAuthConvertState |
22+
database.HealthSettings
2223
}
2324

2425
// Map is a map of changed fields in an audited resource. It maps field names to

‎coderd/audit/request.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ func ResourceTarget[T Auditable](tgt T) string {
9393
return typed.Name
9494
case database.AuditOAuthConvertState:
9595
return string(typed.ToLoginType)
96+
case database.HealthSettings:
97+
return "" // no target?
9698
default:
9799
panic(fmt.Sprintf("unknown resource %T", tgt))
98100
}
@@ -123,6 +125,9 @@ func ResourceID[T Auditable](tgt T) uuid.UUID {
123125
case database.AuditOAuthConvertState:
124126
// The merge state is for the given user
125127
return typed.UserID
128+
case database.HealthSettings:
129+
// Artificial ID for auditing purposes
130+
return typed.ID
126131
default:
127132
panic(fmt.Sprintf("unknown resource %T", tgt))
128133
}
@@ -152,6 +157,8 @@ func ResourceType[T Auditable](tgt T) database.ResourceType {
152157
return database.ResourceTypeWorkspaceProxy
153158
case database.AuditOAuthConvertState:
154159
return database.ResourceTypeConvertLogin
160+
case database.HealthSettings:
161+
return database.ResourceTypeHealthSettings
155162
default:
156163
panic(fmt.Sprintf("unknown resource %T", typed))
157164
}

0 commit comments

Comments
 (0)