From 2448ab3cda4eb94ba88948d262d2f6e2d96bbb62 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Mon, 2 Oct 2023 23:06:53 +0000 Subject: [PATCH 1/8] chore: rename `AwaitTemplateVersionJobCompleted` and `AwaitWorkspaceBuildJobCompleted` --- coderd/coderdtest/coderdtest.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 6cc0d5132e7fd..44a686713739b 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -760,8 +760,8 @@ func UpdateTemplateVersion(t *testing.T, client *codersdk.Client, organizationID return templateVersion } -// AwaitTemplateImportJob awaits for an import job to reach completed status. -func AwaitTemplateVersionJob(t *testing.T, client *codersdk.Client, version uuid.UUID) codersdk.TemplateVersion { +// AwaitTemplateImportJobCompleted awaits for an import job to reach completed status. +func AwaitTemplateVersionJobCompleted(t *testing.T, client *codersdk.Client, version uuid.UUID) codersdk.TemplateVersion { t.Helper() ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -778,8 +778,8 @@ func AwaitTemplateVersionJob(t *testing.T, client *codersdk.Client, version uuid return templateVersion } -// AwaitWorkspaceBuildJob waits for a workspace provision job to reach completed status. -func AwaitWorkspaceBuildJob(t *testing.T, client *codersdk.Client, build uuid.UUID) codersdk.WorkspaceBuild { +// AwaitWorkspaceBuildJobCompleted waits for a workspace provision job to reach completed status. +func AwaitWorkspaceBuildJobCompleted(t *testing.T, client *codersdk.Client, build uuid.UUID) codersdk.WorkspaceBuild { t.Helper() ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort) From e8b84eb7a379373c67296af8cb561c128126a1e2 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Mon, 2 Oct 2023 23:12:23 +0000 Subject: [PATCH 2/8] for real tho --- cli/agent_test.go | 20 +- cli/clitest/golden.go | 4 +- cli/configssh_test.go | 12 +- cli/create_test.go | 28 +-- cli/delete_test.go | 16 +- cli/gitssh_test.go | 4 +- cli/list_test.go | 8 +- cli/portforward_test.go | 4 +- cli/rename_test.go | 4 +- cli/restart_test.go | 16 +- cli/schedule_test.go | 32 +-- cli/show_test.go | 4 +- cli/ssh_test.go | 4 +- cli/start_test.go | 14 +- cli/state_test.go | 16 +- cli/templatedelete_test.go | 8 +- cli/templateedit_test.go | 28 +-- cli/templatelist_test.go | 8 +- cli/templatepull_test.go | 16 +- cli/templatepush_test.go | 24 +- cli/templateversions_test.go | 2 +- cli/update_test.go | 40 ++-- coderd/activitybump_test.go | 4 +- coderd/audit_test.go | 6 +- coderd/authorize_test.go | 2 +- coderd/autobuild/lifecycle_executor_test.go | 20 +- coderd/coderd_test.go | 4 +- coderd/coderdtest/coderdtest.go | 2 +- coderd/coderdtest/coderdtest_test.go | 4 +- coderd/externalauth_test.go | 20 +- coderd/gitsshkey_test.go | 4 +- coderd/insights_test.go | 20 +- .../prometheusmetrics_test.go | 8 +- coderd/provisionerjobs_test.go | 6 +- coderd/templates_test.go | 10 +- coderd/templateversions_test.go | 36 +-- coderd/users_test.go | 4 +- coderd/workspaceagents_test.go | 84 +++---- coderd/workspaceapps/apptest/setup.go | 4 +- coderd/workspaceapps/db_test.go | 4 +- coderd/workspacebuilds_test.go | 80 +++---- coderd/workspaceresourceauth_test.go | 12 +- coderd/workspaces_test.go | 224 +++++++++--------- enterprise/coderd/appearance_test.go | 4 +- enterprise/coderd/authorize_test.go | 2 +- enterprise/coderd/coderd_test.go | 2 +- enterprise/coderd/provisionerdaemons_test.go | 8 +- enterprise/coderd/templates_test.go | 26 +- enterprise/coderd/workspaceagents_test.go | 4 +- enterprise/coderd/workspaceproxy_test.go | 8 +- enterprise/coderd/workspacequota_test.go | 20 +- enterprise/coderd/workspaces_test.go | 62 ++--- enterprise/wsproxy/wsproxy_test.go | 8 +- scaletest/agentconn/run_test.go | 4 +- scaletest/createworkspaces/run_test.go | 10 +- scaletest/reconnectingpty/run_test.go | 4 +- scaletest/workspacebuild/run_test.go | 8 +- scaletest/workspacetraffic/run_test.go | 8 +- 58 files changed, 524 insertions(+), 524 deletions(-) diff --git a/cli/agent_test.go b/cli/agent_test.go index 7073f7c0f18ca..4b362ac42c72d 100644 --- a/cli/agent_test.go +++ b/cli/agent_test.go @@ -38,9 +38,9 @@ func TestWorkspaceAgent(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) logDir := t.TempDir() inv, _ := clitest.New(t, @@ -92,9 +92,9 @@ func TestWorkspaceAgent(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, _ := clitest.New(t, "agent", "--auth", "azure-instance-identity", "--agent-url", client.URL.String()) inv = inv.WithContext( @@ -144,9 +144,9 @@ func TestWorkspaceAgent(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, _ := clitest.New(t, "agent", "--auth", "aws-instance-identity", "--agent-url", client.URL.String()) inv = inv.WithContext( @@ -196,9 +196,9 @@ func TestWorkspaceAgent(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, cfg := clitest.New(t, "agent", "--auth", "google-instance-identity", "--agent-url", client.URL.String()) ptytest.New(t).Attach(inv) @@ -253,9 +253,9 @@ func TestWorkspaceAgent(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) logDir := t.TempDir() inv, _ := clitest.New(t, diff --git a/cli/clitest/golden.go b/cli/clitest/golden.go index 6a35f67ec81ec..2a3ad2dc605c9 100644 --- a/cli/clitest/golden.go +++ b/cli/clitest/golden.go @@ -182,14 +182,14 @@ func prepareTestData(t *testing.T) (*codersdk.Client, map[string]string) { }) require.NoError(t, err) version := coderdtest.CreateTemplateVersion(t, rootClient, firstUser.OrganizationID, nil) - version = coderdtest.AwaitTemplateVersionJob(t, rootClient, version.ID) + version = coderdtest.AwaitTemplateVersionJobCompleted(t, rootClient, version.ID) template := coderdtest.CreateTemplate(t, rootClient, firstUser.OrganizationID, version.ID, func(req *codersdk.CreateTemplateRequest) { req.Name = "test-template" }) workspace := coderdtest.CreateWorkspace(t, rootClient, firstUser.OrganizationID, template.ID, func(req *codersdk.CreateWorkspaceRequest) { req.Name = "test-workspace" }) - workspaceBuild := coderdtest.AwaitWorkspaceBuildJob(t, rootClient, workspace.LatestBuild.ID) + workspaceBuild := coderdtest.AwaitWorkspaceBuildJobCompleted(t, rootClient, workspace.LatestBuild.ID) replacements := map[string]string{ firstUser.UserID.String(): "[first user ID]", diff --git a/cli/configssh_test.go b/cli/configssh_test.go index 141609f25bf53..cada503bade3f 100644 --- a/cli/configssh_test.go +++ b/cli/configssh_test.go @@ -95,10 +95,10 @@ func TestConfigSSH(t *testing.T) { }}, ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) agentConn, err := client.DialWorkspaceAgent(context.Background(), resources[0].Agents[0].ID, nil) @@ -594,10 +594,10 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, tt.echoResponse) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ) // Prepare ssh config files. @@ -714,10 +714,10 @@ func TestConfigSSH_Hostnames(t *testing.T) { // authToken := uuid.NewString() version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echo.WithResources(resources)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) sshConfigFile := sshConfigFileName(t) diff --git a/cli/create_test.go b/cli/create_test.go index 2cd4c9abaaabf..c625bb2f14c73 100644 --- a/cli/create_test.go +++ b/cli/create_test.go @@ -30,7 +30,7 @@ func TestCreate(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, completeWithAgent()) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) args := []string{ "create", @@ -81,7 +81,7 @@ func TestCreate(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) owner := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, completeWithAgent()) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID) _, user := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) args := []string{ @@ -134,7 +134,7 @@ func TestCreate(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, completeWithAgent()) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { var defaultTTLMillis int64 = 2 * 60 * 60 * 1000 // 2 hours ctr.DefaultTTLMillis = &defaultTTLMillis @@ -175,7 +175,7 @@ func TestCreate(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) _ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "create", "my-workspace", "-y") @@ -197,7 +197,7 @@ func TestCreate(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "create", "") clitest.SetupConfig(t, client, root) @@ -275,7 +275,7 @@ func TestCreateWithRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -314,7 +314,7 @@ func TestCreateWithRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -354,7 +354,7 @@ func TestCreateWithRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -422,7 +422,7 @@ func TestCreateValidateRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(stringRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -459,7 +459,7 @@ func TestCreateValidateRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(numberRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -496,7 +496,7 @@ func TestCreateValidateRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(boolRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -533,7 +533,7 @@ func TestCreateValidateRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(listOfStringsRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "create", "my-workspace", "--template", template.Name) @@ -562,7 +562,7 @@ func TestCreateValidateRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(listOfStringsRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) tempDir := t.TempDir() @@ -619,7 +619,7 @@ func TestCreateWithGitAuth(t *testing.T) { }) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "create", "my-workspace", "--template", template.Name) diff --git a/cli/delete_test.go b/cli/delete_test.go index 58da1aa9a4efd..a2eab6a091d84 100644 --- a/cli/delete_test.go +++ b/cli/delete_test.go @@ -25,10 +25,10 @@ func TestDelete(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "delete", workspace.Name, "-y") clitest.SetupConfig(t, client, root) doneChan := make(chan struct{}) @@ -50,10 +50,10 @@ func TestDelete(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "delete", workspace.Name, "-y", "--orphan") clitest.SetupConfig(t, client, root) @@ -83,11 +83,11 @@ func TestDelete(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) deleteMeClient, deleteMeUser := coderdtest.CreateAnotherUser(t, client, user.OrganizationID) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, deleteMeClient, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, deleteMeClient, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, deleteMeClient, workspace.LatestBuild.ID) // The API checks if the user has any workspaces, so we cannot delete a user // this way. @@ -127,10 +127,10 @@ func TestDelete(t *testing.T) { require.NoError(t, err) version := coderdtest.CreateTemplateVersion(t, adminClient, orgID, nil) - coderdtest.AwaitTemplateVersionJob(t, adminClient, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, adminClient, version.ID) template := coderdtest.CreateTemplate(t, adminClient, orgID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, orgID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "delete", user.Username+"/"+workspace.Name, "-y") clitest.SetupConfig(t, adminClient, root) diff --git a/cli/gitssh_test.go b/cli/gitssh_test.go index 103ce34cf723b..354a57c732953 100644 --- a/cli/gitssh_test.go +++ b/cli/gitssh_test.go @@ -55,9 +55,9 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*agentsdk.Client, str ProvisionApply: echo.ProvisionApplyWithAgent(agentToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // start workspace agent agentClient := agentsdk.New(client.URL) diff --git a/cli/list_test.go b/cli/list_test.go index 6f5fb883c06d9..2b8334b1b43ac 100644 --- a/cli/list_test.go +++ b/cli/list_test.go @@ -23,10 +23,10 @@ func TestList(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "ls") clitest.SetupConfig(t, client, root) pty := ptytest.New(t).Attach(inv) @@ -50,10 +50,10 @@ func TestList(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "list", "--output=json") clitest.SetupConfig(t, client, root) diff --git a/cli/portforward_test.go b/cli/portforward_test.go index d2d497485c403..05b9c69e32f50 100644 --- a/cli/portforward_test.go +++ b/cli/portforward_test.go @@ -311,9 +311,9 @@ func runAgent(t *testing.T, client *codersdk.Client, userID uuid.UUID) codersdk. // Create template and workspace template := coderdtest.CreateTemplate(t, client, orgID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, orgID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, agentToken, func(o *agent.Options) { diff --git a/cli/rename_test.go b/cli/rename_test.go index 42dd4bd897c0e..7d5a1af17a790 100644 --- a/cli/rename_test.go +++ b/cli/rename_test.go @@ -18,10 +18,10 @@ func TestRename(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() diff --git a/cli/restart_test.go b/cli/restart_test.go index 43b512c1bc30b..604a179183dea 100644 --- a/cli/restart_test.go +++ b/cli/restart_test.go @@ -35,10 +35,10 @@ func TestRestart(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx := testutil.Context(t, testutil.WaitLong) @@ -65,10 +65,10 @@ func TestRestart(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "restart", workspace.Name, "--build-options") clitest.SetupConfig(t, client, root) @@ -118,10 +118,10 @@ func TestRestart(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "restart", workspace.Name, "--build-option", fmt.Sprintf("%s=%s", ephemeralParameterName, ephemeralParameterValue)) @@ -196,7 +196,7 @@ func TestRestartWithParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.RichParameterValues = []codersdk.WorkspaceBuildParameter{ @@ -206,7 +206,7 @@ func TestRestartWithParameters(t *testing.T) { }, } }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Restart the workspace again inv, root := clitest.New(t, "restart", workspace.Name, "-y") diff --git a/cli/schedule_test.go b/cli/schedule_test.go index 5a1cac890c1ca..dfb992976bc62 100644 --- a/cli/schedule_test.go +++ b/cli/schedule_test.go @@ -31,13 +31,13 @@ func TestScheduleShow(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = ptr.Ref(schedCron) cwr.TTLMillis = ptr.Ref(ttl.Milliseconds()) }) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) cmdArgs = []string{"schedule", "show", workspace.Name} stdoutBuf = &bytes.Buffer{} ) @@ -68,13 +68,13 @@ func TestScheduleShow(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = nil cwr.TTLMillis = nil }) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) cmdArgs = []string{"schedule", "show", workspace.Name} stdoutBuf = &bytes.Buffer{} ) @@ -101,7 +101,7 @@ func TestScheduleShow(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ) inv, root := clitest.New(t, "schedule", "show", "doesnotexist") @@ -120,12 +120,12 @@ func TestScheduleStart(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = nil }) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) tz = "Europe/Dublin" sched = "CRON_TZ=Europe/Dublin 30 9 * * Mon-Fri" stdoutBuf = &bytes.Buffer{} @@ -177,11 +177,11 @@ func TestScheduleStop(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) ttl = 8*time.Hour + 30*time.Minute workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) stdoutBuf = &bytes.Buffer{} ) @@ -230,7 +230,7 @@ func TestScheduleOverride(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID) cmdArgs = []string{"schedule", "override-stop", workspace.Name, "10h"} @@ -238,7 +238,7 @@ func TestScheduleOverride(t *testing.T) { ) // Given: we wait for the workspace to be built - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) workspace, err = client.Workspace(ctx, workspace.ID) require.NoError(t, err) expectedDeadline := time.Now().Add(10 * time.Hour) @@ -271,7 +271,7 @@ func TestScheduleOverride(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID) cmdArgs = []string{"schedule", "override-stop", workspace.Name, "kwyjibo"} @@ -279,7 +279,7 @@ func TestScheduleOverride(t *testing.T) { ) // Given: we wait for the workspace to be built - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) workspace, err = client.Workspace(ctx, workspace.ID) require.NoError(t, err) @@ -307,7 +307,7 @@ func TestScheduleOverride(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.TTLMillis = nil @@ -327,7 +327,7 @@ func TestScheduleOverride(t *testing.T) { require.Nil(t, workspace.TTLMillis) // Given: we wait for the workspace to build - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) workspace, err = client.Workspace(ctx, workspace.ID) require.NoError(t, err) @@ -362,7 +362,7 @@ func TestScheduleStartDefaults(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = nil diff --git a/cli/show_test.go b/cli/show_test.go index ccbe182cc7ed9..0753ee58c9500 100644 --- a/cli/show_test.go +++ b/cli/show_test.go @@ -17,10 +17,10 @@ func TestShow(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, completeWithAgent()) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) args := []string{ "show", diff --git a/cli/ssh_test.go b/cli/ssh_test.go index 90b34ca9f4b70..eb4095f44f453 100644 --- a/cli/ssh_test.go +++ b/cli/ssh_test.go @@ -74,10 +74,10 @@ func setupWorkspaceForAgent(t *testing.T, mutate func([]*proto.Agent) []*proto.A }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) workspace, err := client.Workspace(context.Background(), workspace.ID) require.NoError(t, err) diff --git a/cli/start_test.go b/cli/start_test.go index dff4048f3e765..7ebb5ab992b04 100644 --- a/cli/start_test.go +++ b/cli/start_test.go @@ -58,10 +58,10 @@ func TestStart(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "start", workspace.Name, "--build-options") clitest.SetupConfig(t, client, root) @@ -108,10 +108,10 @@ func TestStart(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "start", workspace.Name, "--build-option", fmt.Sprintf("%s=%s", ephemeralParameterName, ephemeralParameterValue)) @@ -172,7 +172,7 @@ func TestStartWithParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.RichParameterValues = []codersdk.WorkspaceBuildParameter{ @@ -182,11 +182,11 @@ func TestStartWithParameters(t *testing.T) { }, } }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Stop the workspace workspaceBuild := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspaceBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspaceBuild.ID) // Start the workspace again inv, root := clitest.New(t, "start", workspace.Name) diff --git a/cli/state_test.go b/cli/state_test.go index a240a6d2c81ae..f4ab8fb5f134e 100644 --- a/cli/state_test.go +++ b/cli/state_test.go @@ -33,10 +33,10 @@ func TestStatePull(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) statefilePath := filepath.Join(t.TempDir(), "state") inv, root := clitest.New(t, "state", "pull", workspace.Name, statefilePath) clitest.SetupConfig(t, client, root) @@ -61,10 +61,10 @@ func TestStatePull(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "state", "pull", workspace.Name) var gotState bytes.Buffer inv.Stdout = &gotState @@ -85,10 +85,10 @@ func TestStatePush(t *testing.T) { Parse: echo.ParseComplete, ProvisionApply: echo.ApplyComplete, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) stateFile, err := os.CreateTemp(t.TempDir(), "") require.NoError(t, err) wantState := []byte("some magic state") @@ -110,10 +110,10 @@ func TestStatePush(t *testing.T) { Parse: echo.ParseComplete, ProvisionApply: echo.ApplyComplete, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) inv, root := clitest.New(t, "state", "push", "--build", strconv.Itoa(int(workspace.LatestBuild.BuildNumber)), workspace.Name, "-") clitest.SetupConfig(t, client, root) inv.Stdin = strings.NewReader("some magic state") diff --git a/cli/templatedelete_test.go b/cli/templatedelete_test.go index 1e7ecfc61cdc0..dfb9f33b9a3d6 100644 --- a/cli/templatedelete_test.go +++ b/cli/templatedelete_test.go @@ -26,7 +26,7 @@ func TestTemplateDelete(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "templates", "delete", template.Name) @@ -57,7 +57,7 @@ func TestTemplateDelete(t *testing.T) { templateNames := []string{} for i := 0; i < 3; i++ { version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) templates = append(templates, template) templateNames = append(templateNames, template.Name) @@ -82,7 +82,7 @@ func TestTemplateDelete(t *testing.T) { templateNames := []string{} for i := 0; i < 3; i++ { version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) templates = append(templates, template) templateNames = append(templateNames, template.Name) @@ -114,7 +114,7 @@ func TestTemplateDelete(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "templates", "delete") diff --git a/cli/templateedit_test.go b/cli/templateedit_test.go index 98c05e49d8cc3..802d4e745cd15 100644 --- a/cli/templateedit_test.go +++ b/cli/templateedit_test.go @@ -33,7 +33,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Test the cli command. @@ -78,7 +78,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Test the cli command. @@ -114,7 +114,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Test the cli command. @@ -146,7 +146,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) initialDisplayName := "This is a template" initialDescription := "This is description" @@ -198,7 +198,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) initialDisplayName := "This is a template" initialDescription := "This is description" @@ -249,7 +249,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = nil ctr.AutostopRequirement = nil @@ -323,7 +323,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = nil ctr.AutostopRequirement = nil @@ -436,7 +436,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = nil ctr.AutostopRequirement = nil @@ -537,7 +537,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = nil ctr.MaxTTLMillis = nil @@ -574,7 +574,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = nil ctr.MaxTTLMillis = nil @@ -650,7 +650,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = nil ctr.MaxTTLMillis = nil @@ -747,7 +747,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = nil ctr.AutostopRequirement = nil @@ -806,7 +806,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Make a proxy server that will return a valid entitlements @@ -899,7 +899,7 @@ func TestTemplateEdit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Make a proxy server that will return a valid entitlements diff --git a/cli/templatelist_test.go b/cli/templatelist_test.go index d639b7b1ebfe2..b0a248c7a0a8f 100644 --- a/cli/templatelist_test.go +++ b/cli/templatelist_test.go @@ -23,11 +23,11 @@ func TestTemplateList(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) firstVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, firstVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, firstVersion.ID) firstTemplate := coderdtest.CreateTemplate(t, client, user.OrganizationID, firstVersion.ID) secondVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, secondVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, secondVersion.ID) secondTemplate := coderdtest.CreateTemplate(t, client, user.OrganizationID, secondVersion.ID) inv, root := clitest.New(t, "templates", "list") @@ -58,11 +58,11 @@ func TestTemplateList(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) firstVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, firstVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, firstVersion.ID) _ = coderdtest.CreateTemplate(t, client, user.OrganizationID, firstVersion.ID) secondVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, secondVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, secondVersion.ID) _ = coderdtest.CreateTemplate(t, client, user.OrganizationID, secondVersion.ID) inv, root := clitest.New(t, "templates", "list", "--output=json") diff --git a/cli/templatepull_test.go b/cli/templatepull_test.go index 3f1cd50851ed3..fd89b29d01c28 100644 --- a/cli/templatepull_test.go +++ b/cli/templatepull_test.go @@ -68,14 +68,14 @@ func TestTemplatePull_Stdout(t *testing.T) { require.NoError(t, err) version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version1.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID) // Update the template version so that we can assert that templates // are being sorted correctly. updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID) inv, root := clitest.New(t, "templates", "pull", "--tar", template.Name) clitest.SetupConfig(t, client, root) @@ -109,14 +109,14 @@ func TestTemplatePull_ToDir(t *testing.T) { require.NoError(t, err) version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version1.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID) // Update the template version so that we can assert that templates // are being sorted correctly. updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID) dir := t.TempDir() @@ -159,14 +159,14 @@ func TestTemplatePull_ToImplicit(t *testing.T) { require.NoError(t, err) version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version1.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID) // Update the template version so that we can assert that templates // are being sorted correctly. updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID) // create a tempdir and change the working directory to it for the duration of the test (cannot run in parallel) dir := t.TempDir() @@ -220,14 +220,14 @@ func TestTemplatePull_FolderConflict(t *testing.T) { require.NoError(t, err) version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version1.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID) // Update the template version so that we can assert that templates // are being sorted correctly. updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID) dir := t.TempDir() diff --git a/cli/templatepush_test.go b/cli/templatepush_test.go index 4c41597802bb2..e106c327f671d 100644 --- a/cli/templatepush_test.go +++ b/cli/templatepush_test.go @@ -31,7 +31,7 @@ func TestTemplatePush(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -77,7 +77,7 @@ func TestTemplatePush(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) source := clitest.CreateTemplateVersionSource(t, &echo.Responses{ @@ -116,7 +116,7 @@ func TestTemplatePush(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) source := clitest.CreateTemplateVersionSource(t, &echo.Responses{ @@ -161,7 +161,7 @@ func TestTemplatePush(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -204,7 +204,7 @@ func TestTemplatePush(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -241,7 +241,7 @@ func TestTemplatePush(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -288,7 +288,7 @@ func TestTemplatePush(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // Test the cli command. source := clitest.CreateTemplateVersionSource(t, &echo.Responses{ @@ -336,7 +336,7 @@ func TestTemplatePush(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) source, err := echo.Tar(&echo.Responses{ Parse: echo.ParseComplete, @@ -392,7 +392,7 @@ func TestTemplatePush(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) templateVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, createEchoResponsesWithTemplateVariables(initialTemplateVariables)) - _ = coderdtest.AwaitTemplateVersionJob(t, client, templateVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateVersion.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, templateVersion.ID) // Test the cli command. @@ -455,7 +455,7 @@ func TestTemplatePush(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) templateVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, createEchoResponsesWithTemplateVariables(initialTemplateVariables)) - _ = coderdtest.AwaitTemplateVersionJob(t, client, templateVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateVersion.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, templateVersion.ID) // Test the cli command. @@ -501,7 +501,7 @@ func TestTemplatePush(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) templateVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, createEchoResponsesWithTemplateVariables(initialTemplateVariables)) - _ = coderdtest.AwaitTemplateVersionJob(t, client, templateVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateVersion.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, templateVersion.ID) // Test the cli command. @@ -562,7 +562,7 @@ func TestTemplatePush(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) templateVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, createEchoResponsesWithTemplateVariables(initialTemplateVariables)) - _ = coderdtest.AwaitTemplateVersionJob(t, client, templateVersion.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateVersion.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, templateVersion.ID) // Test the cli command. diff --git a/cli/templateversions_test.go b/cli/templateversions_test.go index c7c4da549528c..e6624d27c7f71 100644 --- a/cli/templateversions_test.go +++ b/cli/templateversions_test.go @@ -17,7 +17,7 @@ func TestTemplateVersions(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "templates", "versions", "list", template.Name) diff --git a/cli/update_test.go b/cli/update_test.go index 73be536d95c46..cfedf7a5ba931 100644 --- a/cli/update_test.go +++ b/cli/update_test.go @@ -38,7 +38,7 @@ func TestUpdate(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version1.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID) inv, root := clitest.New(t, "create", @@ -60,7 +60,7 @@ func TestUpdate(t *testing.T) { ProvisionApply: echo.ApplyComplete, ProvisionPlan: echo.PlanComplete, }, template.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version2.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version2.ID) err = client.UpdateActiveTemplateVersion(context.Background(), template.ID, codersdk.UpdateActiveTemplateVersion{ ID: version2.ID, @@ -114,7 +114,7 @@ func TestUpdateWithRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -164,7 +164,7 @@ func TestUpdateWithRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -228,7 +228,7 @@ func TestUpdateWithRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResponses) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -304,7 +304,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(stringRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) tempDir := t.TempDir() @@ -348,7 +348,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(numberRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -396,7 +396,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(boolRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -443,7 +443,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { // Upload the initial template version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(stringRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) tempDir := t.TempDir() @@ -470,7 +470,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { Required: true, }) version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(modifiedParameters), template.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) err = client.UpdateActiveTemplateVersion(context.Background(), template.ID, codersdk.UpdateActiveTemplateVersion{ ID: version.ID, }) @@ -511,7 +511,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { // Upload the initial template version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(stringRichParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) tempDir := t.TempDir() @@ -539,7 +539,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { Required: false, }) version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(modifiedParameters), template.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) err = client.UpdateActiveTemplateVersion(context.Background(), template.ID, codersdk.UpdateActiveTemplateVersion{ ID: version.ID, }) @@ -575,7 +575,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { }}, } version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(templateParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Create new workspace @@ -595,7 +595,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { } updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(updatedTemplateParameters), template.ID) - coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID) err = client.UpdateActiveTemplateVersion(context.Background(), template.ID, codersdk.UpdateActiveTemplateVersion{ ID: updatedVersion.ID, }) @@ -644,7 +644,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { }}, } version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(templateParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Create new workspace @@ -665,7 +665,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { } updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(updatedTemplateParameters), template.ID) - coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID) err = client.UpdateActiveTemplateVersion(context.Background(), template.ID, codersdk.UpdateActiveTemplateVersion{ ID: updatedVersion.ID, }) @@ -714,7 +714,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { }}, } version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(templateParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "create", "my-workspace", "--yes", "--template", template.Name, "--parameter", fmt.Sprintf("%s=%s", stringParameterName, "2nd")) @@ -730,7 +730,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { } updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(updatedTemplateParameters), template.ID) - coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID) err = client.UpdateActiveTemplateVersion(context.Background(), template.ID, codersdk.UpdateActiveTemplateVersion{ ID: updatedVersion.ID, }) @@ -779,7 +779,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { }}, } version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(templateParameters)) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) inv, root := clitest.New(t, "create", "my-workspace", "--yes", "--template", template.Name, "--parameter", fmt.Sprintf("%s=%s", stringParameterName, "2nd")) @@ -799,7 +799,7 @@ func TestUpdateValidateRichParameters(t *testing.T) { } updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, prepareEchoResponses(updatedTemplateParameters), template.ID) - coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID) err = client.UpdateActiveTemplateVersion(context.Background(), template.ID, codersdk.UpdateActiveTemplateVersion{ ID: updatedVersion.ID, }) diff --git a/coderd/activitybump_test.go b/coderd/activitybump_test.go index 53792434bb7bc..30c338b37a7c7 100644 --- a/coderd/activitybump_test.go +++ b/coderd/activitybump_test.go @@ -65,11 +65,11 @@ func TestWorkspaceActivityBump(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(agentToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.TTLMillis = &ttlMillis }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Update the max deadline. if maxTTL != 0 { diff --git a/coderd/audit_test.go b/coderd/audit_test.go index 8d7ada74b3bef..b8b62cf27ecf0 100644 --- a/coderd/audit_test.go +++ b/coderd/audit_test.go @@ -53,9 +53,9 @@ func TestAuditLogs(t *testing.T) { template = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) ) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) buildResourceInfo := audit.AdditionalFields{ WorkspaceName: workspace.Name, @@ -100,7 +100,7 @@ func TestAuditLogsFilter(t *testing.T) { template = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) ) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) // Create two logs with "Create" diff --git a/coderd/authorize_test.go b/coderd/authorize_test.go index 54462690be516..3fcb2f6c8e64f 100644 --- a/coderd/authorize_test.go +++ b/coderd/authorize_test.go @@ -32,7 +32,7 @@ func TestCheckPermissions(t *testing.T) { require.NoError(t, err) version := coderdtest.CreateTemplateVersion(t, adminClient, adminUser.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, adminClient, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, adminClient, version.ID) template := coderdtest.CreateTemplate(t, adminClient, adminUser.OrganizationID, version.ID) // With admin, member, and org admin diff --git a/coderd/autobuild/lifecycle_executor_test.go b/coderd/autobuild/lifecycle_executor_test.go index d6d60257a1f9c..a613e03b7bcf3 100644 --- a/coderd/autobuild/lifecycle_executor_test.go +++ b/coderd/autobuild/lifecycle_executor_test.go @@ -89,7 +89,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) { require.Len(t, orgs, 1) newVersion := coderdtest.UpdateTemplateVersion(t, client, orgs[0].ID, nil, workspace.TemplateID) - coderdtest.AwaitTemplateVersionJob(t, client, newVersion.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, newVersion.ID) require.NoError(t, client.UpdateActiveTemplateVersion(ctx, workspace.TemplateID, codersdk.UpdateActiveTemplateVersion{ ID: newVersion.ID, })) @@ -467,7 +467,7 @@ func TestExecutorWorkspaceAutostopNoWaitChangedMyMind(t *testing.T) { // Wait for stop to complete updated = coderdtest.MustWorkspace(t, client, workspace.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, updated.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, updated.LatestBuild.ID) // Start the workspace again workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStop, database.WorkspaceTransitionStart) @@ -690,9 +690,9 @@ func TestExecutorFailedWorkspace(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.FailureTTLMillis = ptr.Ref[int64](failureTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusFailed, build.Status) ticker <- build.Job.CompletedAt.Add(failureTTL * 2) stats := <-statCh @@ -740,9 +740,9 @@ func TestExecutorInactiveWorkspace(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.TimeTilDormantMillis = ptr.Ref[int64](inactiveTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) ticker <- ws.LastUsedAt.Add(inactiveTTL * 2) stats := <-statCh @@ -756,9 +756,9 @@ func mustProvisionWorkspace(t *testing.T, client *codersdk.Client, mut ...func(* user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, mut...) - coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) return coderdtest.MustWorkspace(t, client, ws.ID) } @@ -779,9 +779,9 @@ func mustProvisionWorkspaceWithParameters(t *testing.T, client *codersdk.Client, ProvisionApply: echo.ApplyComplete, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, mut...) - coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) return coderdtest.MustWorkspace(t, client, ws.ID) } diff --git a/coderd/coderd_test.go b/coderd/coderd_test.go index f767e3a7d3571..9823b2b62a123 100644 --- a/coderd/coderd_test.go +++ b/coderd/coderd_test.go @@ -184,9 +184,9 @@ func TestDERPForceWebSockets(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) _ = coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 44a686713739b..bfcf96a5fcc73 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -880,7 +880,7 @@ func MustTransitionWorkspace(t *testing.T, client *codersdk.Client, workspaceID }) require.NoError(t, err, "unexpected error transitioning workspace to %s", to) - _ = AwaitWorkspaceBuildJob(t, client, build.ID) + _ = AwaitWorkspaceBuildJobCompleted(t, client, build.ID) updated := MustWorkspace(t, client, workspace.ID) require.Equal(t, codersdk.WorkspaceTransition(to), updated.LatestBuild.Transition, "expected workspace to be in state %s but got %s", to, updated.LatestBuild.Transition) diff --git a/coderd/coderdtest/coderdtest_test.go b/coderd/coderdtest/coderdtest_test.go index 780b58a569478..455a03dc119b7 100644 --- a/coderd/coderdtest/coderdtest_test.go +++ b/coderd/coderdtest/coderdtest_test.go @@ -19,10 +19,10 @@ func TestNew(t *testing.T) { }) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) _, _ = coderdtest.NewGoogleInstanceIdentity(t, "example", false) _, _ = coderdtest.NewAWSInstanceIdentity(t, "an-instance") diff --git a/coderd/externalauth_test.go b/coderd/externalauth_test.go index b5090b6058804..a5646dfd54a0a 100644 --- a/coderd/externalauth_test.go +++ b/coderd/externalauth_test.go @@ -230,9 +230,9 @@ func TestGitAuthCallback(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -260,9 +260,9 @@ func TestGitAuthCallback(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -330,9 +330,9 @@ func TestGitAuthCallback(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -388,9 +388,9 @@ func TestGitAuthCallback(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -431,9 +431,9 @@ func TestGitAuthCallback(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) diff --git a/coderd/gitsshkey_test.go b/coderd/gitsshkey_test.go index be1f43c52eb2f..6637a20ef7a92 100644 --- a/coderd/gitsshkey_test.go +++ b/coderd/gitsshkey_test.go @@ -112,9 +112,9 @@ func TestAgentGitSSHKey(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) project := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) diff --git a/coderd/insights_test.go b/coderd/insights_test.go index 49b7af0841a5a..b5f467f821013 100644 --- a/coderd/insights_test.go +++ b/coderd/insights_test.go @@ -54,9 +54,9 @@ func TestDeploymentInsights(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) require.Empty(t, template.BuildTimeStats[codersdk.WorkspaceTransitionStart]) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) @@ -131,9 +131,9 @@ func TestUserActivityInsights_SanityCheck(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) require.Empty(t, template.BuildTimeStats[codersdk.WorkspaceTransitionStart]) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Start an agent so that we can generate stats. _ = agenttest.New(t, client.URL, authToken) @@ -219,9 +219,9 @@ func TestUserLatencyInsights(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) require.Empty(t, template.BuildTimeStats[codersdk.WorkspaceTransitionStart]) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Start an agent so that we can generate stats. _ = agenttest.New(t, client.URL, authToken) @@ -585,7 +585,7 @@ func TestTemplateInsights_Golden(t *testing.T) { }) workspace.id = createdWorkspace.ID waitWorkspaces = append(waitWorkspaces, func() { - coderdtest.AwaitWorkspaceBuildJob(t, user.client, createdWorkspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, user.client, createdWorkspace.LatestBuild.ID) ctx := testutil.Context(t, testutil.WaitShort) ws, err := user.client.Workspace(ctx, workspace.id) require.NoError(t, err, "want no error getting workspace") @@ -616,7 +616,7 @@ func TestTemplateInsights_Golden(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // Create template, essentially a modified version of CreateTemplate // where we can control the template ID. @@ -1456,7 +1456,7 @@ func TestUserActivityInsights_Golden(t *testing.T) { createdWorkspace := coderdtest.CreateWorkspace(t, user.client, firstUser.OrganizationID, templateID) workspace.id = createdWorkspace.ID waitWorkspaces = append(waitWorkspaces, func() { - coderdtest.AwaitWorkspaceBuildJob(t, user.client, createdWorkspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, user.client, createdWorkspace.LatestBuild.ID) ctx := testutil.Context(t, testutil.WaitShort) ws, err := user.client.Workspace(ctx, workspace.id) require.NoError(t, err, "want no error getting workspace") @@ -1479,7 +1479,7 @@ func TestUserActivityInsights_Golden(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // Create template, essentially a modified version of CreateTemplate // where we can control the template ID. diff --git a/coderd/prometheusmetrics/prometheusmetrics_test.go b/coderd/prometheusmetrics/prometheusmetrics_test.go index a56a8c4acc133..fb00ced6d9548 100644 --- a/coderd/prometheusmetrics/prometheusmetrics_test.go +++ b/coderd/prometheusmetrics/prometheusmetrics_test.go @@ -299,9 +299,9 @@ func TestAgents(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // given derpMap, _ := tailnettest.RunDERPAndSTUN(t) @@ -506,11 +506,11 @@ func prepareWorkspaceAndAgent(t *testing.T, client *codersdk.Client, user coders ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.Name = fmt.Sprintf("workspace-%d", workspaceNum) }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) diff --git a/coderd/provisionerjobs_test.go b/coderd/provisionerjobs_test.go index 5d1715a9fe52d..2dc5db3bf8efb 100644 --- a/coderd/provisionerjobs_test.go +++ b/coderd/provisionerjobs_test.go @@ -34,9 +34,9 @@ func TestProvisionerJobLogs(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -73,7 +73,7 @@ func TestProvisionerJobLogs(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) diff --git a/coderd/templates_test.go b/coderd/templates_test.go index 3e5ad54e733f6..a218119e266e4 100644 --- a/coderd/templates_test.go +++ b/coderd/templates_test.go @@ -474,7 +474,7 @@ func TestPatchTemplateMeta(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) req := codersdk.UpdateTemplateMeta{ Name: "new-template-name", @@ -1160,7 +1160,7 @@ func TestDeleteTemplate(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1178,7 +1178,7 @@ func TestDeleteTemplate(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -1213,9 +1213,9 @@ func TestTemplateMetrics(t *testing.T) { require.Equal(t, -1, template.ActiveUserCount) require.Empty(t, template.BuildTimeStats[codersdk.WorkspaceTransitionStart]) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go index 7f9c7f54dc203..3416ab0630d31 100644 --- a/coderd/templateversions_test.go +++ b/coderd/templateversions_test.go @@ -229,7 +229,7 @@ func TestPatchCancelTemplateVersion(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -326,7 +326,7 @@ func TestTemplateVersionsExternalAuth(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -356,7 +356,7 @@ func TestTemplateVersionsExternalAuth(t *testing.T) { }, }}, }) - version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) require.Empty(t, version.Job.Error) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -420,7 +420,7 @@ func TestTemplateVersionResources(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -627,7 +627,7 @@ func TestTemplateVersionDryRun(t *testing.T) { }, }, }) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -721,7 +721,7 @@ func TestTemplateVersionDryRun(t *testing.T) { }, }) - version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) require.Equal(t, codersdk.ProvisionerJobSucceeded, version.Job.Status) closer.Close() @@ -745,7 +745,7 @@ func TestTemplateVersionDryRun(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -792,7 +792,7 @@ func TestTemplateVersionDryRun(t *testing.T) { }, }) - version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) require.Equal(t, codersdk.ProvisionerJobSucceeded, version.Job.Status) closer.Close() @@ -974,14 +974,14 @@ func TestPreviousTemplateVersion(t *testing.T) { // from another template templateAVersion1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) coderdtest.CreateTemplate(t, client, user.OrganizationID, templateAVersion1.ID) - coderdtest.AwaitTemplateVersionJob(t, client, templateAVersion1.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateAVersion1.ID) // Create two versions for the template B to be sure if we try to get the // previous version of the first version it will returns a 404 templateBVersion1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) templateB := coderdtest.CreateTemplate(t, client, user.OrganizationID, templateBVersion1.ID) - coderdtest.AwaitTemplateVersionJob(t, client, templateBVersion1.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateBVersion1.ID) templateBVersion2 := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, templateB.ID) - coderdtest.AwaitTemplateVersionJob(t, client, templateBVersion2.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateBVersion2.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1001,14 +1001,14 @@ func TestPreviousTemplateVersion(t *testing.T) { // from another template templateAVersion1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) coderdtest.CreateTemplate(t, client, user.OrganizationID, templateAVersion1.ID) - coderdtest.AwaitTemplateVersionJob(t, client, templateAVersion1.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateAVersion1.ID) // Create two versions for the template B so we can try to get the previous // version of version 2 templateBVersion1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) templateB := coderdtest.CreateTemplate(t, client, user.OrganizationID, templateBVersion1.ID) - coderdtest.AwaitTemplateVersionJob(t, client, templateBVersion1.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateBVersion1.ID) templateBVersion2 := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, templateB.ID) - coderdtest.AwaitTemplateVersionJob(t, client, templateBVersion2.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateBVersion2.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1082,7 +1082,7 @@ func TestTemplateVersionVariables(t *testing.T) { } }, ) - templateVersion := coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + templateVersion := coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // As user passed the value for the first parameter, the job will succeed. require.Empty(t, templateVersion.Job.Error) @@ -1124,7 +1124,7 @@ func TestTemplateVersionVariables(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, createEchoResponses(templateVariables)) - templateVersion := coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + templateVersion := coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // As the first variable is marked as required and misses the default value, // the job will fail, but will populate the template_version_variables table with existing variables. @@ -1177,7 +1177,7 @@ func TestTemplateVersionVariables(t *testing.T) { } }, ) - templateVersion := coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + templateVersion := coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // As user passed the value for the first parameter, the job will succeed. require.Empty(t, templateVersion.Job.Error) @@ -1453,7 +1453,7 @@ func TestTemplateVersionParameters_Order(t *testing.T) { }, ProvisionApply: echo.ApplyComplete, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() diff --git a/coderd/users_test.go b/coderd/users_test.go index d15281b185daf..2c86a09691c05 100644 --- a/coderd/users_test.go +++ b/coderd/users_test.go @@ -334,7 +334,7 @@ func TestDeleteUser(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) anotherClient, another := coderdtest.CreateAnotherUser(t, client, user.OrganizationID) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) coderdtest.CreateWorkspace(t, anotherClient, user.OrganizationID, template.ID) err := client.DeleteUser(context.Background(), another.ID) @@ -1595,7 +1595,7 @@ func TestWorkspacesByUser(t *testing.T) { newUserClient := codersdk.New(client.URL) newUserClient.SetSessionToken(auth.SessionToken) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index d519466a80957..014a2b941d33f 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -64,9 +64,9 @@ func TestWorkspaceAgent(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -108,9 +108,9 @@ func TestWorkspaceAgent(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium) defer cancel() @@ -155,9 +155,9 @@ func TestWorkspaceAgent(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium) defer cancel() @@ -221,9 +221,9 @@ func TestWorkspaceAgent(t *testing.T) { version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResp) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -257,10 +257,10 @@ func TestWorkspaceAgent(t *testing.T) { ID: version.ID, }) require.NoError(t, err) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // Creating another workspace is just easier. workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) require.NoError(t, err) agent, err = client.WorkspaceAgent(ctx, build.Resources[0].Agents[0].ID) require.NoError(t, err) @@ -299,9 +299,9 @@ func TestWorkspaceAgentLogs(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -363,9 +363,9 @@ func TestWorkspaceAgentLogs(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -428,9 +428,9 @@ func TestWorkspaceAgentLogs(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) updates, err := client.WatchWorkspace(ctx, workspace.ID) require.NoError(t, err) @@ -480,9 +480,9 @@ func TestWorkspaceAgentListen(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) @@ -514,9 +514,9 @@ func TestWorkspaceAgentListen(t *testing.T) { }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{ Parse: echo.ParseComplete, @@ -538,7 +538,7 @@ func TestWorkspaceAgentListen(t *testing.T) { }, }}, }, template.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -548,7 +548,7 @@ func TestWorkspaceAgentListen(t *testing.T) { Transition: codersdk.WorkspaceTransitionStop, }) require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, stopBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, stopBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -572,9 +572,9 @@ func TestWorkspaceAgentTailnet(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) daemonCloser.Close() _ = agenttest.New(t, client.URL, authToken) @@ -618,9 +618,9 @@ func TestWorkspaceAgentTailnetDirectDisabled(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) daemonCloser.Close() ctx := testutil.Context(t, testutil.WaitLong) @@ -707,9 +707,9 @@ func TestWorkspaceAgentListeningPorts(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) @@ -954,10 +954,10 @@ func TestWorkspaceAgentAppHealth(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1027,9 +1027,9 @@ func TestWorkspaceAgentReportStats(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -1076,9 +1076,9 @@ func TestWorkspaceAgent_LifecycleState(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) for _, res := range workspace.LatestBuild.Resources { for _, a := range res.Agents { @@ -1186,9 +1186,9 @@ func TestWorkspaceAgent_Metadata(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) for _, res := range workspace.LatestBuild.Resources { for _, a := range res.Agents { @@ -1318,9 +1318,9 @@ func TestWorkspaceAgent_Startup(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -1372,9 +1372,9 @@ func TestWorkspaceAgent_Startup(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(authToken) @@ -1427,9 +1427,9 @@ func TestWorkspaceAgent_UpdatedDERP(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(agentToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentCloser := agenttest.New(t, client.URL, agentToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) diff --git a/coderd/workspaceapps/apptest/setup.go b/coderd/workspaceapps/apptest/setup.go index b1f420dedf5e9..a8e8be2d40de5 100644 --- a/coderd/workspaceapps/apptest/setup.go +++ b/coderd/workspaceapps/apptest/setup.go @@ -345,9 +345,9 @@ func createWorkspaceWithApps(t *testing.T, client *codersdk.Client, orgID uuid.U }}, }) template := coderdtest.CreateTemplate(t, client, orgID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, orgID, template.ID, workspaceMutators...) - workspaceBuild := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + workspaceBuild := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Verify app subdomains for _, app := range workspaceBuild.Resources[0].Agents[0].Apps { diff --git a/coderd/workspaceapps/db_test.go b/coderd/workspaceapps/db_test.go index b201b3e7c57a6..cac5f47b22498 100644 --- a/coderd/workspaceapps/db_test.go +++ b/coderd/workspaceapps/db_test.go @@ -167,9 +167,9 @@ func Test_ResolveRequest(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, firstUser.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, firstUser.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, agentAuthToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID, agentName) diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go index 19d93cadf10cc..5539cc4eef445 100644 --- a/coderd/workspacebuilds_test.go +++ b/coderd/workspacebuilds_test.go @@ -33,7 +33,7 @@ func TestWorkspaceBuild(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -57,7 +57,7 @@ func TestWorkspaceBuildByBuildNumber(t *testing.T) { require.NoError(t, err, "fetch me") version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, first.OrganizationID, template.ID) _, err = client.WorkspaceBuildByUsernameAndWorkspaceNameAndBuildNumber( ctx, @@ -80,7 +80,7 @@ func TestWorkspaceBuildByBuildNumber(t *testing.T) { require.NoError(t, err, "fetch me") version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, first.OrganizationID, template.ID) _, err = client.WorkspaceBuildByUsernameAndWorkspaceNameAndBuildNumber( ctx, @@ -106,7 +106,7 @@ func TestWorkspaceBuildByBuildNumber(t *testing.T) { require.NoError(t, err, "fetch me") version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, first.OrganizationID, template.ID) _, err = client.WorkspaceBuildByUsernameAndWorkspaceNameAndBuildNumber( ctx, @@ -132,7 +132,7 @@ func TestWorkspaceBuildByBuildNumber(t *testing.T) { require.NoError(t, err, "fetch me") version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, first.OrganizationID, template.ID) _, err = client.WorkspaceBuildByUsernameAndWorkspaceNameAndBuildNumber( ctx, @@ -161,7 +161,7 @@ func TestWorkspaceBuilds(t *testing.T) { require.NoError(t, err, "fetch me") version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, first.OrganizationID, template.ID) builds, err := client.WorkspaceBuilds(ctx, codersdk.WorkspaceBuildsRequest{WorkspaceID: workspace.ID}) @@ -197,13 +197,13 @@ func TestWorkspaceBuilds(t *testing.T) { version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace, err := second.CreateWorkspace(ctx, first.OrganizationID, first.UserID.String(), codersdk.CreateWorkspaceRequest{ TemplateID: template.ID, Name: "example", }) require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) err = client.DeleteUser(ctx, secondUser.ID) require.NoError(t, err) @@ -221,9 +221,9 @@ func TestWorkspaceBuilds(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -246,15 +246,15 @@ func TestWorkspaceBuilds(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) var expectedBuilds []codersdk.WorkspaceBuild extraBuilds := 4 for i := 0; i < extraBuilds; i++ { b := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStart) expectedBuilds = append(expectedBuilds, b) - coderdtest.AwaitWorkspaceBuildJob(t, client, b.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, b.ID) } ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -294,10 +294,10 @@ func TestWorkspaceBuildsProvisionerState(t *testing.T) { version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, first.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) build, err := client.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{ TemplateVersionID: workspace.LatestBuild.TemplateVersionID, @@ -306,14 +306,14 @@ func TestWorkspaceBuildsProvisionerState(t *testing.T) { }) require.Nil(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) // A regular user on the very same template must not be able to modify the // state. regularUser, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID) workspace = coderdtest.CreateWorkspace(t, regularUser, first.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, regularUser, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, regularUser, workspace.LatestBuild.ID) _, err = regularUser.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{ TemplateVersionID: workspace.LatestBuild.TemplateVersionID, @@ -339,10 +339,10 @@ func TestWorkspaceBuildsProvisionerState(t *testing.T) { version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, first.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Providing both state and orphan fails. _, err := client.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{ @@ -362,7 +362,7 @@ func TestWorkspaceBuildsProvisionerState(t *testing.T) { Orphan: true, }) require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) _, err = client.Workspace(ctx, workspace.ID) require.Error(t, err) @@ -386,7 +386,7 @@ func TestPatchCancelWorkspaceBuild(t *testing.T) { }}, ProvisionPlan: echo.PlanComplete, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) var build codersdk.WorkspaceBuild @@ -429,7 +429,7 @@ func TestPatchCancelWorkspaceBuild(t *testing.T) { }}, ProvisionPlan: echo.PlanComplete, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID) userClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) @@ -477,10 +477,10 @@ func TestWorkspaceBuildResources(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -526,7 +526,7 @@ func TestWorkspaceBuildLogs(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -564,10 +564,10 @@ func TestWorkspaceBuildState(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -589,7 +589,7 @@ func TestWorkspaceBuildStatus(t *testing.T) { numLogs++ // add an audit log for template version creation numLogs++ // add an audit log for template version update - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) closeDaemon.Close() template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) numLogs++ // add an audit log for template creation @@ -602,7 +602,7 @@ func TestWorkspaceBuildStatus(t *testing.T) { closeDaemon = coderdtest.NewProvisionerDaemon(t, api) // after successful build is "running" - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -615,7 +615,7 @@ func TestWorkspaceBuildStatus(t *testing.T) { // after successful stop is "stopped" build := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) workspace, err = client.Workspace(ctx, workspace.ID) require.NoError(t, err) require.EqualValues(t, codersdk.WorkspaceStatusStopped, workspace.LatestBuild.Status) @@ -638,7 +638,7 @@ func TestWorkspaceBuildStatus(t *testing.T) { _ = coderdtest.NewProvisionerDaemon(t, api) // after successful delete is "deleted" build = coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionDelete) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) workspace, err = client.DeletedWorkspace(ctx, workspace.ID) require.NoError(t, err) require.EqualValues(t, codersdk.WorkspaceStatusDeleted, workspace.LatestBuild.Status) @@ -661,11 +661,11 @@ func TestWorkspaceBuildDebugMode(t *testing.T) { // Template author: create a template version := coderdtest.CreateTemplateVersion(t, adminClient, owner.OrganizationID, nil) template := coderdtest.CreateTemplate(t, adminClient, owner.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, adminClient, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, adminClient, version.ID) // Template author: create a workspace workspace := coderdtest.CreateWorkspace(t, adminClient, owner.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, adminClient, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, adminClient, workspace.LatestBuild.ID) // Template author: try to start a workspace build in debug mode ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -698,11 +698,11 @@ func TestWorkspaceBuildDebugMode(t *testing.T) { // Template owner: create a template version := coderdtest.CreateTemplateVersion(t, templateAuthorClient, templateAuthor.OrganizationID, nil) template := coderdtest.CreateTemplate(t, templateAuthorClient, templateAuthor.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, templateAuthorClient, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, templateAuthorClient, version.ID) // Regular user: create a workspace workspace := coderdtest.CreateWorkspace(t, regularUserClient, templateAuthor.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, regularUserClient, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, regularUserClient, workspace.LatestBuild.ID) // Regular user: try to start a workspace build in debug mode ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -735,11 +735,11 @@ func TestWorkspaceBuildDebugMode(t *testing.T) { // Template author: create a template version := coderdtest.CreateTemplateVersion(t, templateAuthorClient, admin.OrganizationID, nil) template := coderdtest.CreateTemplate(t, templateAuthorClient, admin.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, templateAuthorClient, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, templateAuthorClient, version.ID) // Template author: create a workspace workspace := coderdtest.CreateWorkspace(t, templateAuthorClient, admin.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, templateAuthorClient, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, templateAuthorClient, workspace.LatestBuild.ID) // Template author: try to start a workspace build in debug mode ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -801,11 +801,11 @@ func TestWorkspaceBuildDebugMode(t *testing.T) { } version := coderdtest.CreateTemplateVersion(t, adminClient, admin.OrganizationID, echoResponses) template := coderdtest.CreateTemplate(t, adminClient, admin.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, adminClient, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, adminClient, version.ID) // Create workspace workspace := coderdtest.CreateWorkspace(t, adminClient, admin.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, adminClient, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, adminClient, workspace.LatestBuild.ID) // Create workspace build ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -819,7 +819,7 @@ func TestWorkspaceBuildDebugMode(t *testing.T) { }) require.Nil(t, err) - build = coderdtest.AwaitWorkspaceBuildJob(t, adminClient, build.ID) + build = coderdtest.AwaitWorkspaceBuildJobCompleted(t, adminClient, build.ID) // Watch for incoming logs logs, closer, err := adminClient.WorkspaceBuildLogsAfter(ctx, build.ID, 0) diff --git a/coderd/workspaceresourceauth_test.go b/coderd/workspaceresourceauth_test.go index fdf1bd2335034..99a8d558f54f2 100644 --- a/coderd/workspaceresourceauth_test.go +++ b/coderd/workspaceresourceauth_test.go @@ -43,9 +43,9 @@ func TestPostWorkspaceAuthAzureInstanceIdentity(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -88,9 +88,9 @@ func TestPostWorkspaceAuthAWSInstanceIdentity(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -174,9 +174,9 @@ func TestPostWorkspaceAuthGoogleInstanceIdentity(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go index 171ebb2a0dfd7..9ab6c0e9184a7 100644 --- a/coderd/workspaces_test.go +++ b/coderd/workspaces_test.go @@ -48,7 +48,7 @@ func TestWorkspace(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) authz := coderdtest.AssertRBAC(t, api, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -68,10 +68,10 @@ func TestWorkspace(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -85,7 +85,7 @@ func TestWorkspace(t *testing.T) { Transition: codersdk.WorkspaceTransitionDelete, }) require.NoError(t, err, "delete the workspace") - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) // Getting with deleted=true should work. workspaceNew, err := client.DeletedWorkspace(ctx, workspace.ID) @@ -103,12 +103,12 @@ func TestWorkspace(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) ws1 := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) ws2 := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, ws1.LatestBuild.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, ws2.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws1.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws2.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium) defer cancel() @@ -139,7 +139,7 @@ func TestWorkspace(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) const templateIcon = "/img/icon.svg" const templateDisplayName = "This is template" @@ -192,10 +192,10 @@ func TestWorkspace(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -233,10 +233,10 @@ func TestWorkspace(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -282,10 +282,10 @@ func TestWorkspace(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -316,10 +316,10 @@ func TestAdminViewAllWorkspaces(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -356,29 +356,29 @@ func TestWorkspacesSortOrder(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) firstUser := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, firstUser.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, firstUser.OrganizationID, version.ID) // c-workspace should be running workspace1 := coderdtest.CreateWorkspace(t, client, firstUser.OrganizationID, template.ID, func(ctr *codersdk.CreateWorkspaceRequest) { ctr.Name = "c-workspace" }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace1.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace1.LatestBuild.ID) // b-workspace should be stopped workspace2 := coderdtest.CreateWorkspace(t, client, firstUser.OrganizationID, template.ID, func(ctr *codersdk.CreateWorkspaceRequest) { ctr.Name = "b-workspace" }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace2.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace2.LatestBuild.ID) build2 := coderdtest.CreateWorkspaceBuild(t, client, workspace2, database.WorkspaceTransitionStop) - coderdtest.AwaitWorkspaceBuildJob(t, client, build2.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build2.ID) // a-workspace should be running workspace3 := coderdtest.CreateWorkspace(t, client, firstUser.OrganizationID, template.ID, func(ctr *codersdk.CreateWorkspaceRequest) { ctr.Name = "a-workspace" }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace3.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace3.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -457,7 +457,7 @@ func TestPostWorkspacesByOrganization(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -480,9 +480,9 @@ func TestPostWorkspacesByOrganization(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) verifyAuditWorkspaceCreated(t, auditor, workspace.Name) }) @@ -494,16 +494,16 @@ func TestPostWorkspacesByOrganization(t *testing.T) { versionDefault := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, versionDefault.ID) versionTest := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, template.ID) - coderdtest.AwaitTemplateVersionJob(t, client, versionDefault.ID) - coderdtest.AwaitTemplateVersionJob(t, client, versionTest.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, versionDefault.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, versionTest.ID) defaultWorkspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, uuid.Nil, func(c *codersdk.CreateWorkspaceRequest) { c.TemplateVersionID = versionDefault.ID }, ) testWorkspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, uuid.Nil, func(c *codersdk.CreateWorkspaceRequest) { c.TemplateVersionID = versionTest.ID }, ) - defaultWorkspaceBuild := coderdtest.AwaitWorkspaceBuildJob(t, client, defaultWorkspace.LatestBuild.ID) - testWorkspaceBuild := coderdtest.AwaitWorkspaceBuildJob(t, client, testWorkspace.LatestBuild.ID) + defaultWorkspaceBuild := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, defaultWorkspace.LatestBuild.ID) + testWorkspaceBuild := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, testWorkspace.LatestBuild.ID) require.Equal(t, testWorkspaceBuild.TemplateVersionID, versionTest.ID) require.Equal(t, defaultWorkspaceBuild.TemplateVersionID, versionDefault.ID) @@ -518,8 +518,8 @@ func TestPostWorkspacesByOrganization(t *testing.T) { versionTest := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) versionDefault := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, versionDefault.ID) - coderdtest.AwaitTemplateVersionJob(t, client, versionTest.ID) - coderdtest.AwaitTemplateVersionJob(t, client, versionDefault.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, versionTest.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, versionDefault.ID) name, se := cryptorand.String(8) require.NoError(t, se) @@ -543,7 +543,7 @@ func TestPostWorkspacesByOrganization(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() err := client.DeleteTemplate(ctx, template.ID) @@ -568,13 +568,13 @@ func TestPostWorkspacesByOrganization(t *testing.T) { }) // Given: the template has no default TTL set require.Zero(t, template.DefaultTTLMillis) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // When: we create a workspace with autostop not enabled workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.TTLMillis = ptr.Ref(int64(0)) }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Then: No TTL should be set by the template require.Nil(t, workspace.TTLMillis) @@ -589,11 +589,11 @@ func TestPostWorkspacesByOrganization(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(templateTTL) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.TTLMillis = nil // ensure that no default TTL is set }) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // TTL should be set by the template require.Equal(t, template.DefaultTTLMillis, templateTTL) @@ -608,7 +608,7 @@ func TestPostWorkspacesByOrganization(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -638,7 +638,7 @@ func TestPostWorkspacesByOrganization(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = &exp }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -681,7 +681,7 @@ func TestWorkspaceByOwnerAndName(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -696,10 +696,10 @@ func TestWorkspaceByOwnerAndName(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -710,7 +710,7 @@ func TestWorkspaceByOwnerAndName(t *testing.T) { Transition: codersdk.WorkspaceTransitionDelete, }) require.NoError(t, err, "delete the workspace") - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) // Then: // When we call without includes_deleted, we don't expect to get the workspace back @@ -732,7 +732,7 @@ func TestWorkspaceByOwnerAndName(t *testing.T) { TTLMillis: workspace.TTLMillis, }) require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Then: // We can fetch the most recent workspace @@ -746,7 +746,7 @@ func TestWorkspaceByOwnerAndName(t *testing.T) { Transition: codersdk.WorkspaceTransitionDelete, }) require.NoError(t, err, "delete the workspace") - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) // Then: // When we fetch the deleted workspace, we get the most recently deleted one @@ -1010,7 +1010,7 @@ func TestWorkspaceFilter(t *testing.T) { version := coderdtest.CreateTemplateVersion(t, client, user.Org.ID, nil) // Create a template & workspace in the user's org - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) var template codersdk.Template if i%3 == 0 { @@ -1047,7 +1047,7 @@ func TestWorkspaceFilter(t *testing.T) { // Make sure all workspaces are done. Do it after all are made for i, w := range allWorkspaces { - latest := coderdtest.AwaitWorkspaceBuildJob(t, client, w.Workspace.LatestBuild.ID) + latest := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, w.Workspace.LatestBuild.ID) allWorkspaces[i].Workspace.LatestBuild = latest } @@ -1161,7 +1161,7 @@ func TestWorkspaceFilterManual(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -1197,8 +1197,8 @@ func TestWorkspaceFilterManual(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) version2 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version2.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version2.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) template2 := coderdtest.CreateTemplate(t, client, user.OrganizationID, version2.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -1226,14 +1226,14 @@ func TestWorkspaceFilterManual(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace1 := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) workspace2 := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) // wait for workspaces to be "running" - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace1.LatestBuild.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace2.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace1.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace2.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1245,7 +1245,7 @@ func TestWorkspaceFilterManual(t *testing.T) { // stop workspace1 build1 := coderdtest.CreateWorkspaceBuild(t, client, workspace1, database.WorkspaceTransitionStop) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, build1.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build1.ID) // filter finds one running workspace ws2, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{ @@ -1257,7 +1257,7 @@ func TestWorkspaceFilterManual(t *testing.T) { // stop workspace2 build2 := coderdtest.CreateWorkspaceBuild(t, client, workspace2, database.WorkspaceTransitionStop) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, build2.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build2.ID) // filter finds no running workspaces ws3, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{ @@ -1272,8 +1272,8 @@ func TestWorkspaceFilterManual(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) version2 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version2.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version2.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) template2 := coderdtest.CreateTemplate(t, client, user.OrganizationID, version2.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -1304,9 +1304,9 @@ func TestWorkspaceFilterManual(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1332,9 +1332,9 @@ func TestWorkspaceFilterManual(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) _ = coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) @@ -1379,9 +1379,9 @@ func TestWorkspaceFilterManual(t *testing.T) { }}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium) defer cancel() @@ -1421,7 +1421,7 @@ func TestWorkspaceFilterManual(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // update template with inactivity ttl ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -1435,11 +1435,11 @@ func TestWorkspaceFilterManual(t *testing.T) { assert.Equal(t, inactivityTTL.Milliseconds(), template.TimeTilDormantMillis) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // stop build so workspace is inactive stopBuild := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop) - coderdtest.AwaitWorkspaceBuildJob(t, client, stopBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, stopBuild.ID) res, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{ FilterQuery: fmt.Sprintf("deleting_by:%s", time.Now().Add(inactivityTTL).Format("2006-01-02")), @@ -1465,18 +1465,18 @@ func TestWorkspaceFilterManual(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // update template with inactivity ttl ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() dormantWorkspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, dormantWorkspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, dormantWorkspace.LatestBuild.ID) // Create another workspace to validate that we do not return active workspaces. _ = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, dormantWorkspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, dormantWorkspace.LatestBuild.ID) err := client.UpdateWorkspaceDormancy(ctx, dormantWorkspace.ID, codersdk.UpdateWorkspaceDormancy{ Dormant: true, @@ -1505,7 +1505,7 @@ func TestWorkspaceFilterManual(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // update template with inactivity ttl ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -1513,10 +1513,10 @@ func TestWorkspaceFilterManual(t *testing.T) { now := dbtime.Now() before := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, before.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, before.LatestBuild.ID) after := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, after.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, after.LatestBuild.ID) //nolint:gocritic // Unit testing context err := api.Database.UpdateWorkspaceLastUsedAt(dbauthz.AsSystemRestricted(ctx), database.UpdateWorkspaceLastUsedAtParams{ @@ -1556,7 +1556,7 @@ func TestOffsetLimit(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) _ = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) _ = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -1598,7 +1598,7 @@ func TestPostWorkspaceBuild(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -1622,7 +1622,7 @@ func TestPostWorkspaceBuild(t *testing.T) { ProvisionApply: []*proto.Response{{}}, }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1644,7 +1644,7 @@ func TestPostWorkspaceBuild(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) closer.Close() // Close here so workspace build doesn't process! workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -1668,9 +1668,9 @@ func TestPostWorkspaceBuild(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1691,9 +1691,9 @@ func TestPostWorkspaceBuild(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) wantState := []byte("something") _ = closeDaemon.Close() @@ -1717,9 +1717,9 @@ func TestPostWorkspaceBuild(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -1729,7 +1729,7 @@ func TestPostWorkspaceBuild(t *testing.T) { }) require.NoError(t, err) require.Equal(t, workspace.LatestBuild.BuildNumber+1, build.BuildNumber) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) res, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{ Owner: user.UserID.String(), @@ -1816,7 +1816,7 @@ func TestWorkspaceUpdateAutostart(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true, Auditor: auditor}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = nil @@ -1825,7 +1825,7 @@ func TestWorkspaceUpdateAutostart(t *testing.T) { ) // await job to ensure audit logs for workspace_build start are created - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // ensure test invariant: new workspaces have no autostart schedule. require.Empty(t, workspace.AutostartSchedule, "expected newly-minted workspace to have no autostart schedule") @@ -1895,7 +1895,7 @@ func TestWorkspaceUpdateAutostart(t *testing.T) { }) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = nil @@ -1904,7 +1904,7 @@ func TestWorkspaceUpdateAutostart(t *testing.T) { ) // await job to ensure audit logs for workspace_build start are created - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // ensure test invariant: new workspaces have no autostart schedule. require.Empty(t, workspace.AutostartSchedule, "expected newly-minted workspace to have no autostart schedule") @@ -2001,13 +2001,13 @@ func TestWorkspaceUpdateTTL(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true, Auditor: auditor}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, mutators...) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = nil cwr.TTLMillis = nil }) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -2062,7 +2062,7 @@ func TestWorkspaceUpdateTTL(t *testing.T) { }) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) project = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = nil @@ -2071,7 +2071,7 @@ func TestWorkspaceUpdateTTL(t *testing.T) { ) // await job to ensure audit logs for workspace_build start are created - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // ensure test invariant: new workspaces have no autostart schedule. require.Empty(t, workspace.AutostartSchedule, "expected newly-minted workspace to have no autostart schedule") @@ -2115,12 +2115,12 @@ func TestWorkspaceExtend(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.TTLMillis = ptr.Ref(ttl.Milliseconds()) }) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -2201,10 +2201,10 @@ func TestWorkspaceWatcher(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -2279,7 +2279,7 @@ func TestWorkspaceWatcher(t *testing.T) { }, func(req *codersdk.CreateTemplateVersionRequest) { req.TemplateID = template.ID }) - coderdtest.AwaitTemplateVersionJob(t, client, badVersion.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, badVersion.ID) err = client.UpdateActiveTemplateVersion(ctx, template.ID, codersdk.UpdateActiveTemplateVersion{ ID: badVersion.ID, }) @@ -2360,10 +2360,10 @@ func TestWorkspaceResource(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -2420,10 +2420,10 @@ func TestWorkspaceResource(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -2489,10 +2489,10 @@ func TestWorkspaceResource(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -2564,7 +2564,7 @@ func TestWorkspaceWithRichParameters(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -2599,7 +2599,7 @@ func TestWorkspaceWithRichParameters(t *testing.T) { cwr.RichParameterValues = expectedBuildParameters }) - workspaceBuild := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + workspaceBuild := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, workspaceBuild.Status) workspaceBuildParameters, err := client.WorkspaceBuildParameters(ctx, workspaceBuild.ID) @@ -2655,7 +2655,7 @@ func TestWorkspaceWithOptionalRichParameters(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -2680,7 +2680,7 @@ func TestWorkspaceWithOptionalRichParameters(t *testing.T) { } }) - workspaceBuild := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + workspaceBuild := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, workspaceBuild.Status) workspaceBuildParameters, err := client.WorkspaceBuildParameters(ctx, workspaceBuild.ID) @@ -2749,12 +2749,12 @@ func TestWorkspaceWithEphemeralRichParameters(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Create workspace with default values workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - workspaceBuild := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + workspaceBuild := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, workspaceBuild.Status) // Verify workspace build parameters (default values) @@ -2781,7 +2781,7 @@ func TestWorkspaceWithEphemeralRichParameters(t *testing.T) { }, }) require.NoError(t, err) - workspaceBuild = coderdtest.AwaitWorkspaceBuildJob(t, client, workspaceBuild.ID) + workspaceBuild = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspaceBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, workspaceBuild.Status) // Verify workspace build parameters (including ephemeral) @@ -2805,7 +2805,7 @@ func TestWorkspaceWithEphemeralRichParameters(t *testing.T) { }, }) require.NoError(t, err) - workspaceBuild = coderdtest.AwaitWorkspaceBuildJob(t, client, workspaceBuild.ID) + workspaceBuild = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspaceBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, workspaceBuild.Status) // Verify workspace build parameters (ephemeral should be back to default) @@ -2828,7 +2828,7 @@ func TestWorkspaceDormant(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) timeTilDormantAutoDelete = time.Minute ) @@ -2836,7 +2836,7 @@ func TestWorkspaceDormant(t *testing.T) { ctr.TimeTilDormantAutoDeleteMillis = ptr.Ref[int64](timeTilDormantAutoDelete.Milliseconds()) }) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -2877,10 +2877,10 @@ func TestWorkspaceDormant(t *testing.T) { client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) user = coderdtest.CreateFirstUser(t, client) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) diff --git a/enterprise/coderd/appearance_test.go b/enterprise/coderd/appearance_test.go index e66e664ac7de2..05edf7c11ca14 100644 --- a/enterprise/coderd/appearance_test.go +++ b/enterprise/coderd/appearance_test.go @@ -154,9 +154,9 @@ func TestServiceBanners(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) banner, err := agentClient.GetServiceBanner(ctx) require.NoError(t, err) diff --git a/enterprise/coderd/authorize_test.go b/enterprise/coderd/authorize_test.go index 0daf08cbc8734..8a1fab590acee 100644 --- a/enterprise/coderd/authorize_test.go +++ b/enterprise/coderd/authorize_test.go @@ -40,7 +40,7 @@ func TestCheckACLPermissions(t *testing.T) { require.NoError(t, err) version := coderdtest.CreateTemplateVersion(t, adminClient, adminUser.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, adminClient, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, adminClient, version.ID) template := coderdtest.CreateTemplate(t, adminClient, adminUser.OrganizationID, version.ID) err = adminClient.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{ diff --git a/enterprise/coderd/coderd_test.go b/enterprise/coderd/coderd_test.go index e6756887317c8..873618842b4f8 100644 --- a/enterprise/coderd/coderd_test.go +++ b/enterprise/coderd/coderd_test.go @@ -230,7 +230,7 @@ func TestAuditLogging(t *testing.T) { connected := conn.AwaitReachable(ctx) require.True(t, connected) build := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) }) } diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go index 9c7daccd22c4f..b5516bff2a0bd 100644 --- a/enterprise/coderd/provisionerdaemons_test.go +++ b/enterprise/coderd/provisionerdaemons_test.go @@ -162,7 +162,7 @@ func TestProvisionerDaemonServe(t *testing.T) { }, }) require.NoError(t, err) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) another, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID) _ = closer.Close() @@ -171,7 +171,7 @@ func TestProvisionerDaemonServe(t *testing.T) { }) defer closer.Close() workspace := coderdtest.CreateWorkspace(t, another, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) }) t.Run("PSK", func(t *testing.T) { @@ -285,10 +285,10 @@ func TestProvisionerDaemonServe(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) err = pd.Shutdown(ctx) diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go index ad961368ee928..fe0d7cac2ec76 100644 --- a/enterprise/coderd/templates_test.go +++ b/enterprise/coderd/templates_test.go @@ -45,7 +45,7 @@ func TestTemplates(t *testing.T) { ctr.DefaultTTLMillis = &exp ctr.MaxTTLMillis = &exp }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -105,7 +105,7 @@ func TestTemplates(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.MaxTTLMillis = &exp }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -155,7 +155,7 @@ func TestTemplates(t *testing.T) { }) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) require.Empty(t, 0, template.AutostopRequirement.DaysOfWeek) require.EqualValues(t, 1, template.AutostopRequirement.Weeks) @@ -200,7 +200,7 @@ func TestTemplates(t *testing.T) { }) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) require.EqualValues(t, 0, template.TimeTilDormantMillis) require.EqualValues(t, 0, template.FailureTTLMillis) @@ -251,7 +251,7 @@ func TestTemplates(t *testing.T) { }, }) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) activeWS := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -259,8 +259,8 @@ func TestTemplates(t *testing.T) { require.Nil(t, activeWS.DeletingAt) require.Nil(t, dormantWS.DeletingAt) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, activeWS.LatestBuild.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, dormantWS.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, activeWS.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, dormantWS.LatestBuild.ID) err := client.UpdateWorkspaceDormancy(ctx, dormantWS.ID, codersdk.UpdateWorkspaceDormancy{ Dormant: true, @@ -324,7 +324,7 @@ func TestTemplates(t *testing.T) { }, }) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) activeWS := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -332,8 +332,8 @@ func TestTemplates(t *testing.T) { require.Nil(t, activeWS.DeletingAt) require.Nil(t, dormantWS.DeletingAt) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, activeWS.LatestBuild.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, dormantWS.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, activeWS.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, dormantWS.LatestBuild.ID) err := client.UpdateWorkspaceDormancy(ctx, dormantWS.ID, codersdk.UpdateWorkspaceDormancy{ Dormant: true, @@ -380,7 +380,7 @@ func TestTemplates(t *testing.T) { }, }) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) activeWorkspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) @@ -388,8 +388,8 @@ func TestTemplates(t *testing.T) { require.Nil(t, activeWorkspace.DeletingAt) require.Nil(t, dormantWorkspace.DeletingAt) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, activeWorkspace.LatestBuild.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, dormantWorkspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, activeWorkspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, dormantWorkspace.LatestBuild.ID) err := client.UpdateWorkspaceDormancy(ctx, dormantWorkspace.ID, codersdk.UpdateWorkspaceDormancy{ Dormant: true, diff --git a/enterprise/coderd/workspaceagents_test.go b/enterprise/coderd/workspaceagents_test.go index 5b7ecbe1bcfd8..a5c4ef2063636 100644 --- a/enterprise/coderd/workspaceagents_test.go +++ b/enterprise/coderd/workspaceagents_test.go @@ -111,10 +111,10 @@ func setupWorkspaceAgent(t *testing.T, client *codersdk.Client, user codersdk.Cr }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SDK.HTTPClient = &http.Client{ Transport: &http.Transport{ diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go index 696c2ab96470d..386149902ad5d 100644 --- a/enterprise/coderd/workspaceproxy_test.go +++ b/enterprise/coderd/workspaceproxy_test.go @@ -637,9 +637,9 @@ func TestIssueSignedAppToken(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) workspace.LatestBuild = build // Connect an agent to the workspace @@ -737,9 +737,9 @@ func TestReconnectingPTYSignedToken(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) workspace.LatestBuild = build // Connect an agent to the workspace diff --git a/enterprise/coderd/workspacequota_test.go b/enterprise/coderd/workspacequota_test.go index 69c9a4bc3de88..2d99a4ce31ac5 100644 --- a/enterprise/coderd/workspacequota_test.go +++ b/enterprise/coderd/workspacequota_test.go @@ -108,7 +108,7 @@ func TestWorkspaceQuota(t *testing.T) { }, }}, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Spin up three workspaces fine @@ -118,7 +118,7 @@ func TestWorkspaceQuota(t *testing.T) { go func() { defer wg.Done() workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) assert.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) }() } @@ -127,7 +127,7 @@ func TestWorkspaceQuota(t *testing.T) { // Next one must fail workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Consumed shouldn't bump verifyQuota(ctx, t, client, 4, 4) @@ -145,14 +145,14 @@ func TestWorkspaceQuota(t *testing.T) { Transition: codersdk.WorkspaceTransitionDelete, }) require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) verifyQuota(ctx, t, client, 3, 4) break } // Next one should now succeed workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) verifyQuota(ctx, t, client, 4, 4) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) @@ -195,7 +195,7 @@ func TestWorkspaceQuota(t *testing.T) { }, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // Spin up two workspaces. @@ -204,7 +204,7 @@ func TestWorkspaceQuota(t *testing.T) { for i := 0; i < 2; i++ { workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) workspaces = append(workspaces, workspace) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) assert.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) } wg.Wait() @@ -212,7 +212,7 @@ func TestWorkspaceQuota(t *testing.T) { // Next one must fail workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) require.Contains(t, build.Job.Error, "quota") // Consumed shouldn't bump @@ -220,14 +220,14 @@ func TestWorkspaceQuota(t *testing.T) { require.Equal(t, codersdk.WorkspaceStatusFailed, build.Status) build = coderdtest.CreateWorkspaceBuild(t, client, workspaces[0], database.WorkspaceTransitionStop) - build = coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + build = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) // Quota goes down one verifyQuota(ctx, t, client, 3, 4) require.Equal(t, codersdk.WorkspaceStatusStopped, build.Status) build = coderdtest.CreateWorkspaceBuild(t, client, workspaces[0], database.WorkspaceTransitionStart) - build = coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + build = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID) // Quota goes back up verifyQuota(ctx, t, client, 4, 4) diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go index 324e7aa5a0d22..43f2353b86280 100644 --- a/enterprise/coderd/workspaces_test.go +++ b/enterprise/coderd/workspaces_test.go @@ -128,9 +128,9 @@ func TestWorkspaceAutobuild(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.FailureTTLMillis = ptr.Ref[int64](failureTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusFailed, build.Status) ticker <- build.Job.CompletedAt.Add(failureTTL * 2) stats := <-statCh @@ -174,9 +174,9 @@ func TestWorkspaceAutobuild(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.FailureTTLMillis = ptr.Ref[int64](failureTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusFailed, build.Status) // Make it impossible to trigger the failure TTL. ticker <- build.Job.CompletedAt.Add(-failureTTL * 2) @@ -223,9 +223,9 @@ func TestWorkspaceAutobuild(t *testing.T) { require.Zero(t, template.FailureTTLMillis) require.Zero(t, template.TimeTilDormantAutoDeleteMillis) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) ticker <- time.Now() stats := <-statCh @@ -263,10 +263,10 @@ func TestWorkspaceAutobuild(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.TimeTilDormantMillis = ptr.Ref[int64](inactiveTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) // Simulate being inactive. ticker <- ws.LastUsedAt.Add(inactiveTTL * 2) @@ -319,9 +319,9 @@ func TestWorkspaceAutobuild(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.TimeTilDormantMillis = ptr.Ref[int64](inactiveTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) // Make it impossible to trigger the inactive ttl. ticker <- ws.LastUsedAt.Add(-inactiveTTL) @@ -361,9 +361,9 @@ func TestWorkspaceAutobuild(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.TimeTilDormantAutoDeleteMillis = ptr.Ref[int64](autoDeleteTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Nil(t, ws.DormantAt) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) ticker <- ws.LastUsedAt.Add(autoDeleteTTL * 2) @@ -403,10 +403,10 @@ func TestWorkspaceAutobuild(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.TimeTilDormantMillis = ptr.Ref[int64](inactiveTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) // Stop the workspace so we can assert autobuild does nothing @@ -456,10 +456,10 @@ func TestWorkspaceAutobuild(t *testing.T) { ctr.TimeTilDormantMillis = ptr.Ref[int64](transitionTTL.Milliseconds()) ctr.TimeTilDormantAutoDeleteMillis = ptr.Ref[int64](transitionTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) // Simulate not having accessed the workspace in a while. @@ -475,7 +475,7 @@ func TestWorkspaceAutobuild(t *testing.T) { require.NotNil(t, ws.DormantAt) // Wait for the autobuilder to stop the workspace. - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) // Simulate the workspace being dormant beyond the threshold. ticker <- ws.DormantAt.Add(2 * transitionTTL) @@ -486,7 +486,7 @@ func TestWorkspaceAutobuild(t *testing.T) { // Wait for the workspace to be deleted. ws = coderdtest.MustWorkspace(t, client, ws.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) // Assert that the workspace is actually deleted. _, err := client.Workspace(testutil.Context(t, testutil.WaitShort), ws.ID) @@ -524,9 +524,9 @@ func TestWorkspaceAutobuild(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.TimeTilDormantAutoDeleteMillis = ptr.Ref[int64](dormantTTL.Milliseconds()) }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.Equal(t, codersdk.WorkspaceStatusRunning, build.Status) ctx := testutil.Context(t, testutil.WaitMedium) @@ -583,7 +583,7 @@ func TestWorkspaceAutobuild(t *testing.T) { ProvisionPlan: echo.PlanComplete, ProvisionApply: echo.ApplyComplete, }) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) @@ -593,7 +593,7 @@ func TestWorkspaceAutobuild(t *testing.T) { ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.AutostartSchedule = ptr.Ref(sched.String()) }) - coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) coderdtest.MustTransitionWorkspace(t, client, ws.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop) // Assert that autostart works when the workspace isn't dormant.. @@ -605,7 +605,7 @@ func TestWorkspaceAutobuild(t *testing.T) { require.Equal(t, database.WorkspaceTransitionStart, stats.Transitions[ws.ID]) ws = coderdtest.MustWorkspace(t, client, ws.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) // Now that we've validated that the workspace is eligible for autostart // lets cause it to become dormant. @@ -624,7 +624,7 @@ func TestWorkspaceAutobuild(t *testing.T) { // The workspace should be dormant now. ws = coderdtest.MustWorkspace(t, client, ws.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) require.NotNil(t, ws.DormantAt) // Assert that autostart is no longer triggered since workspace is dormant. @@ -659,7 +659,7 @@ func TestWorkspacesFiltering(t *testing.T) { }) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) // update template with inactivity ttl @@ -673,11 +673,11 @@ func TestWorkspacesFiltering(t *testing.T) { require.Equal(t, dormantTTL.Milliseconds(), template.TimeTilDormantAutoDeleteMillis) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // stop build so workspace is inactive stopBuild := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop) - coderdtest.AwaitWorkspaceBuildJob(t, client, stopBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, stopBuild.ID) err = client.UpdateWorkspaceDormancy(ctx, workspace.ID, codersdk.UpdateWorkspaceDormancy{ Dormant: true, }) @@ -712,7 +712,7 @@ func TestWorkspacesWithoutTemplatePerms(t *testing.T) { }) version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID) user, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID) @@ -741,7 +741,7 @@ func TestWorkspacesWithoutTemplatePerms(t *testing.T) { // Now create another workspace the user can read. version2 := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil) - coderdtest.AwaitTemplateVersionJob(t, client, version2.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version2.ID) template2 := coderdtest.CreateTemplate(t, client, first.OrganizationID, version2.ID) _ = coderdtest.CreateWorkspace(t, user, first.OrganizationID, template2.ID) @@ -769,7 +769,7 @@ func TestWorkspaceLock(t *testing.T) { }) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) dormantTTL = time.Minute ) @@ -778,7 +778,7 @@ func TestWorkspaceLock(t *testing.T) { }) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go index be5c1eee7949d..173fb3df4edff 100644 --- a/enterprise/wsproxy/wsproxy_test.go +++ b/enterprise/wsproxy/wsproxy_test.go @@ -167,9 +167,9 @@ func TestDERP(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) workspace.LatestBuild = build agentID := uuid.Nil @@ -392,9 +392,9 @@ func TestDERPEndToEnd(t *testing.T) { ProvisionApply: echo.ProvisionApplyWithAgent(authToken), }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) workspace.LatestBuild = build agentID := uuid.Nil diff --git a/scaletest/agentconn/run_test.go b/scaletest/agentconn/run_test.go index 70f373dc735de..1ce4dc1e5d015 100644 --- a/scaletest/agentconn/run_test.go +++ b/scaletest/agentconn/run_test.go @@ -251,10 +251,10 @@ func setupRunnerTest(t *testing.T) (client *codersdk.Client, agentID uuid.UUID) }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) diff --git a/scaletest/createworkspaces/run_test.go b/scaletest/createworkspaces/run_test.go index d5e96e22fcc83..524b39499ecc3 100644 --- a/scaletest/createworkspaces/run_test.go +++ b/scaletest/createworkspaces/run_test.go @@ -83,7 +83,7 @@ func Test_Runner(t *testing.T) { }, }) - version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) closer := goEventuallyStartFakeAgent(ctx, t, client, authToken) @@ -182,7 +182,7 @@ func Test_Runner(t *testing.T) { }, }) - version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(request *codersdk.CreateTemplateRequest) { request.AllowUserCancelWorkspaceJobs = ptr.Ref(true) }) @@ -324,7 +324,7 @@ func Test_Runner(t *testing.T) { }, }) - version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) closer := goEventuallyStartFakeAgent(ctx, t, client, authToken) @@ -426,7 +426,7 @@ func Test_Runner(t *testing.T) { }, }) - version = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + version = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) runner := createworkspaces.NewRunner(client, createworkspaces.Config{ @@ -477,7 +477,7 @@ func goEventuallyStartFakeAgent(ctx context.Context, t *testing.T, client *coder time.Sleep(100 * time.Millisecond) } - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(agentToken) diff --git a/scaletest/reconnectingpty/run_test.go b/scaletest/reconnectingpty/run_test.go index 407f1562b59bd..524e2172ab447 100644 --- a/scaletest/reconnectingpty/run_test.go +++ b/scaletest/reconnectingpty/run_test.go @@ -271,10 +271,10 @@ func setupRunnerTest(t *testing.T) (client *codersdk.Client, agentID uuid.UUID) }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) _ = agenttest.New(t, client.URL, authToken) resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) diff --git a/scaletest/workspacebuild/run_test.go b/scaletest/workspacebuild/run_test.go index c07b10f8095b9..335e2d071a4d4 100644 --- a/scaletest/workspacebuild/run_test.go +++ b/scaletest/workspacebuild/run_test.go @@ -103,7 +103,7 @@ func Test_Runner(t *testing.T) { }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // Since the runner creates the workspace on it's own, we have to keep // listing workspaces until we find it, then wait for the build to @@ -127,7 +127,7 @@ func Test_Runner(t *testing.T) { time.Sleep(100 * time.Millisecond) } - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) // Start the three agents. for i, authToken := range []string{authToken1, authToken2, authToken3} { @@ -177,7 +177,7 @@ func Test_Runner(t *testing.T) { workspaces := res.Workspaces require.Len(t, workspaces, 1) - coderdtest.AwaitWorkspaceBuildJob(t, client, workspaces[0].LatestBuild.ID) + coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspaces[0].LatestBuild.ID) coderdtest.AwaitWorkspaceAgents(t, client, workspaces[0].ID) err = runner.Cleanup(ctx, "1") @@ -212,7 +212,7 @@ func Test_Runner(t *testing.T) { }) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) runner := workspacebuild.NewRunner(client, workspacebuild.Config{ OrganizationID: user.OrganizationID, diff --git a/scaletest/workspacetraffic/run_test.go b/scaletest/workspacetraffic/run_test.go index 043ed31cb8533..45e9c6c73a357 100644 --- a/scaletest/workspacetraffic/run_test.go +++ b/scaletest/workspacetraffic/run_test.go @@ -64,12 +64,12 @@ func TestRun(t *testing.T) { }}, }) template = coderdtest.CreateTemplate(t, client, firstUser.OrganizationID, version.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // In order to be picked up as a scaletest workspace, the workspace must be named specifically ws = coderdtest.CreateWorkspace(t, client, firstUser.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.Name = "scaletest-test" }) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) ) // We also need a running agent to run this test. @@ -183,12 +183,12 @@ func TestRun(t *testing.T) { }}, }) template = coderdtest.CreateTemplate(t, client, firstUser.OrganizationID, version.ID) - _ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // In order to be picked up as a scaletest workspace, the workspace must be named specifically ws = coderdtest.CreateWorkspace(t, client, firstUser.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { cwr.Name = "scaletest-test" }) - _ = coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID) + _ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID) ) // We also need a running agent to run this test. From 6dc8fc386684123c1ddda10863bc46b25c05833c Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Mon, 2 Oct 2023 23:23:15 +0000 Subject: [PATCH 3/8] fix: only allow promoting successful template versions --- coderd/coderdtest/coderdtest.go | 36 ++++++++- coderd/insights_test.go | 12 +-- coderd/templateversions.go | 17 ++++ coderd/templateversions_test.go | 80 +++++++++++++++---- coderd/workspaceagents_test.go | 2 +- coderd/workspaces_test.go | 6 +- site/src/components/Pill/Pill.stories.tsx | 8 ++ site/src/components/Pill/Pill.tsx | 10 +-- .../TemplateVersionsPage/VersionRow.tsx | 17 +++- .../VersionsTable.stories.tsx | 56 ++++++++++++- .../TemplateVersionsPage/VersionsTable.tsx | 4 + 11 files changed, 212 insertions(+), 36 deletions(-) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index bfcf96a5fcc73..965ab2b479060 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -760,6 +760,35 @@ func UpdateTemplateVersion(t *testing.T, client *codersdk.Client, organizationID return templateVersion } +func AwaitTemplateVersionJobRunning(t *testing.T, client *codersdk.Client, version uuid.UUID) codersdk.TemplateVersion { + t.Helper() + + ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort) + defer cancel() + + t.Logf("waiting for template version %s build job to start", version) + var templateVersion codersdk.TemplateVersion + require.Eventually(t, func() bool { + var err error + templateVersion, err = client.TemplateVersion(ctx, version) + if err != nil { + return false + } + t.Logf("template version job status: %s", templateVersion.Job.Status) + switch templateVersion.Job.Status { + case codersdk.ProvisionerJobPending: + return false + case codersdk.ProvisionerJobRunning: + return true + default: + t.FailNow() + return false + } + }, testutil.WaitShort, testutil.IntervalFast, "make sure you set `IncludeProvisionerDaemon`!") + t.Logf("template version %s job has started", version) + return templateVersion +} + // AwaitTemplateImportJobCompleted awaits for an import job to reach completed status. func AwaitTemplateVersionJobCompleted(t *testing.T, client *codersdk.Client, version uuid.UUID) codersdk.TemplateVersion { t.Helper() @@ -767,14 +796,15 @@ func AwaitTemplateVersionJobCompleted(t *testing.T, client *codersdk.Client, ver ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() - t.Logf("waiting for template version job %s", version) + t.Logf("waiting for template version %s build job to complete", version) var templateVersion codersdk.TemplateVersion require.Eventually(t, func() bool { var err error templateVersion, err = client.TemplateVersion(ctx, version) + t.Logf("template version job status: %s", templateVersion.Job.Status) return assert.NoError(t, err) && templateVersion.Job.CompletedAt != nil - }, testutil.WaitLong, testutil.IntervalMedium) - t.Logf("got template version job %s", version) + }, testutil.WaitLong, testutil.IntervalMedium, "make sure you set `IncludeProvisionerDaemon`!") + t.Logf("template version %s job has completed", version) return templateVersion } diff --git a/coderd/insights_test.go b/coderd/insights_test.go index b5f467f821013..63bad832c07fc 100644 --- a/coderd/insights_test.go +++ b/coderd/insights_test.go @@ -2078,7 +2078,7 @@ func TestTemplateInsights_RBAC(t *testing.T) { t.Run("AsOwner", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{}) + client := coderdtest.New(t, nil) admin := coderdtest.CreateFirstUser(t, client) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort) @@ -2102,7 +2102,7 @@ func TestTemplateInsights_RBAC(t *testing.T) { t.Run("AsTemplateAdmin", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{}) + client := coderdtest.New(t, nil) admin := coderdtest.CreateFirstUser(t, client) templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin()) @@ -2128,7 +2128,7 @@ func TestTemplateInsights_RBAC(t *testing.T) { t.Run("AsRegularUser", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{}) + client := coderdtest.New(t, nil) admin := coderdtest.CreateFirstUser(t, client) regular, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID) @@ -2207,7 +2207,7 @@ func TestGenericInsights_RBAC(t *testing.T) { t.Run("AsOwner", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{}) + client := coderdtest.New(t, nil) admin := coderdtest.CreateFirstUser(t, client) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort) @@ -2229,7 +2229,7 @@ func TestGenericInsights_RBAC(t *testing.T) { t.Run("AsTemplateAdmin", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{}) + client := coderdtest.New(t, nil) admin := coderdtest.CreateFirstUser(t, client) templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin()) @@ -2253,7 +2253,7 @@ func TestGenericInsights_RBAC(t *testing.T) { t.Run("AsRegularUser", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{}) + client := coderdtest.New(t, nil) admin := coderdtest.CreateFirstUser(t, client) regular, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID) diff --git a/coderd/templateversions.go b/coderd/templateversions.go index cbc9bb0605f0d..62f2f8b15e0b7 100644 --- a/coderd/templateversions.go +++ b/coderd/templateversions.go @@ -20,6 +20,7 @@ import ( "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/provisionerjobs" "github.com/coder/coder/v2/coderd/externalauth" @@ -1038,6 +1039,22 @@ func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Reque }) return } + job, err := api.Database.GetProvisionerJobByID(ctx, version.JobID) + if err != nil { + httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{ + Message: "Internal error fetching template version job status.", + Detail: err.Error(), + }) + return + } + jobStatus := db2sdk.ProvisionerJobStatus(job) + if jobStatus != codersdk.ProvisionerJobSucceeded { + httpapi.Write(ctx, rw, http.StatusPreconditionFailed, codersdk.Response{ + Message: "Only versions that have been built successfully can be promoted.", + Detail: fmt.Sprintf("Attempted to promote a version with a %s build", jobStatus), + }) + return + } err = api.Database.InTx(func(store database.Store) error { err = store.UpdateTemplateActiveVersionByID(ctx, database.UpdateTemplateActiveVersionByIDParams{ diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go index 3416ab0630d31..81f1860cf84e3 100644 --- a/coderd/templateversions_test.go +++ b/coderd/templateversions_test.go @@ -241,7 +241,9 @@ func TestPatchCancelTemplateVersion(t *testing.T) { }) t.Run("AlreadyCanceled", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + }) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{ Parse: echo.ParseComplete, @@ -255,15 +257,7 @@ func TestPatchCancelTemplateVersion(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() - require.Eventually(t, func() bool { - var err error - version, err = client.TemplateVersion(ctx, version.ID) - if !assert.NoError(t, err) { - return false - } - t.Logf("Status: %s", version.Job.Status) - return version.Job.Status == codersdk.ProvisionerJobRunning - }, testutil.WaitShort, testutil.IntervalFast) + coderdtest.AwaitTemplateVersionJobRunning(t, client, version.ID) err := client.CancelTemplateVersion(ctx, version.ID) require.NoError(t, err) err = client.CancelTemplateVersion(ctx, version.ID) @@ -280,7 +274,9 @@ func TestPatchCancelTemplateVersion(t *testing.T) { // Running -> Canceling is the best we can do for now. t.Run("Canceling", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + }) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{ Parse: echo.ParseComplete, @@ -557,13 +553,60 @@ func TestPatchActiveTemplateVersion(t *testing.T) { require.Equal(t, http.StatusNotFound, apiErr.StatusCode()) }) - t.Run("DoesNotBelong", func(t *testing.T) { + t.Run("CanceledBuild", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + }) + user := coderdtest.CreateFirstUser(t, client) + version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) + template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) + version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, template.ID) + + ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) + defer cancel() + + err := client.CancelTemplateVersion(ctx, version.ID) + require.NoError(t, err) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) + err = client.UpdateActiveTemplateVersion(ctx, template.ID, codersdk.UpdateActiveTemplateVersion{ + ID: version.ID, + }) + var apiErr *codersdk.Error + require.ErrorAs(t, err, &apiErr) + require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode()) + }) + + t.Run("PendingBuild", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) + version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, template.ID) + + ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) + defer cancel() + + err := client.UpdateActiveTemplateVersion(ctx, template.ID, codersdk.UpdateActiveTemplateVersion{ + ID: version.ID, + }) + var apiErr *codersdk.Error + require.ErrorAs(t, err, &apiErr) + require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode()) + }) + + t.Run("DoesNotBelong", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + }) + user := coderdtest.CreateFirstUser(t, client) + version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) + template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) + _ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -576,13 +619,18 @@ func TestPatchActiveTemplateVersion(t *testing.T) { require.Equal(t, http.StatusBadRequest, apiErr.StatusCode()) }) - t.Run("Found", func(t *testing.T) { + t.Run("SuccessfulBuild", func(t *testing.T) { t.Parallel() auditor := audit.NewMock() - client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true, Auditor: auditor}) + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + Auditor: auditor, + }) user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) + version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, template.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -592,8 +640,8 @@ func TestPatchActiveTemplateVersion(t *testing.T) { }) require.NoError(t, err) - require.Len(t, auditor.AuditLogs(), 5) - assert.Equal(t, database.AuditActionWrite, auditor.AuditLogs()[4].Action) + require.Len(t, auditor.AuditLogs(), 6) + assert.Equal(t, database.AuditActionWrite, auditor.AuditLogs()[5].Action) }) } diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index 014a2b941d33f..efed0d5b6e741 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -253,11 +253,11 @@ func TestWorkspaceAgent(t *testing.T) { req.TemplateID = template.ID }) + coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) err = client.UpdateActiveTemplateVersion(ctx, template.ID, codersdk.UpdateActiveTemplateVersion{ ID: version.ID, }) require.NoError(t, err) - coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) // Creating another workspace is just easier. workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID) build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID) diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go index 9ab6c0e9184a7..1281677939a91 100644 --- a/coderd/workspaces_test.go +++ b/coderd/workspaces_test.go @@ -426,9 +426,10 @@ func TestPostWorkspacesByOrganization(t *testing.T) { t.Run("NoTemplateAccess", func(t *testing.T) { t.Parallel() - client := coderdtest.New(t, nil) + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + }) first := coderdtest.CreateFirstUser(t, client) - other, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID, rbac.RoleMember(), rbac.RoleOwner()) ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) @@ -440,6 +441,7 @@ func TestPostWorkspacesByOrganization(t *testing.T) { require.NoError(t, err) version := coderdtest.CreateTemplateVersion(t, other, org.ID, nil) template := coderdtest.CreateTemplate(t, other, org.ID, version.ID) + _ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) _, err = client.CreateWorkspace(ctx, first.OrganizationID, codersdk.Me, codersdk.CreateWorkspaceRequest{ TemplateID: template.ID, diff --git a/site/src/components/Pill/Pill.stories.tsx b/site/src/components/Pill/Pill.stories.tsx index 1ec168cf43a9f..869cf87367dd5 100644 --- a/site/src/components/Pill/Pill.stories.tsx +++ b/site/src/components/Pill/Pill.stories.tsx @@ -64,3 +64,11 @@ export const WarningLight: Story = { lightBorder: true, }, }; + +export const Neutral: Story = { + args: { + text: "Neutral", + type: "neutral", + lightBorder: true, + }, +}; diff --git a/site/src/components/Pill/Pill.tsx b/site/src/components/Pill/Pill.tsx index f9c4d9c092156..1d97325188ac0 100644 --- a/site/src/components/Pill/Pill.tsx +++ b/site/src/components/Pill/Pill.tsx @@ -1,13 +1,13 @@ -import { PaletteColor, Theme } from "@mui/material/styles"; +import { type PaletteColor, type Theme } from "@mui/material/styles"; import { makeStyles } from "@mui/styles"; -import { FC } from "react"; -import { PaletteIndex } from "theme/theme"; +import { type FC, type ReactNode } from "react"; +import { type PaletteIndex } from "theme/theme"; import { combineClasses } from "utils/combineClasses"; export interface PillProps { className?: string; - icon?: React.ReactNode; - text: string; + icon?: ReactNode; + text: ReactNode; type?: PaletteIndex; lightBorder?: boolean; title?: string; diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx index 8b8675a8e62d1..725e435b433d8 100644 --- a/site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx +++ b/site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx @@ -32,6 +32,11 @@ export const VersionRow: React.FC = ({ onClick: () => navigate(version.name), }); + const jobStatus = version.job.status; + if (jobStatus === "canceled") { + return null; + } + return ( = ({ {isActive && } {isLatest && } + {jobStatus === "pending" && ( + Pending…} type="warning" lightBorder /> + )} + {jobStatus === "running" && ( + Building…} type="warning" lightBorder /> + )} + {jobStatus === "canceling" && ( + Canceling…} type="neutral" lightBorder /> + )} + {jobStatus === "failed" && } {onPromoteClick && (