Skip to content

Commit 3a938ed

Browse files
mtojekmtojek
committed
WIP
1 parent a51076a commit 3a938ed

File tree

4 files changed

+126
-3
lines changed

4 files changed

+126
-3
lines changed

‎cli/templatepush.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,15 @@ func (r *RootCmd) templatePush() *serpent.Command {
100100
return err
101101
}
102102

103+
// If user hasn't provided new provisioner tags, inherit ones from the active template version.
104+
if len(tags) == 0 && template.ActiveVersionID != uuid.Nil {
105+
templateVersion, err := client.TemplateVersion(inv.Context(), template.ActiveVersionID)
106+
if err != nil {
107+
return err
108+
}
109+
tags = templateVersion.Job.Tags
110+
}
111+
103112
userVariableValues, err := ParseUserVariableValues(
104113
varsFiles,
105114
variablesFile,

‎cli/templatepush_test.go

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,111 @@ func TestTemplatePush(t *testing.T) {
403403
assert.NotEqual(t, template.ActiveVersionID, templateVersions[1].ID)
404404
})
405405

406+
t.Run("ProvisionerTags", func(t *testing.T) {
407+
t.Parallel()
408+
409+
t.Run("ChangeTags_SameKeyValues", func(t *testing.T) {
410+
t.Parallel()
411+
412+
// Start the tagged provisioner
413+
client := coderdtest.New(t, &coderdtest.Options{
414+
IncludeProvisionerDaemon: true,
415+
ProvisionerDaemonTags: map[string]string{
416+
"docker": "true",
417+
},
418+
})
419+
owner := coderdtest.CreateFirstUser(t, client)
420+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
421+
422+
// Create the template with initial tagged template version.
423+
templateVersion := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil, func(ctvr *codersdk.CreateTemplateVersionRequest) {
424+
ctvr.ProvisionerTags = map[string]string{
425+
"docker": "true",
426+
}
427+
})
428+
templateVersion = coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateVersion.ID)
429+
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, templateVersion.ID)
430+
431+
// Push new template version without provisioner tags. CLI should reuse tags from the previous version.
432+
source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
433+
Parse: echo.ParseComplete,
434+
ProvisionApply: echo.ApplyComplete,
435+
})
436+
inv, root := clitest.New(t, "templates", "push", template.Name, "--directory", source, "--test.provisioner", string(database.ProvisionerTypeEcho), "--name", template.Name,
437+
"--provisioner-tag", "docker=true")
438+
clitest.SetupConfig(t, templateAdmin, root)
439+
pty := ptytest.New(t).Attach(inv)
440+
441+
execDone := make(chan error)
442+
go func() {
443+
execDone <- inv.Run()
444+
}()
445+
446+
matches := []struct {
447+
match string
448+
write string
449+
}{
450+
{match: "Upload", write: "yes"},
451+
}
452+
for _, m := range matches {
453+
pty.ExpectMatch(m.match)
454+
pty.WriteLine(m.write)
455+
}
456+
457+
require.NoError(t, <-execDone)
458+
})
459+
460+
t.Run("DoNotChangeTags", func(t *testing.T) {
461+
t.Parallel()
462+
463+
// Start the tagged provisioner
464+
client := coderdtest.New(t, &coderdtest.Options{
465+
IncludeProvisionerDaemon: true,
466+
ProvisionerDaemonTags: map[string]string{
467+
"docker": "true",
468+
},
469+
})
470+
owner := coderdtest.CreateFirstUser(t, client)
471+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
472+
473+
// Create the template with initial tagged template version.
474+
templateVersion := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil, func(ctvr *codersdk.CreateTemplateVersionRequest) {
475+
ctvr.ProvisionerTags = map[string]string{
476+
"docker": "true",
477+
}
478+
})
479+
templateVersion = coderdtest.AwaitTemplateVersionJobCompleted(t, client, templateVersion.ID)
480+
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, templateVersion.ID)
481+
482+
// Push new template version without provisioner tags. CLI should reuse tags from the previous version.
483+
source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
484+
Parse: echo.ParseComplete,
485+
ProvisionApply: echo.ApplyComplete,
486+
})
487+
inv, root := clitest.New(t, "templates", "push", template.Name, "--directory", source, "--test.provisioner", string(database.ProvisionerTypeEcho), "--name", template.Name)
488+
clitest.SetupConfig(t, templateAdmin, root)
489+
pty := ptytest.New(t).Attach(inv)
490+
491+
execDone := make(chan error)
492+
go func() {
493+
execDone <- inv.Run()
494+
}()
495+
496+
matches := []struct {
497+
match string
498+
write string
499+
}{
500+
{match: "Upload", write: "yes"},
501+
}
502+
for _, m := range matches {
503+
pty.ExpectMatch(m.match)
504+
pty.WriteLine(m.write)
505+
}
506+
507+
require.NoError(t, <-execDone)
508+
})
509+
})
510+
406511
t.Run("Variables", func(t *testing.T) {
407512
t.Parallel()
408513

‎coderd/coderd.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1373,6 +1373,10 @@ func compressHandler(h http.Handler) http.Handler {
13731373
// CreateInMemoryProvisionerDaemon is an in-memory connection to a provisionerd.
13741374
// Useful when starting coderd and provisionerd in the same process.
13751375
func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType) (client proto.DRPCProvisionerDaemonClient, err error) {
1376+
return api.CreateInMemoryTaggedProvisionerDaemon(dialCtx, name, provisionerTypes, nil)
1377+
}
1378+
1379+
func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, name string, provisionerTypes []codersdk.ProvisionerType, provisionerTags map[string]string) (client proto.DRPCProvisionerDaemonClient, err error) {
13761380
tracer := api.TracerProvider.Tracer(tracing.TracerName)
13771381
clientSession, serverSession := drpc.MemTransportPipe()
13781382
defer func() {
@@ -1400,7 +1404,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(dialCtx context.Context, name st
14001404
OrganizationID: defaultOrg.ID,
14011405
CreatedAt: dbtime.Now(),
14021406
Provisioners: dbTypes,
1403-
Tags: provisionersdk.MutateTags(uuid.Nil, nil),
1407+
Tags: provisionersdk.MutateTags(uuid.Nil, provisionerTags),
14041408
LastSeenAt: sql.NullTime{Time: dbtime.Now(), Valid: true},
14051409
Version: buildinfo.Version(),
14061410
APIVersion: proto.CurrentVersion.String(),

‎coderd/coderdtest/coderdtest.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ type Options struct {
125125

126126
// IncludeProvisionerDaemon when true means to start an in-memory provisionerD
127127
IncludeProvisionerDaemon bool
128+
ProvisionerDaemonTags map[string]string
128129
MetricsCacheRefreshInterval time.Duration
129130
AgentStatsRefreshInterval time.Duration
130131
DeploymentValues *codersdk.DeploymentValues
@@ -512,7 +513,7 @@ func NewWithAPI(t testing.TB, options *Options) (*codersdk.Client, io.Closer, *c
512513
setHandler(coderAPI.RootHandler)
513514
var provisionerCloser io.Closer = nopcloser{}
514515
if options.IncludeProvisionerDaemon {
515-
provisionerCloser = NewProvisionerDaemon(t, coderAPI)
516+
provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, options.ProvisionerDaemonTags)
516517
}
517518
client := codersdk.New(serverURL)
518519
t.Cleanup(func() {
@@ -552,6 +553,10 @@ func (c *provisionerdCloser) Close() error {
552553
// well with coderd testing. It registers the "echo" provisioner for
553554
// quick testing.
554555
func NewProvisionerDaemon(t testing.TB, coderAPI *coderd.API) io.Closer {
556+
return NewTaggedProvisionerDaemon(t, coderAPI, nil)
557+
}
558+
559+
func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, provisionerTags map[string]string) io.Closer {
555560
t.Helper()
556561

557562
// t.Cleanup runs in last added, first called order. t.TempDir() will delete
@@ -578,7 +583,7 @@ func NewProvisionerDaemon(t testing.TB, coderAPI *coderd.API) io.Closer {
578583
}()
579584

580585
daemon := provisionerd.New(func(dialCtx context.Context) (provisionerdproto.DRPCProvisionerDaemonClient, error) {
581-
return coderAPI.CreateInMemoryProvisionerDaemon(dialCtx, "test", []codersdk.ProvisionerType{codersdk.ProvisionerTypeEcho})
586+
return coderAPI.CreateInMemoryTaggedProvisionerDaemon(dialCtx, "test", []codersdk.ProvisionerType{codersdk.ProvisionerTypeEcho}, provisionerTags)
582587
}, &provisionerd.Options{
583588
Logger: coderAPI.Logger.Named("provisionerd").Leveled(slog.LevelDebug),
584589
UpdateInterval: 250 * time.Millisecond,

0 commit comments

Comments
 (0)