Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf3493e0

Browse files
committed
chore: pass through boolean value
1 parent40618ae commitf3493e0

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

‎coderd/provisionerdserver/provisionerdserver.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,8 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
775775

776776
protoJob.Type=&proto.AcquiredJob_TemplateImport_{
777777
TemplateImport:&proto.AcquiredJob_TemplateImport{
778-
UserVariableValues:convertVariableValues(userVariableValues),
778+
UserVariableValues:convertVariableValues(userVariableValues),
779+
TerraformWorkspaceReuse:false,// TODO: Toggle based on experiment
779780
Metadata:&sdkproto.Metadata{
780781
CoderUrl:s.AccessURL.String(),
781782
// There is no owner for a template import, but we can assume
@@ -3254,9 +3255,10 @@ type TemplateVersionImportJob struct {
32543255
// TemplateID is not guaranteed to be set. Template versions can be created
32553256
// without being associated with a template. Resulting in a template id of
32563257
// `uuid.Nil`
3257-
TemplateID uuid.UUID`json:"template_id"`
3258-
TemplateVersionID uuid.UUID`json:"template_version_id"`
3259-
UserVariableValues []codersdk.VariableValue`json:"user_variable_values"`
3258+
TemplateID uuid.UUID`json:"template_id"`
3259+
TemplateVersionID uuid.UUID`json:"template_version_id"`
3260+
UserVariableValues []codersdk.VariableValue`json:"user_variable_values"`
3261+
TerraformWorkspaceReusebool`json:"terraform_workspace_reuse"`
32603262
}
32613263

32623264
// WorkspaceProvisionJob is the payload for the "workspace_provision" job type.

‎coderd/templateversions.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,9 +1612,10 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
16121612
templateVersionID:=uuid.New()
16131613

16141614
jobInput,err:=json.Marshal(provisionerdserver.TemplateVersionImportJob{
1615-
TemplateID:req.TemplateID,
1616-
TemplateVersionID:templateVersionID,
1617-
UserVariableValues:req.UserVariableValues,
1615+
TemplateID:req.TemplateID,
1616+
TemplateVersionID:templateVersionID,
1617+
UserVariableValues:req.UserVariableValues,
1618+
TerraformWorkspaceReuse:false,// TODO: Use experiment to toggle this feature
16181619
})
16191620
iferr!=nil {
16201621
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{

‎provisionerd/proto/version.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ import "github.com/coder/coder/v2/apiversion"
6060
//
6161
// API v1.12:
6262
// - Added new field `template_version_id` to `provisioner.Metadata`
63+
// - Added new field `terraform_workspace_reuse` to `provisioner.Job.TemplateImport`
64+
// - Added new field `terraform_workspace_reuse` to `provisioner.Job.WorkspaceBuild`
65+
// - Added fields `template_version_id`, `template_id`, and `terraform_workspace_reuse` to `provisioner.Config`
6366
const (
6467
CurrentMajor=1
6568
CurrentMinor=12

‎provisionerd/runner/runner.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,10 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
514514
deferspan.End()
515515

516516
failedJob:=r.configure(&sdkproto.Config{
517-
TemplateSourceArchive:r.job.GetTemplateSourceArchive(),
518-
TemplateId:r.job.GetTemplateImport().Metadata.TemplateId,
519-
TemplateVersionId:r.job.GetTemplateImport().Metadata.TemplateVersionId,
517+
TemplateSourceArchive:r.job.GetTemplateSourceArchive(),
518+
TemplateId:r.job.GetTemplateImport().Metadata.TemplateId,
519+
TemplateVersionId:r.job.GetTemplateImport().Metadata.TemplateVersionId,
520+
TerraformWorkspaceReuse:r.job.GetTemplateImport().TerraformWorkspaceReuse,
520521
})
521522
iffailedJob!=nil {
522523
returnnil,failedJob
@@ -1012,11 +1013,12 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
10121013
}
10131014

10141015
failedJob:=r.configure(&sdkproto.Config{
1015-
TemplateSourceArchive:r.job.GetTemplateSourceArchive(),
1016-
State:r.job.GetWorkspaceBuild().State,
1017-
ProvisionerLogLevel:r.job.GetWorkspaceBuild().LogLevel,
1018-
TemplateId:r.job.GetWorkspaceBuild().Metadata.TemplateId,
1019-
TemplateVersionId:r.job.GetWorkspaceBuild().Metadata.TemplateVersionId,
1016+
TemplateSourceArchive:r.job.GetTemplateSourceArchive(),
1017+
State:r.job.GetWorkspaceBuild().State,
1018+
ProvisionerLogLevel:r.job.GetWorkspaceBuild().LogLevel,
1019+
TemplateId:r.job.GetWorkspaceBuild().Metadata.TemplateId,
1020+
TemplateVersionId:r.job.GetWorkspaceBuild().Metadata.TemplateVersionId,
1021+
TerraformWorkspaceReuse:r.job.GetWorkspaceBuild().TerraformWorkspaceReuse,
10201022
})
10211023
iffailedJob!=nil {
10221024
returnnil,failedJob

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp