Skip to content

feat: add locked TTL field to template meta #8020

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 8 commits into from
Jun 20, 2023
Merged

feat: add locked TTL field to template meta #8020

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ea96c5
feat: add locked TTL field to template meta
sreya Jun 14, 2023
939d8ab
add frontend
sreya Jun 14, 2023
f89fb32
lint
sreya Jun 14, 2023
2b61d3f
i18
sreya Jun 14, 2023
9528ca2
fix a query
sreya Jun 14, 2023
1cf2bbb
fix migration
sreya Jun 14, 2023
38303a2
fix enterprise scheduler
sreya Jun 15, 2023
c5ac779
fix migration
sreya Jun 20, 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
lint
  • Loading branch information
@sreya
sreya committed Jun 20, 2023
commit f89fb3281c53794b2482f0947ee56cec1b869bfe
3 changes: 2 additions & 1 deletion coderd/templates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,8 @@ func TestPatchTemplateMeta(t *testing.T) {

require.EqualValues(t, 2, atomic.LoadInt64(&setCalled))
require.Equal(t, failureTTL.Milliseconds(), got.FailureTTLMillis)
require.Equal(t, lockedTTL.Milliseconds(), got.InactivityTTLMillis)
require.Equal(t, inactivityTTL.Milliseconds(), got.InactivityTTLMillis)
require.Equal(t, lockedTTL.Milliseconds(), got.LockedTTLMillis)
})

t.Run("IgnoredUnlicensed", func(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions .../src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const validFormValues: FormValues = {
allow_user_autostop: false,
failure_ttl_ms: 0,
inactivity_ttl_ms: 0,
locked_ttl_ms: 0,
}

const renderTemplateSettingsPage = async () => {
Expand Down