From 05bbbadce0fc4d17be5dc5624bb5a74672b08558 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 11 Apr 2023 15:33:21 +0200 Subject: [PATCH] Revert "fix: change auto-start to automatically update workspaces (#6053)" This reverts commit bdddc3e7aea78b00a1ac9404af4dc500600bb8a8. --- coderd/autobuild/executor/lifecycle_executor.go | 2 +- coderd/autobuild/executor/lifecycle_executor_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coderd/autobuild/executor/lifecycle_executor.go b/coderd/autobuild/executor/lifecycle_executor.go index 14ffd72934acd..b0ac9a213093a 100644 --- a/coderd/autobuild/executor/lifecycle_executor.go +++ b/coderd/autobuild/executor/lifecycle_executor.go @@ -308,7 +308,7 @@ func build(ctx context.Context, store database.Store, workspace database.Workspa CreatedAt: now, UpdatedAt: now, WorkspaceID: workspace.ID, - TemplateVersionID: template.ActiveVersionID, + TemplateVersionID: priorHistory.TemplateVersionID, BuildNumber: priorBuildNumber + 1, ProvisionerState: priorHistory.ProvisionerState, InitiatorID: workspace.OwnerID, diff --git a/coderd/autobuild/executor/lifecycle_executor_test.go b/coderd/autobuild/executor/lifecycle_executor_test.go index 0885a8de01d4d..e942ff490c5a6 100644 --- a/coderd/autobuild/executor/lifecycle_executor_test.go +++ b/coderd/autobuild/executor/lifecycle_executor_test.go @@ -97,14 +97,14 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) { close(tickCh) }() - // Then: the workspace is started using the new template version, not the old one. + // Then: the workspace should be started using the previous template version, and not the updated version. stats := <-statsCh assert.NoError(t, stats.Error) assert.Len(t, stats.Transitions, 1) assert.Contains(t, stats.Transitions, workspace.ID) assert.Equal(t, database.WorkspaceTransitionStart, stats.Transitions[workspace.ID]) ws := coderdtest.MustWorkspace(t, client, workspace.ID) - assert.Equal(t, newVersion.ID, ws.LatestBuild.TemplateVersionID, "expected workspace build to be using the new template version") + assert.Equal(t, workspace.LatestBuild.TemplateVersionID, ws.LatestBuild.TemplateVersionID, "expected workspace build to be using the old template version") } func TestExecutorAutostartAlreadyRunning(t *testing.T) {