synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve template name from working directory "." (#6822)

Browse Source
This commit is contained in:
Ammar Bandukwala
2023-03-27 17:58:20 -05:00
committed by GitHub
parent a2d3635207
commit f88f273cd6
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/templatepush.go
View File

@ -85,8 +85,13 @@ func (pf *templateUploadFlags) templateName(args []string) (string, error) {
if len(args) > 0 { if len(args) > 0 {
return args[0], nil return args[0], nil
} }
// Have to take absPath to resolve "." and "..".
absPath, err := filepath.Abs(pf.directory)
if err != nil {
return "", err
}
// If no name is provided, use the directory name. // If no name is provided, use the directory name.
return filepath.Base(pf.directory), nil return filepath.Base(absPath), nil
} }
func (r *RootCmd) templatePush() *clibase.Cmd { func (r *RootCmd) templatePush() *clibase.Cmd {

14
cli/templatepush_test.go
View File

@ -155,8 +155,9 @@ func TestTemplatePush(t *testing.T) {
require.Equal(t, "example", templateVersions[1].Name) require.Equal(t, "example", templateVersions[1].Name)
}) })
// This test modifies the working directory.
//nolint:paralleltest
t.Run("UseWorkingDir", func(t *testing.T) { t.Run("UseWorkingDir", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
user := coderdtest.CreateFirstUser(t, client) user := coderdtest.CreateFirstUser(t, client)
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@ -173,9 +174,18 @@ func TestTemplatePush(t *testing.T) {
r.Name = filepath.Base(source) r.Name = filepath.Base(source)
}) })
oldDir, err := os.Getwd()
require.NoError(t, err)
os.Chdir(source)
t.Cleanup(func() {
os.Chdir(oldDir)
})
// Don't pass the name of the template, it should use the // Don't pass the name of the template, it should use the
// directory of the source. // directory of the source.
inv, root := clitest.New(t, "templates", "push", "--directory", source, "--test.provisioner", string(database.ProvisionerTypeEcho)) inv, root := clitest.New(t, "templates", "push", "--test.provisioner", string(database.ProvisionerTypeEcho))
clitest.SetupConfig(t, client, root) clitest.SetupConfig(t, client, root)
pty := ptytest.New(t).Attach(inv) pty := ptytest.New(t).Attach(inv)

3
codersdk/organizations.go
View File

@ -221,6 +221,9 @@ func (c *Client) TemplatesByOrganization(ctx context.Context, organizationID uui
// TemplateByName finds a template inside the organization provided with a case-insensitive name. // TemplateByName finds a template inside the organization provided with a case-insensitive name.
func (c *Client) TemplateByName(ctx context.Context, organizationID uuid.UUID, name string) (Template, error) { func (c *Client) TemplateByName(ctx context.Context, organizationID uuid.UUID, name string) (Template, error) {
if name == "" {
return Template{}, xerrors.Errorf("template name cannot be empty")
}
res, err := c.Request(ctx, http.MethodGet, res, err := c.Request(ctx, http.MethodGet,
fmt.Sprintf("/api/v2/organizations/%s/templates/%s", organizationID.String(), name), fmt.Sprintf("/api/v2/organizations/%s/templates/%s", organizationID.String(), name),
nil, nil,