Skip to content

Commit 00c073f

Browse files
Kira-PilotKira-Pilot
committed
pass throough AdditionalFields and fix tests
1 parent 2caba31 commit 00c073f

File tree

9 files changed

+107
-82
lines changed

9 files changed

+107
-82
lines changed

‎coderd/gitsshkey.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package coderd
22

33
import (
4+
"encoding/json"
45
"net/http"
56

67
"github.com/coder/coder/coderd/audit"
@@ -18,10 +19,11 @@ func (api *API) regenerateGitSSHKey(rw http.ResponseWriter, r *http.Request) {
1819
user = httpmw.UserParam(r)
1920
auditor = api.Auditor.Load()
2021
aReq, commitAudit = audit.InitRequest[database.GitSSHKey](rw, &audit.RequestParams{
21-
Audit: *auditor,
22-
Log: api.Logger,
23-
Request: r,
24-
Action: database.AuditActionWrite,
22+
Audit: *auditor,
23+
Log: api.Logger,
24+
Request: r,
25+
Action: database.AuditActionWrite,
26+
AdditionalFields: json.RawMessage("{}"),
2527
})
2628
)
2729
defer commitAudit()

‎coderd/templates.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"crypto/sha256"
66
"database/sql"
77
"encoding/hex"
8+
"encoding/json"
89
"errors"
910
"fmt"
1011
"net/http"
@@ -84,10 +85,11 @@ func (api *API) deleteTemplate(rw http.ResponseWriter, r *http.Request) {
8485
template = httpmw.TemplateParam(r)
8586
auditor = *api.Auditor.Load()
8687
aReq, commitAudit = audit.InitRequest[database.Template](rw, &audit.RequestParams{
87-
Audit: auditor,
88-
Log: api.Logger,
89-
Request: r,
90-
Action: database.AuditActionDelete,
88+
Audit: auditor,
89+
Log: api.Logger,
90+
Request: r,
91+
Action: database.AuditActionDelete,
92+
AdditionalFields: json.RawMessage("{}"),
9193
})
9294
)
9395
defer commitAudit()
@@ -444,10 +446,11 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
444446
template = httpmw.TemplateParam(r)
445447
auditor = *api.Auditor.Load()
446448
aReq, commitAudit = audit.InitRequest[database.Template](rw, &audit.RequestParams{
447-
Audit: auditor,
448-
Log: api.Logger,
449-
Request: r,
450-
Action: database.AuditActionWrite,
449+
Audit: auditor,
450+
Log: api.Logger,
451+
Request: r,
452+
Action: database.AuditActionWrite,
453+
AdditionalFields: json.RawMessage("{}"),
451454
})
452455
)
453456
defer commitAudit()

‎coderd/templateversions.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -599,10 +599,11 @@ func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Reque
599599
template = httpmw.TemplateParam(r)
600600
auditor = *api.Auditor.Load()
601601
aReq, commitAudit = audit.InitRequest[database.Template](rw, &audit.RequestParams{
602-
Audit: auditor,
603-
Log: api.Logger,
604-
Request: r,
605-
Action: database.AuditActionWrite,
602+
Audit: auditor,
603+
Log: api.Logger,
604+
Request: r,
605+
Action: database.AuditActionWrite,
606+
AdditionalFields: json.RawMessage("{}"),
606607
})
607608
)
608609
defer commitAudit()
@@ -673,10 +674,11 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
673674
organization = httpmw.OrganizationParam(r)
674675
auditor = *api.Auditor.Load()
675676
aReq, commitAudit = audit.InitRequest[database.TemplateVersion](rw, &audit.RequestParams{
676-
Audit: auditor,
677-
Log: api.Logger,
678-
Request: r,
679-
Action: database.AuditActionCreate,
677+
Audit: auditor,
678+
Log: api.Logger,
679+
Request: r,
680+
Action: database.AuditActionCreate,
681+
AdditionalFields: json.RawMessage("{}"),
680682
})
681683

682684
req codersdk.CreateTemplateVersionRequest

‎coderd/users.go

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bytes"
55
"context"
66
"database/sql"
7+
"encoding/json"
78
"errors"
89
"fmt"
910
"net/http"
@@ -256,10 +257,11 @@ func (api *API) postUser(rw http.ResponseWriter, r *http.Request) {
256257
ctx := r.Context()
257258
auditor := *api.Auditor.Load()
258259
aReq, commitAudit := audit.InitRequest[database.User](rw, &audit.RequestParams{
259-
Audit: auditor,
260-
Log: api.Logger,
261-
Request: r,
262-
Action: database.AuditActionCreate,
260+
Audit: auditor,
261+
Log: api.Logger,
262+
Request: r,
263+
Action: database.AuditActionCreate,
264+
AdditionalFields: json.RawMessage("{}"),
263265
})
264266
defer commitAudit()
265267

@@ -343,10 +345,11 @@ func (api *API) deleteUser(rw http.ResponseWriter, r *http.Request) {
343345
auditor := *api.Auditor.Load()
344346
user := httpmw.UserParam(r)
345347
aReq, commitAudit := audit.InitRequest[database.User](rw, &audit.RequestParams{
346-
Audit: auditor,
347-
Log: api.Logger,
348-
Request: r,
349-
Action: database.AuditActionDelete,
348+
Audit: auditor,
349+
Log: api.Logger,
350+
Request: r,
351+
Action: database.AuditActionDelete,
352+
AdditionalFields: json.RawMessage("{}"),
350353
})
351354
aReq.Old = user
352355
defer commitAudit()
@@ -420,10 +423,11 @@ func (api *API) putUserProfile(rw http.ResponseWriter, r *http.Request) {
420423
user = httpmw.UserParam(r)
421424
auditor = *api.Auditor.Load()
422425
aReq, commitAudit = audit.InitRequest[database.User](rw, &audit.RequestParams{
423-
Audit: auditor,
424-
Log: api.Logger,
425-
Request: r,
426-
Action: database.AuditActionWrite,
426+
Audit: auditor,
427+
Log: api.Logger,
428+
Request: r,
429+
Action: database.AuditActionWrite,
430+
AdditionalFields: json.RawMessage("{}"),
427431
})
428432
)
429433
defer commitAudit()
@@ -502,10 +506,11 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW
502506
apiKey = httpmw.APIKey(r)
503507
auditor = *api.Auditor.Load()
504508
aReq, commitAudit = audit.InitRequest[database.User](rw, &audit.RequestParams{
505-
Audit: auditor,
506-
Log: api.Logger,
507-
Request: r,
508-
Action: database.AuditActionWrite,
509+
Audit: auditor,
510+
Log: api.Logger,
511+
Request: r,
512+
Action: database.AuditActionWrite,
513+
AdditionalFields: json.RawMessage("{}"),
509514
})
510515
)
511516
defer commitAudit()
@@ -570,10 +575,11 @@ func (api *API) putUserPassword(rw http.ResponseWriter, r *http.Request) {
570575
params codersdk.UpdateUserPasswordRequest
571576
auditor = *api.Auditor.Load()
572577
aReq, commitAudit = audit.InitRequest[database.User](rw, &audit.RequestParams{
573-
Audit: auditor,
574-
Log: api.Logger,
575-
Request: r,
576-
Action: database.AuditActionWrite,
578+
Audit: auditor,
579+
Log: api.Logger,
580+
Request: r,
581+
Action: database.AuditActionWrite,
582+
AdditionalFields: json.RawMessage("{}"),
577583
})
578584
)
579585
defer commitAudit()
@@ -732,10 +738,11 @@ func (api *API) putUserRoles(rw http.ResponseWriter, r *http.Request) {
732738
apiKey = httpmw.APIKey(r)
733739
auditor = *api.Auditor.Load()
734740
aReq, commitAudit = audit.InitRequest[database.User](rw, &audit.RequestParams{
735-
Audit: auditor,
736-
Log: api.Logger,
737-
Request: r,
738-
Action: database.AuditActionWrite,
741+
Audit: auditor,
742+
Log: api.Logger,
743+
Request: r,
744+
Action: database.AuditActionWrite,
745+
AdditionalFields: json.RawMessage("{}"),
739746
})
740747
)
741748
defer commitAudit()

‎coderd/workspacebuilds.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,11 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
284284
if action == rbac.ActionDelete {
285285
var (
286286
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
287-
Audit: *auditor,
288-
Log: api.Logger,
289-
Request: r,
290-
Action: database.AuditActionDelete,
287+
Audit: *auditor,
288+
Log: api.Logger,
289+
Request: r,
290+
Action: database.AuditActionDelete,
291+
AdditionalFields: json.RawMessage("{}"),
291292
})
292293
)
293294

‎coderd/workspacebuilds_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,6 @@ func TestWorkspaceBuildStatus(t *testing.T) {
579579
require.EqualValues(t, codersdk.WorkspaceStatusDeleted, workspace.LatestBuild.Status)
580580

581581
// assert an audit log has been created for deletion
582-
require.Len(t, auditor.AuditLogs, 5)
583-
assert.Equal(t, database.AuditActionDelete, auditor.AuditLogs[4].Action)
582+
require.Len(t, auditor.AuditLogs, 7)
583+
assert.Equal(t, database.AuditActionDelete, auditor.AuditLogs[6].Action)
584584
}

‎coderd/workspaces.go

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,11 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
282282
auditor = api.Auditor.Load()
283283
user = httpmw.UserParam(r)
284284
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
285-
Audit: *auditor,
286-
Log: api.Logger,
287-
Request: r,
288-
Action: database.AuditActionCreate,
285+
Audit: *auditor,
286+
Log: api.Logger,
287+
Request: r,
288+
Action: database.AuditActionCreate,
289+
AdditionalFields: json.RawMessage("{}"),
289290
})
290291
)
291292
defer commitAudit()
@@ -566,10 +567,11 @@ func (api *API) patchWorkspace(rw http.ResponseWriter, r *http.Request) {
566567
workspace = httpmw.WorkspaceParam(r)
567568
auditor = api.Auditor.Load()
568569
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
569-
Audit: *auditor,
570-
Log: api.Logger,
571-
Request: r,
572-
Action: database.AuditActionWrite,
570+
Audit: *auditor,
571+
Log: api.Logger,
572+
Request: r,
573+
Action: database.AuditActionWrite,
574+
AdditionalFields: json.RawMessage("{}"),
573575
})
574576
)
575577
defer commitAudit()
@@ -644,10 +646,11 @@ func (api *API) putWorkspaceAutostart(rw http.ResponseWriter, r *http.Request) {
644646
workspace = httpmw.WorkspaceParam(r)
645647
auditor = api.Auditor.Load()
646648
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
647-
Audit: *auditor,
648-
Log: api.Logger,
649-
Request: r,
650-
Action: database.AuditActionWrite,
649+
Audit: *auditor,
650+
Log: api.Logger,
651+
Request: r,
652+
Action: database.AuditActionWrite,
653+
AdditionalFields: json.RawMessage("{}"),
651654
})
652655
)
653656
defer commitAudit()
@@ -706,10 +709,11 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
706709
workspace = httpmw.WorkspaceParam(r)
707710
auditor = api.Auditor.Load()
708711
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
709-
Audit: *auditor,
710-
Log: api.Logger,
711-
Request: r,
712-
Action: database.AuditActionWrite,
712+
Audit: *auditor,
713+
Log: api.Logger,
714+
Request: r,
715+
Action: database.AuditActionWrite,
716+
AdditionalFields: json.RawMessage("{}"),
713717
})
714718
)
715719
defer commitAudit()

‎enterprise/coderd/groups.go

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package coderd
22

33
import (
44
"database/sql"
5+
"encoding/json"
56
"fmt"
67
"net/http"
78

@@ -23,10 +24,11 @@ func (api *API) postGroupByOrganization(rw http.ResponseWriter, r *http.Request)
2324
org = httpmw.OrganizationParam(r)
2425
auditor = api.AGPL.Auditor.Load()
2526
aReq, commitAudit = audit.InitRequest[database.Group](rw, &audit.RequestParams{
26-
Audit: *auditor,
27-
Log: api.Logger,
28-
Request: r,
29-
Action: database.AuditActionCreate,
27+
Audit: *auditor,
28+
Log: api.Logger,
29+
Request: r,
30+
Action: database.AuditActionCreate,
31+
AdditionalFields: json.RawMessage("{}"),
3032
})
3133
)
3234
defer commitAudit()
@@ -75,10 +77,11 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
7577
group = httpmw.GroupParam(r)
7678
auditor = api.AGPL.Auditor.Load()
7779
aReq, commitAudit = audit.InitRequest[database.Group](rw, &audit.RequestParams{
78-
Audit: *auditor,
79-
Log: api.Logger,
80-
Request: r,
81-
Action: database.AuditActionWrite,
80+
Audit: *auditor,
81+
Log: api.Logger,
82+
Request: r,
83+
Action: database.AuditActionWrite,
84+
AdditionalFields: json.RawMessage("{}"),
8285
})
8386
)
8487
defer commitAudit()
@@ -225,10 +228,11 @@ func (api *API) deleteGroup(rw http.ResponseWriter, r *http.Request) {
225228
group = httpmw.GroupParam(r)
226229
auditor = api.AGPL.Auditor.Load()
227230
aReq, commitAudit = audit.InitRequest[database.Group](rw, &audit.RequestParams{
228-
Audit: *auditor,
229-
Log: api.Logger,
230-
Request: r,
231-
Action: database.AuditActionDelete,
231+
Audit: *auditor,
232+
Log: api.Logger,
233+
Request: r,
234+
Action: database.AuditActionDelete,
235+
AdditionalFields: json.RawMessage("{}"),
232236
})
233237
)
234238
defer commitAudit()

‎enterprise/coderd/templates.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package coderd
33
import (
44
"context"
55
"database/sql"
6+
"encoding/json"
67
"fmt"
78
"net/http"
89

@@ -98,10 +99,11 @@ func (api *API) patchTemplateACL(rw http.ResponseWriter, r *http.Request) {
9899
template = httpmw.TemplateParam(r)
99100
auditor = api.AGPL.Auditor.Load()
100101
aReq, commitAudit = audit.InitRequest[database.Template](rw, &audit.RequestParams{
101-
Audit: *auditor,
102-
Log: api.Logger,
103-
Request: r,
104-
Action: database.AuditActionWrite,
102+
Audit: *auditor,
103+
Log: api.Logger,
104+
Request: r,
105+
Action: database.AuditActionWrite,
106+
AdditionalFields: json.RawMessage("{}"),
105107
})
106108
)
107109
defer commitAudit()

0 commit comments

Comments
 (0)