- Notifications
You must be signed in to change notification settings - Fork914
feat: add deleted_at field to workspace model#7475
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
5 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 2 additions & 0 deletions.vscode/settings.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -20,6 +20,8 @@ | ||
| "codersdk", | ||
| "cronstrue", | ||
| "databasefake", | ||
| "dbfake", | ||
| "dbgen", | ||
| "dbtype", | ||
| "DERP", | ||
| "derphttp", | ||
3 changes: 2 additions & 1 deletioncli/testdata/coder_list_--output_json.golden
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletionscoderd/apidoc/docs.go
Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
5 changes: 5 additions & 0 deletionscoderd/apidoc/swagger.json
Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
22 changes: 21 additions & 1 deletioncoderd/workspaces.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1169,7 +1169,10 @@ func convertWorkspace( | ||
| autostartSchedule = &workspace.AutostartSchedule.String | ||
| } | ||
| var ( | ||
| ttlMillis = convertWorkspaceTTLMillis(workspace.Ttl) | ||
| deletingAt = calculateDeletingAt(workspace, template) | ||
| ) | ||
| return codersdk.Workspace{ | ||
| ID: workspace.ID, | ||
| CreatedAt: workspace.CreatedAt, | ||
| @@ -1188,6 +1191,7 @@ func convertWorkspace( | ||
| AutostartSchedule: autostartSchedule, | ||
| TTLMillis: ttlMillis, | ||
| LastUsedAt: workspace.LastUsedAt, | ||
| DeletingAt: deletingAt, | ||
| } | ||
| } | ||
| @@ -1200,6 +1204,22 @@ func convertWorkspaceTTLMillis(i sql.NullInt64) *int64 { | ||
| return &millis | ||
| } | ||
| // Calculate the time of the upcoming workspace deletion, if applicable; otherwise, return nil. | ||
| // Workspaces may have impending deletions if InactivityTTL feature is turned on and the workspace is inactive. | ||
| func calculateDeletingAt(workspace database.Workspace, template database.Template) *time.Time { | ||
| var ( | ||
| year, month, day = time.Now().Date() | ||
| beginningOfToday = time.Date(year, month, day, 0, 0, 0, 0, time.Now().Location()) | ||
| ) | ||
| // If InactivityTTL is turned off (set to 0), if the workspace has already been deleted, | ||
| // or if the workspace was used sometime within the last day, there is no impending deletion | ||
| if template.InactivityTTL == 0 || workspace.Deleted || workspace.LastUsedAt.After(beginningOfToday) { | ||
| return nil | ||
| } | ||
| return ptr.Ref(workspace.LastUsedAt.Add(time.Duration(template.InactivityTTL) * time.Nanosecond)) | ||
| } | ||
Emyrk marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| func validWorkspaceTTLMillis(millis *int64, templateDefault, templateMax time.Duration) (sql.NullInt64, error) { | ||
| if templateDefault == 0 && templateMax != 0 || (templateMax > 0 && templateDefault > templateMax) { | ||
| templateDefault = templateMax | ||
82 changes: 82 additions & 0 deletionscoderd/workspaces_internal_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package coderd | ||
| import ( | ||
| "testing" | ||
| "time" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/coder/coder/coderd/database" | ||
| "github.com/coder/coder/coderd/util/ptr" | ||
| ) | ||
| func Test_calculateDeletingAt(t *testing.T) { | ||
| t.Parallel() | ||
| testCases := []struct { | ||
| name string | ||
| workspace database.Workspace | ||
| template database.Template | ||
| expected *time.Time | ||
| }{ | ||
| { | ||
| name: "DeletingAt", | ||
| workspace: database.Workspace{ | ||
| Deleted: false, | ||
| LastUsedAt: time.Now().Add(time.Duration(-10) * time.Hour * 24), // 10 days ago | ||
| }, | ||
| template: database.Template{ | ||
| InactivityTTL: int64(9 * 24 * time.Hour), // 9 days | ||
| }, | ||
| expected: ptr.Ref(time.Now().Add(time.Duration(-1) * time.Hour * 24)), // yesterday | ||
| }, | ||
| { | ||
| name: "InactivityTTLUnset", | ||
| workspace: database.Workspace{ | ||
| Deleted: false, | ||
| LastUsedAt: time.Now().Add(time.Duration(-10) * time.Hour * 24), | ||
| }, | ||
| template: database.Template{ | ||
| InactivityTTL: 0, | ||
| }, | ||
| expected: nil, | ||
| }, | ||
| { | ||
| name: "DeletedWorkspace", | ||
| workspace: database.Workspace{ | ||
| Deleted: true, | ||
| LastUsedAt: time.Now().Add(time.Duration(-10) * time.Hour * 24), | ||
| }, | ||
| template: database.Template{ | ||
| InactivityTTL: int64(9 * 24 * time.Hour), | ||
| }, | ||
| expected: nil, | ||
| }, | ||
| { | ||
| name: "ActiveWorkspace", | ||
| workspace: database.Workspace{ | ||
| Deleted: true, | ||
| LastUsedAt: time.Now().Add(time.Duration(-5) * time.Hour), // 5 hours ago | ||
| }, | ||
| template: database.Template{ | ||
| InactivityTTL: int64(1 * 24 * time.Hour), // 1 day | ||
| }, | ||
| expected: nil, | ||
| }, | ||
| } | ||
| for _, tc := range testCases { | ||
| tc := tc | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| t.Parallel() | ||
| found := calculateDeletingAt(tc.workspace, tc.template) | ||
| if tc.expected == nil { | ||
| require.Nil(t, found, "impending deletion should be nil") | ||
| } else { | ||
| require.NotNil(t, found) | ||
| require.WithinDuration(t, *tc.expected, *found, time.Second, "incorrect impending deletion") | ||
| } | ||
| }) | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletionscodersdk/workspaces.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
41 changes: 22 additions & 19 deletionsdocs/api/schemas.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletionsdocs/api/workspaces.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletionssite/src/api/typesGenerated.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletionssite/src/testHelpers/entities.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.