chore: pass through boolean value

Emyrk · Emyrk · commit f3493e0e0d45 · 2025-10-30T11:28:20.000-05:00
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -775,7 +775,8 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
 
 		protoJob.Type = &proto.AcquiredJob_TemplateImport_{
 			TemplateImport: &proto.AcquiredJob_TemplateImport{
-				UserVariableValues: convertVariableValues(userVariableValues),
+				UserVariableValues:      convertVariableValues(userVariableValues),
+				TerraformWorkspaceReuse: false, // TODO: Toggle based on experiment
 				Metadata: &sdkproto.Metadata{
 					CoderUrl: s.AccessURL.String(),
 					// There is no owner for a template import, but we can assume
@@ -3254,9 +3255,10 @@ type TemplateVersionImportJob struct {
 	// TemplateID is not guaranteed to be set. Template versions can be created
 	// without being associated with a template. Resulting in a template id of
 	// `uuid.Nil`
-	TemplateID         uuid.UUID                `json:"template_id"`
-	TemplateVersionID  uuid.UUID                `json:"template_version_id"`
-	UserVariableValues []codersdk.VariableValue `json:"user_variable_values"`
+	TemplateID              uuid.UUID                `json:"template_id"`
+	TemplateVersionID       uuid.UUID                `json:"template_version_id"`
+	UserVariableValues      []codersdk.VariableValue `json:"user_variable_values"`
+	TerraformWorkspaceReuse bool                     `json:"terraform_workspace_reuse"`
 }
 
 // WorkspaceProvisionJob is the payload for the "workspace_provision" job type.
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1612,9 +1612,10 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 		templateVersionID := uuid.New()
 
 		jobInput, err := json.Marshal(provisionerdserver.TemplateVersionImportJob{
-			TemplateID:         req.TemplateID,
-			TemplateVersionID:  templateVersionID,
-			UserVariableValues: req.UserVariableValues,
+			TemplateID:              req.TemplateID,
+			TemplateVersionID:       templateVersionID,
+			UserVariableValues:      req.UserVariableValues,
+			TerraformWorkspaceReuse: false, // TODO: Use experiment to toggle this feature
 		})
 		if err != nil {
 			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
diff --git a/provisionerd/proto/version.go b/provisionerd/proto/version.go
@@ -60,6 +60,9 @@ import "github.com/coder/coder/v2/apiversion"
 //
 // API v1.12:
 //   - Added new field `template_version_id` to `provisioner.Metadata`
+//   - Added new field `terraform_workspace_reuse` to `provisioner.Job.TemplateImport`
+//   - Added new field `terraform_workspace_reuse` to `provisioner.Job.WorkspaceBuild`
+//   - Added fields `template_version_id`, `template_id`, and `terraform_workspace_reuse` to `provisioner.Config`
 const (
 	CurrentMajor = 1
 	CurrentMinor = 12
diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go
@@ -514,9 +514,10 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
 	defer span.End()
 
 	failedJob := r.configure(&sdkproto.Config{
-		TemplateSourceArchive: r.job.GetTemplateSourceArchive(),
-		TemplateId:            r.job.GetTemplateImport().Metadata.TemplateId,
-		TemplateVersionId:     r.job.GetTemplateImport().Metadata.TemplateVersionId,
+		TemplateSourceArchive:   r.job.GetTemplateSourceArchive(),
+		TemplateId:              r.job.GetTemplateImport().Metadata.TemplateId,
+		TemplateVersionId:       r.job.GetTemplateImport().Metadata.TemplateVersionId,
+		TerraformWorkspaceReuse: r.job.GetTemplateImport().TerraformWorkspaceReuse,
 	})
 	if failedJob != nil {
 		return nil, failedJob
@@ -1012,11 +1013,12 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
 	}
 
 	failedJob := r.configure(&sdkproto.Config{
-		TemplateSourceArchive: r.job.GetTemplateSourceArchive(),
-		State:                 r.job.GetWorkspaceBuild().State,
-		ProvisionerLogLevel:   r.job.GetWorkspaceBuild().LogLevel,
-		TemplateId:            r.job.GetWorkspaceBuild().Metadata.TemplateId,
-		TemplateVersionId:     r.job.GetWorkspaceBuild().Metadata.TemplateVersionId,
+		TemplateSourceArchive:   r.job.GetTemplateSourceArchive(),
+		State:                   r.job.GetWorkspaceBuild().State,
+		ProvisionerLogLevel:     r.job.GetWorkspaceBuild().LogLevel,
+		TemplateId:              r.job.GetWorkspaceBuild().Metadata.TemplateId,
+		TemplateVersionId:       r.job.GetWorkspaceBuild().Metadata.TemplateVersionId,
+		TerraformWorkspaceReuse: r.job.GetWorkspaceBuild().TerraformWorkspaceReuse,
 	})
 	if failedJob != nil {
 		return nil, failedJob
