Commitb64c69b

committed

chore: table formatter to correctly handle slices

1 parentf7668c1 commitb64c69bCopy full SHA for b64c69b

File tree

+22

-3

lines changed

+22

-3

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,21 @@ func renderTable(out any, sort string, headers table.Row, filterColumns []string`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`
	`208`	`+rt:=reflect.TypeOf(v)`
	`209`	`+switchrt.Kind() {`
	`210`	`+casereflect.Slice:`
	`211`	`+// By default, the behavior is '%v', which just returns a string like`
	`212`	`+// '[a b c]'. This will add commas in between each value.`
	`213`	`+strs:=make([]string,0)`
	`214`	`+vt:=reflect.ValueOf(v)`
	`215`	`+fori:=0;i<vt.Len();i++ {`
	`216`	`+strs=append(strs,fmt.Sprintf("%v",vt.Index(i).Interface()))`
	`217`	`+}`
	`218`	`+v="["+strings.Join(strs,", ")+"]"`
	`219`	`+default:`
	`220`	`+// Leave it as it is`
	`221`	`+}`
	`222`	`+`
`208`	`223`	`rowSlice[i]=v`
`209`	`224`	`}`
`210`	`225`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ import (`
`15`	`15`	`"github.com/coder/coder/v2/testutil"`
`16`	`16`	`)`
`17`	`17`
`18`		`-funcTestEnterpriseListOrganization(t*testing.T) {`
	`18`	`+funcTestEnterpriseListOrganizationMembers(t*testing.T) {`
	`19`	`+t.Parallel()`
	`20`	`+`
`19`	`21`	`t.Run("CustomRole",func(t*testing.T) {`
`20`	`22`	`t.Parallel()`
`21`	`23`
`@@ -29,9 +31,11 @@ func TestEnterpriseListOrganization(t *testing.T) {`
`29`	`31`	`Features: license.Features{`
`30`	`32`	`codersdk.FeatureCustomRoles:1,`
`31`	`33`	`},`
`32`		`-}})`
	`34`	`+},`
	`35`	`+})`
`33`	`36`
`34`	`37`	`ctx:=testutil.Context(t,testutil.WaitMedium)`
	`38`	`+//nolint:gocritic // only owners can patch roles`
`35`	`39`	`customRole,err:=ownerClient.PatchOrganizationRole(ctx,owner.OrganizationID, codersdk.Role{`
`36`	`40`	`Name:"custom",`
`37`	`41`	`OrganizationID:owner.OrganizationID.String(),`
`@@ -47,7 +51,7 @@ func TestEnterpriseListOrganization(t *testing.T) {`
`47`	`51`	`client,user:=coderdtest.CreateAnotherUser(t,ownerClient,owner.OrganizationID,rbac.RoleUserAdmin(), rbac.RoleIdentifier{`
`48`	`52`	`Name:customRole.Name,`
`49`	`53`	`OrganizationID:owner.OrganizationID,`
`50`		`-})`
	`54`	`+},rbac.ScopedRoleOrgAdmin(owner.OrganizationID))`
`51`	`55`
`52`	`56`	`inv,root:=clitest.New(t,"organization","members","-c","user_id,username,organization_roles")`
`53`	`57`	`clitest.SetupConfig(t,client,root)`

Comments

(0)