Skip to content

chore: rename locked to dormant #9290

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 9 commits into from
Aug 24, 2023
Merged

chore: rename locked to dormant #9290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
18930c4
chore: rename locked to dormant
sreya Aug 23, 2023
4853445
make gen
sreya Aug 23, 2023
102eae3
rename frontend
sreya Aug 23, 2023
4fef386
fix dbauthz
sreya Aug 23, 2023
b1abebb
make gen
sreya Aug 23, 2023
581ae4d
some final renames
sreya Aug 23, 2023
165f184
fix api docs
sreya Aug 24, 2023
47159ef
fixup remaining tidbits
sreya Aug 24, 2023
6da8e56
api docs
sreya Aug 24, 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
2 changes: 1 addition & 1 deletion cli/templatecreate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
VersionID: job.ID,
DefaultTTLMillis: ptr.Ref(defaultTTL.Milliseconds()),
FailureTTLMillis: ptr.Ref(failureTTL.Milliseconds()),
InactivityTTLMillis: ptr.Ref(inactivityTTL.Milliseconds()),
TimeTilDormantMillis: ptr.Ref(inactivityTTL.Milliseconds()),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
TimeTilDormantMillis: ptr.Ref(inactivityTTL.Milliseconds()),
TimeTilDormantMillis: ptr.Ref(timeTilDormant.Milliseconds()),

I am not sure, but should this be renamed too?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably but it's just a local variable and they mean the same thing.

DisableEveryoneGroupAccess: disableEveryone,
}

Expand Down
2 changes: 1 addition & 1 deletion cli/templateedit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
Weeks: restartRequirementWeeks,
},
FailureTTLMillis: failureTTL.Milliseconds(),
InactivityTTLMillis: inactivityTTL.Milliseconds(),
TimeTilDormantMillis: inactivityTTL.Milliseconds(),
AllowUserCancelWorkspaceJobs: allowUserCancelWorkspaceJobs,
AllowUserAutostart: allowUserAutostart,
AllowUserAutostop: allowUserAutostop,
Expand Down
8 changes: 4 additions & 4 deletions cli/templateedit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ func TestTemplateEdit(t *testing.T) {
ctr.DefaultTTLMillis = nil
ctr.RestartRequirement = nil
ctr.FailureTTLMillis = nil
ctr.InactivityTTLMillis = nil
ctr.TimeTilDormantMillis = nil
})

// Test the cli command with --allow-user-autostart.
Expand Down Expand Up @@ -798,7 +798,7 @@ func TestTemplateEdit(t *testing.T) {
assert.Equal(t, template.AllowUserAutostart, updated.AllowUserAutostart)
assert.Equal(t, template.AllowUserAutostop, updated.AllowUserAutostop)
assert.Equal(t, template.FailureTTLMillis, updated.FailureTTLMillis)
assert.Equal(t, template.InactivityTTLMillis, updated.InactivityTTLMillis)
assert.Equal(t, template.TimeTilDormantMillis, updated.TimeTilDormantMillis)
})

t.Run("BlockedNotEntitled", func(t *testing.T) {
Expand Down Expand Up @@ -892,7 +892,7 @@ func TestTemplateEdit(t *testing.T) {
assert.Equal(t, template.AllowUserAutostart, updated.AllowUserAutostart)
assert.Equal(t, template.AllowUserAutostop, updated.AllowUserAutostop)
assert.Equal(t, template.FailureTTLMillis, updated.FailureTTLMillis)
assert.Equal(t, template.InactivityTTLMillis, updated.InactivityTTLMillis)
assert.Equal(t, template.TimeTilDormantMillis, updated.TimeTilDormantMillis)
})
t.Run("Entitled", func(t *testing.T) {
t.Parallel()
Expand Down Expand Up @@ -990,7 +990,7 @@ func TestTemplateEdit(t *testing.T) {
assert.Equal(t, template.AllowUserAutostart, updated.AllowUserAutostart)
assert.Equal(t, template.AllowUserAutostop, updated.AllowUserAutostop)
assert.Equal(t, template.FailureTTLMillis, updated.FailureTTLMillis)
assert.Equal(t, template.InactivityTTLMillis, updated.InactivityTTLMillis)
assert.Equal(t, template.TimeTilDormantMillis, updated.TimeTilDormantMillis)
})
})
}
2 changes: 1 addition & 1 deletion cli/testdata/coder_list_--output_json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"ttl_ms": 28800000,
"last_used_at": "[timestamp]",
"deleting_at": null,
"locked_at": null,
"dormant_at": null,
"health": {
"healthy": true,
"failing_agents": []
Expand Down
70 changes: 35 additions & 35 deletions coderd/apidoc/docs.go
View file
Open in desktop

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

Loading