synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: include all templates in cli template list (#13841)

Browse Source 
* chore: cli template list includes all templates

Shows all accessible templates from all organizations
This commit is contained in:
Steven Masley
2024-07-09 06:04:16 -10:00
committed by GitHub
parent f9272046d5
commit 8c33b028d2
4 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
cli/templatelist_test.go
View File

@ -88,9 +88,6 @@ func TestTemplateList(t *testing.T) {
client := coderdtest.New(t, &coderdtest.Options{})
owner := coderdtest.CreateFirstUser(t, client)
org, err := client.Organization(context.Background(), owner.OrganizationID)
require.NoError(t, err)
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
inv, root := clitest.New(t, "templates", "list")
@ -110,8 +107,42 @@ func TestTemplateList(t *testing.T) {
require.NoError(t, <-errC)
pty.ExpectMatch("No templates found in")
pty.ExpectMatch(org.Name)
pty.ExpectMatch("No templates found")
pty.ExpectMatch("Create one:")
})
t.Run("MultiOrg", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
owner := coderdtest.CreateFirstUser(t, client)
// Template in the first organization
firstVersion := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, firstVersion.ID)
_ = coderdtest.CreateTemplate(t, client, owner.OrganizationID, firstVersion.ID)
secondOrg := coderdtest.CreateOrganization(t, client, coderdtest.CreateOrganizationOptions{
IncludeProvisionerDaemon: true,
})
secondVersion := coderdtest.CreateTemplateVersion(t, client, secondOrg.ID, nil)
_ = coderdtest.CreateTemplate(t, client, secondOrg.ID, secondVersion.ID)
// Create a site wide template admin
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
inv, root := clitest.New(t, "templates", "list", "--output=json")
clitest.SetupConfig(t, templateAdmin, root)
ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancelFunc()
out := bytes.NewBuffer(nil)
inv.Stdout = out
err := inv.WithContext(ctx).Run()
require.NoError(t, err)
var templates []codersdk.Template
require.NoError(t, json.Unmarshal(out.Bytes(), &templates))
require.Len(t, templates, 2)
})
}