Skip to content

fix: duplicate workspace update entries #4513

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 6 commits into from
Oct 14, 2022
Merged

fix: duplicate workspace update entries #4513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20c6bfa
fix: duplicate workspace update entries
Kira-Pilot Oct 12, 2022
3778a42
remove console log
Kira-Pilot Oct 12, 2022
dce188c
Merge remote-tracking branch 'origin/main' into workspace-update-logs…
Kira-Pilot Oct 12, 2022
f344f0f
attempting to fix tests
Kira-Pilot Oct 12, 2022
e259eba
keep diffs with 0 changes
Kira-Pilot Oct 14, 2022
72728af
cleaned up test
Kira-Pilot Oct 14, 2022
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
8 changes: 6 additions & 2 deletions coderd/audit/audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ func (nop) Export(context.Context, database.AuditLog) error {
return nil
}

func (nop) diff(any, any) Map { return Map{} }
func (nop) diff(any, any) Map {
return Map{}
}

func NewMock() *MockAuditor {
return &MockAuditor{}
Expand All @@ -36,4 +38,6 @@ func (a *MockAuditor) Export(_ context.Context, alog database.AuditLog) error {
return nil
}

func (*MockAuditor) diff(any, any) Map { return Map{} }
func (*MockAuditor) diff(any, any) Map {
return Map{}
}
4 changes: 3 additions & 1 deletion site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ export const WorkspaceSchedulePage: React.FC = () => {
onSubmit={(values) => {
scheduleSend({
type: "SUBMIT_SCHEDULE",
autoStart: formValuesToAutoStartRequest(values),
autoStart: values.autoStartEnabled
? formValuesToAutoStartRequest(values)
: undefined,
ttl: formValuesToTTLRequest(values),
})
}}
Expand Down
8 changes: 7 additions & 1 deletion site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,13 @@ export const MockAuditLog: TypesGen.AuditLog = {
resource_target: "bruno-dev",
resource_icon: "",
action: "create",
diff: {},
diff: {
ttl: {
old: 0,
new: 3600000000000,
secret: false,
},
},
status_code: 200,
additional_fields: "",
description: "{user} updated workspace {target}",
Expand Down
9 changes: 4 additions & 5 deletions site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export type WorkspaceScheduleEvent =
| { type: "GET_WORKSPACE"; username: string; workspaceName: string }
| {
type: "SUBMIT_SCHEDULE"
autoStart: TypesGen.UpdateWorkspaceAutostartRequest
autoStart: TypesGen.UpdateWorkspaceAutostartRequest | undefined
ttl: TypesGen.UpdateWorkspaceTTLRequest
}

Expand Down Expand Up @@ -195,10 +195,9 @@ export const workspaceSchedule = createMachine(
throw new Error("Failed to load workspace.")
}

// REMARK: These calls are purposefully synchronous because if one
// value contradicts the other, we don't want a race condition
// on re-submission.
await API.putWorkspaceAutostart(context.workspace.id, event.autoStart)
if (event.autoStart?.schedule !== undefined) {
await API.putWorkspaceAutostart(context.workspace.id, event.autoStart)
}
await API.putWorkspaceAutostop(context.workspace.id, event.ttl)
},
},
Expand Down