Commitf88f273

authored

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

1 parenta2d3635 commitf88f273Copy full SHA for f88f273

File tree

+21

-3

lines changed

+21

-3

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,13 @@ func (pf *templateUploadFlags) templateName(args []string) (string, error) {`
`85`	`85`	`iflen(args)>0 {`
`86`	`86`	`returnargs[0],nil`
`87`	`87`	`}`
	`88`	`+// Have to take absPath to resolve "." and "..".`
	`89`	`+absPath,err:=filepath.Abs(pf.directory)`
	`90`	`+iferr!=nil {`
	`91`	`+return"",err`
	`92`	`+}`
`88`	`93`	`// If no name is provided, use the directory name.`
`89`		`-returnfilepath.Base(pf.directory),nil`
	`94`	`+returnfilepath.Base(absPath),nil`
`90`	`95`	`}`
`91`	`96`
`92`	`97`	`func (rRootCmd)templatePush()clibase.Cmd {`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,9 @@ func TestTemplatePush(t *testing.T) {`
`155`	`155`	`require.Equal(t,"example",templateVersions[1].Name)`
`156`	`156`	`})`
`157`	`157`
	`158`	`+// This test modifies the working directory.`
	`159`	`+//nolint:paralleltest`
`158`	`160`	`t.Run("UseWorkingDir",func(t*testing.T) {`
`159`		`-t.Parallel()`
`160`	`161`	`client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})`
`161`	`162`	`user:=coderdtest.CreateFirstUser(t,client)`
`162`	`163`	`version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)`
`@@ -173,9 +174,18 @@ func TestTemplatePush(t *testing.T) {`
`173`	`174`	`r.Name=filepath.Base(source)`
`174`	`175`	`})`
`175`	`176`
	`177`	`+oldDir,err:=os.Getwd()`
	`178`	`+require.NoError(t,err)`
	`179`	`+`
	`180`	`+os.Chdir(source)`
	`181`	`+`
	`182`	`+t.Cleanup(func() {`
	`183`	`+os.Chdir(oldDir)`
	`184`	`+})`
	`185`	`+`
`176`	`186`	`// Don't pass the name of the template, it should use the`
`177`	`187`	`// directory of the source.`
`178`		`-inv,root:=clitest.New(t,"templates","push","--directory",source,"--test.provisioner",string(database.ProvisionerTypeEcho))`
	`188`	`+inv,root:=clitest.New(t,"templates","push","--test.provisioner",string(database.ProvisionerTypeEcho))`
`179`	`189`	`clitest.SetupConfig(t,client,root)`
`180`	`190`	`pty:=ptytest.New(t).Attach(inv)`
`181`	`191`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,9 @@ func (c *Client) TemplatesByOrganization(ctx context.Context, organizationID uui`
`221`	`221`
`222`	`222`	`// TemplateByName finds a template inside the organization provided with a case-insensitive name.`
`223`	`223`	`func (c*Client)TemplateByName(ctx context.Context,organizationID uuid.UUID,namestring) (Template,error) {`
	`224`	`+ifname=="" {`
	`225`	`+returnTemplate{},xerrors.Errorf("template name cannot be empty")`
	`226`	`+}`
`224`	`227`	`res,err:=c.Request(ctx,http.MethodGet,`
`225`	`228`	`fmt.Sprintf("/api/v2/organizations/%s/templates/%s",organizationID.String(),name),`
`226`	`229`	`nil,`

Comments

(0)