chore: pass through boolean value

Emyrk · Emyrk · commit 60e940f6a356 · 2025-10-30T11:49:09.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
diff --git a/provisionerd/proto/provisionerd.proto b/provisionerd/proto/provisionerd.proto
@@ -31,7 +31,6 @@ message AcquiredJob {
   message TemplateImport {
     provisioner.Metadata metadata = 1;
     repeated provisioner.VariableValue user_variable_values = 2;
-    bool terraform_workspace_reuse = 3;
   }
   message TemplateDryRun {
     reserved 1;
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

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ message AcquiredJob {`
`31`	`31`	`message TemplateImport {`
`32`	`32`	`provisioner.Metadata metadata = 1;`
`33`	`33`	`repeated provisioner.VariableValue user_variable_values = 2;`
`34`		`- bool terraform_workspace_reuse = 3;`
`35`	`34`	`}`
`36`	`35`	`message TemplateDryRun {`
`37`	`36`	`reserved 1;`