synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: change auto-start to automatically update workspaces (#6053)

Browse Source 
Fixes #6049.
This commit is contained in:
Kyle Carberry
2023-02-06 11:12:58 -06:00
committed by GitHub
parent d6947aeaca
commit bdddc3e7ae
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coderd/autobuild/executor/lifecycle_executor.go
View File

@ -295,7 +295,7 @@ func build(ctx context.Context, store database.Store, workspace database.Workspa
CreatedAt: now, CreatedAt: now,
UpdatedAt: now, UpdatedAt: now,
WorkspaceID: workspace.ID, WorkspaceID: workspace.ID,
TemplateVersionID: priorHistory.TemplateVersionID, TemplateVersionID: template.ActiveVersionID,
BuildNumber: priorBuildNumber + 1, BuildNumber: priorBuildNumber + 1,
ProvisionerState: priorHistory.ProvisionerState, ProvisionerState: priorHistory.ProvisionerState,
InitiatorID: workspace.OwnerID, InitiatorID: workspace.OwnerID,

4
coderd/autobuild/executor/lifecycle_executor_test.go
View File

@ -99,14 +99,14 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {
close(tickCh) close(tickCh)
}() }()
// Then: the workspace should be started using the previous template version, and not the updated version. // Then: the workspace is started using the new template version, not the old one.
stats := <-statsCh stats := <-statsCh
assert.NoError(t, stats.Error) assert.NoError(t, stats.Error)
assert.Len(t, stats.Transitions, 1) assert.Len(t, stats.Transitions, 1)
assert.Contains(t, stats.Transitions, workspace.ID) assert.Contains(t, stats.Transitions, workspace.ID)
assert.Equal(t, database.WorkspaceTransitionStart, stats.Transitions[workspace.ID]) assert.Equal(t, database.WorkspaceTransitionStart, stats.Transitions[workspace.ID])
ws := coderdtest.MustWorkspace(t, client, workspace.ID) ws := coderdtest.MustWorkspace(t, client, workspace.ID)
assert.Equal(t, workspace.LatestBuild.TemplateVersionID, ws.LatestBuild.TemplateVersionID, "expected workspace build to be using the old template version") assert.Equal(t, newVersion.ID, ws.LatestBuild.TemplateVersionID, "expected workspace build to be using the new template version")
} }
func TestExecutorAutostartAlreadyRunning(t *testing.T) { func TestExecutorAutostartAlreadyRunning(t *testing.T) {