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

Commit0428c5e

Browse files
authored
chore: include 'everyone' group in template importing (#18257)
1 parent8a70b8d commit0428c5e

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,9 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
739739
Metadata:&sdkproto.Metadata{
740740
CoderUrl:s.AccessURL.String(),
741741
WorkspaceName:input.WorkspaceName,
742+
// There is no owner for a template import, but we can assume
743+
// the "Everyone" group as a placeholder.
744+
WorkspaceOwnerGroups: []string{database.EveryoneGroup},
742745
},
743746
},
744747
}
@@ -759,6 +762,9 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
759762
UserVariableValues:convertVariableValues(userVariableValues),
760763
Metadata:&sdkproto.Metadata{
761764
CoderUrl:s.AccessURL.String(),
765+
// There is no owner for a template import, but we can assume
766+
// the "Everyone" group as a placeholder.
767+
WorkspaceOwnerGroups: []string{database.EveryoneGroup},
762768
},
763769
},
764770
}

‎coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,9 @@ func TestAcquireJob(t *testing.T) {
568568
want,err:=json.Marshal(&proto.AcquiredJob_TemplateDryRun_{
569569
TemplateDryRun:&proto.AcquiredJob_TemplateDryRun{
570570
Metadata:&sdkproto.Metadata{
571-
CoderUrl: (&url.URL{}).String(),
572-
WorkspaceName:"testing",
571+
CoderUrl: (&url.URL{}).String(),
572+
WorkspaceName:"testing",
573+
WorkspaceOwnerGroups: []string{database.EveryoneGroup},
573574
},
574575
},
575576
})
@@ -600,7 +601,8 @@ func TestAcquireJob(t *testing.T) {
600601
want,err:=json.Marshal(&proto.AcquiredJob_TemplateImport_{
601602
TemplateImport:&proto.AcquiredJob_TemplateImport{
602603
Metadata:&sdkproto.Metadata{
603-
CoderUrl: (&url.URL{}).String(),
604+
CoderUrl: (&url.URL{}).String(),
605+
WorkspaceOwnerGroups: []string{database.EveryoneGroup},
604606
},
605607
},
606608
})
@@ -643,7 +645,8 @@ func TestAcquireJob(t *testing.T) {
643645
{Name:"first",Sensitive:true,Value:"first_value"},
644646
},
645647
Metadata:&sdkproto.Metadata{
646-
CoderUrl: (&url.URL{}).String(),
648+
CoderUrl: (&url.URL{}).String(),
649+
WorkspaceOwnerGroups: []string{database.EveryoneGroup},
647650
},
648651
},
649652
})

‎provisionerd/runner/runner.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,8 +552,9 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
552552
CreatedAt:time.Now().UnixMilli(),
553553
})
554554
startProvision,err:=r.runTemplateImportProvision(ctx,updateResponse.VariableValues,&sdkproto.Metadata{
555-
CoderUrl:r.job.GetTemplateImport().Metadata.CoderUrl,
556-
WorkspaceTransition:sdkproto.WorkspaceTransition_START,
555+
CoderUrl:r.job.GetTemplateImport().Metadata.CoderUrl,
556+
WorkspaceOwnerGroups:r.job.GetTemplateImport().Metadata.WorkspaceOwnerGroups,
557+
WorkspaceTransition:sdkproto.WorkspaceTransition_START,
557558
})
558559
iferr!=nil {
559560
returnnil,r.failedJobf("template import provision for start: %s",err)
@@ -567,8 +568,9 @@ func (r *Runner) runTemplateImport(ctx context.Context) (*proto.CompletedJob, *p
567568
CreatedAt:time.Now().UnixMilli(),
568569
})
569570
stopProvision,err:=r.runTemplateImportProvision(ctx,updateResponse.VariableValues,&sdkproto.Metadata{
570-
CoderUrl:r.job.GetTemplateImport().Metadata.CoderUrl,
571-
WorkspaceTransition:sdkproto.WorkspaceTransition_STOP,
571+
CoderUrl:r.job.GetTemplateImport().Metadata.CoderUrl,
572+
WorkspaceOwnerGroups:r.job.GetTemplateImport().Metadata.WorkspaceOwnerGroups,
573+
WorkspaceTransition:sdkproto.WorkspaceTransition_STOP,
572574
})
573575
iferr!=nil {
574576
returnnil,r.failedJobf("template import provision for stop: %s",err)

0 commit comments

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