fix

coder · deansheather · Jun 1, 2022 · May 25, 2022 · May 27, 2022 · May 27, 2022
commit 4078fd112e0286fab9d1ea0e83768c9d3d9a10d7
diff --git a/cli/create.go b/cli/create.go
@@ -173,6 +173,7 @@ func create() *cobra.Command {
 			// Run a plan with the given parameters to check correctness
 			after := time.Now()
 			planJob, err := client.CreateTemplateVersionPlan(cmd.Context(), templateVersion.ID, codersdk.CreateTemplateVersionPlanRequest{
+				WorkspaceName:   workspaceName,
 				ParameterValues: parameters,
 			})
 			if err != nil {

diff --git a/...000014_provisioner_job_type_plan.down.sql → ...000099_provisioner_job_type_plan.down.sql b/...000014_provisioner_job_type_plan.down.sql → ...000099_provisioner_job_type_plan.down.sql
diff --git a/...s/000014_provisioner_job_type_plan.up.sql → ...s/000099_provisioner_job_type_plan.up.sql b/...s/000014_provisioner_job_type_plan.up.sql → ...s/000099_provisioner_job_type_plan.up.sql
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -113,6 +113,7 @@ type workspaceProvisionJob struct {
 // The input for a "template_version_plan" job.
 type templateVersionPlanJob struct {
 	TemplateVersionID uuid.UUID                 `json:"template_version_id"`
+	WorkspaceName     string                    `json:"workspace_name"`
 	ParameterValues   []database.ParameterValue `json:"parameter_values"`
 }
 
@@ -287,7 +288,8 @@ func (server *provisionerdServer) AcquireJob(ctx context.Context, _ *proto.Empty
 			TemplatePlan: &proto.AcquiredJob_TemplatePlan{
 				ParameterValues: protoParameters,
 				Metadata: &sdkproto.Provision_Metadata{
-					CoderUrl: server.AccessURL.String(),
+					CoderUrl:      server.AccessURL.String(),
+					WorkspaceName: input.WorkspaceName,
 				},
 			},
 		}

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -213,6 +213,7 @@ func (api *API) createTemplateVersionPlan(rw http.ResponseWriter, r *http.Reques
 	// Marshal template version plan job with the parameters from the request.
 	input, err := json.Marshal(templateVersionPlanJob{
 		TemplateVersionID: templateVersion.ID,
+		WorkspaceName:     req.WorkspaceName,
 		ParameterValues:   parameterValues,
 	})
 	if err != nil {

diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
@@ -505,16 +505,11 @@ func TestTemplateVersionPlan(t *testing.T) {
 			defer close(logsDone)
 
 			logCount := 0
-			for {
-				select {
-				case _, ok := <-logs:
-					if !ok {
-						assert.GreaterOrEqual(t, logCount, 1, "unexpected log count")
-						return
-					}
-					logCount++
-				}
+			for range logs {
+				logCount++
 			}
+			assert.GreaterOrEqual(t, logCount, 1, "unexpected log count")
+			return
 		}()
 
 		// Wait for the job to complete

diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -119,6 +119,7 @@ func (c *Client) TemplateVersionLogsAfter(ctx context.Context, version uuid.UUID
 // CreateTemplateVersionPlanRequest defines the request parameters for
 // CreateTemplateVersionPlan.
 type CreateTemplateVersionPlanRequest struct {
+	WorkspaceName   string
 	ParameterValues []CreateParameterRequest
 }