Commit43ac0f0

committed

fix: display the correct response for coder list

1 parent3590102 commit43ac0f0Copy full SHA for 43ac0f0

File tree

+35

-1

lines changed

+35

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,10 @@ func (f *OutputFormatter) Format(ctx context.Context, data any) (string, error)`
`83`	`83`	`return"",xerrors.Errorf("unknown output format %q",f.formatID)`
`84`	`84`	`}`
`85`	`85`
	`86`	`+func (f*OutputFormatter)IsMachineReadableFormat()bool {`
	`87`	`+returnf.formatID=="json"`
	`88`	`+}`
	`89`	`+`
`86`	`90`	`typetableFormatstruct {`
`87`	`91`	`defaultColumns []string`
`88`	`92`	`allColumns []string`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (r RootCmd) list() serpent.Command {`
`112`	`112`	`returnerr`
`113`	`113`	`}`
`114`	`114`
`115`		`-iflen(res)==0 {`
	`115`	`+iflen(res)==0&&!formatter.IsMachineReadableFormat(){`
`116`	`116`	`pretty.Fprintf(inv.Stderr,cliui.DefaultStyles.Prompt,"No workspaces found! Create one:\n")`
`117`	`117`	`_,_=fmt.Fprintln(inv.Stderr)`
`118`	`118`	`_,_=fmt.Fprintln(inv.Stderr," "+pretty.Sprint(cliui.DefaultStyles.Code,"coder create <name>"))`

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"context"`
`6`	`6`	`"encoding/json"`
	`7`	`+"fmt"`
`7`	`8`	`"testing"`
`8`	`9`
`9`	`10`	`"github.com/stretchr/testify/assert"`
`@@ -74,4 +75,33 @@ func TestList(t *testing.T) {`
`74`	`75`	`require.NoError(t,json.Unmarshal(out.Bytes(),&workspaces))`
`75`	`76`	`require.Len(t,workspaces,1)`
`76`	`77`	`})`
	`78`	`+`
	`79`	`+t.Run("NoWorkspacesJSON",func(t*testing.T) {`
	`80`	`+t.Parallel()`
	`81`	`+client:=coderdtest.New(t,nil)`
	`82`	`+owner:=coderdtest.CreateFirstUser(t,client)`
	`83`	`+member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)`
	`84`	`+`
	`85`	`+inv,root:=clitest.New(t,"list","--output=json")`
	`86`	`+clitest.SetupConfig(t,member,root)`
	`87`	`+`
	`88`	`+ctx,cancelFunc:=context.WithTimeout(context.Background(),testutil.WaitLong)`
	`89`	`+defercancelFunc()`
	`90`	`+`
	`91`	`+stdout:=bytes.NewBuffer(nil)`
	`92`	`+stderr:=bytes.NewBuffer(nil)`
	`93`	`+inv.Stdout=stdout`
	`94`	`+inv.Stderr=stderr`
	`95`	`+err:=inv.WithContext(ctx).Run()`
	`96`	`+require.NoError(t,err)`
	`97`	`+`
	`98`	`+fmt.Printf("stdout.Bytes: %s\n",stdout.Bytes())`
	`99`	`+fmt.Printf("stderr.Bytes: %s\n",stderr.Bytes())`
	`100`	`+`
	`101`	`+varworkspaces []codersdk.Workspace`
	`102`	`+require.NoError(t,json.Unmarshal(stdout.Bytes(),&workspaces))`
	`103`	`+require.Len(t,workspaces,0)`
	`104`	`+`
	`105`	`+require.Len(t,stderr.Bytes(),0)`
	`106`	`+})`
`77`	`107`	`}`

Comments

(0)