Skip to content

chore: Allow editing proxy fields via api. #7435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 9, 2023
Merged

chore: Allow editing proxy fields via api. #7435

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
94e38e8
chore: Add ability to update workspace proxy fields
Emyrk May 4, 2023
fe66e57
Add unit test
Emyrk May 4, 2023
28deaca
Audit log proxy registers
Emyrk May 5, 2023
ded5685
Comment why the audit log does not work
Emyrk May 5, 2023
ae5c41e
Add proxy edit cli cmd
Emyrk May 5, 2023
0115053
Make gen fmt lint
Emyrk May 5, 2023
c2c12ae
Comment out audit logs that do nothing
Emyrk May 5, 2023
8f38d52
Share formatter for similar commands
Emyrk May 5, 2023
eaeaae5
fixup! Share formatter for similar commands
Emyrk May 5, 2023
529d465
Fix text
Emyrk May 5, 2023
77ea25b
Merge remote-tracking branch 'origin/main' into stevenmasley/edit_proxy
Emyrk May 5, 2023
4865ff8
Return the right error
Emyrk May 5, 2023
a63c903
Fmt
Emyrk May 5, 2023
7ceb7a5
Fix swagger tags
Emyrk May 5, 2023
41ca95f
Fmt
Emyrk May 8, 2023
c0de34a
Make gen
Emyrk May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Comment why the audit log does not work
  • Loading branch information
@Emyrk
Emyrk committed May 5, 2023
commit ded5685ea00384b3e24e8c47c5590b2cb822c2f7
4 changes: 2 additions & 2 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codersdk/workspaceproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type ProxyHealthReport struct {
type WorkspaceProxy struct {
ID uuid.UUID `json:"id" format:"uuid" table:"id"`
Name string `json:"name" table:"name,default_sort"`
DisplayName string `json:"display_name" table:"display_name""`
DisplayName string `json:"display_name" table:"display_name"`
Icon string `json:"icon" table:"icon"`
// Full url including scheme of the proxy api url: https://us.example.com
URL string `json:"url" table:"url"`
Expand Down
9 changes: 6 additions & 3 deletions enterprise/coderd/workspaceproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,12 @@ func (api *API) workspaceProxyIssueSignedAppToken(rw http.ResponseWriter, r *htt
// @x-apidocgen {"skip": true}
func (api *API) workspaceProxyRegister(rw http.ResponseWriter, r *http.Request) {
var (
ctx = r.Context()
proxy = httpmw.WorkspaceProxy(r)
auditor = api.AGPL.Auditor.Load()
ctx = r.Context()
proxy = httpmw.WorkspaceProxy(r)
auditor = api.AGPL.Auditor.Load()
// TODO: This audit log does not work because it has no user id
// associated with it. The audit log commitAudit() function ignores
// the audit log if there is no user id.
aReq, commitAudit = audit.InitRequest[database.WorkspaceProxy](rw, &audit.RequestParams{
Audit: *auditor,
Log: api.Logger,
Expand Down