Commit8ff73c2

authored and

committed

fix: increase group name limit to 36 from 32 (#14443)

(cherry picked from commit4997691)

1 parentd1cd784 commit8ff73c2Copy full SHA for 8ff73c2

File tree

+35

-4

lines changed

+35

-4

lines changed

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func init() {`
`46`	`46`	`valid:=NameValid(str)`
`47`	`47`	`returnvalid==nil`
`48`	`48`	`}`
`49`		`-for_,tag:=range []string{"username","organization_name","template_name","group_name","workspace_name","oauth2_app_name"} {`
	`49`	`+for_,tag:=range []string{"username","organization_name","template_name","workspace_name","oauth2_app_name"} {`
`50`	`50`	`err:=Validate.RegisterValidation(tag,nameValidator)`
`51`	`51`	`iferr!=nil {`
`52`	`52`	`panic(err)`
`@@ -96,6 +96,20 @@ func init() {`
`96`	`96`	`iferr!=nil {`
`97`	`97`	`panic(err)`
`98`	`98`	`}`
	`99`	`+`
	`100`	`+groupNameValidator:=func(fl validator.FieldLevel)bool {`
	`101`	`+f:=fl.Field().Interface()`
	`102`	`+str,ok:=f.(string)`
	`103`	`+if!ok {`
	`104`	`+returnfalse`
	`105`	`+}`
	`106`	`+valid:=GroupNameValid(str)`
	`107`	`+returnvalid==nil`
	`108`	`+}`
	`109`	`+err=Validate.RegisterValidation("group_name",groupNameValidator)`
	`110`	`+iferr!=nil {`
	`111`	`+panic(err)`
	`112`	`+}`
`99`	`113`	`}`
`100`	`114`
`101`	`115`	`// Is404Error returns true if the given error should return a 404 status code.`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,23 @@ func UserRealNameValid(str string) error {`
`96`	`96`	`returnnil`
`97`	`97`	`}`
`98`	`98`
	`99`	`+// GroupNameValid returns whether the input string is a valid group name.`
	`100`	`+funcGroupNameValid(strstring)error {`
	`101`	`+// 36 is to support using UUIDs as the group name.`
	`102`	`+iflen(str)>36 {`
	`103`	`+returnxerrors.New("must be <= 36 characters")`
	`104`	`+}`
	`105`	`+// Avoid conflicts with routes like /groups/new and /groups/create.`
	`106`	`+ifstr=="new"\|\|str=="create" {`
	`107`	`+returnxerrors.Errorf("cannot use %q as a name",str)`
	`108`	`+}`
	`109`	`+matched:=UsernameValidRegex.MatchString(str)`
	`110`	`+if!matched {`
	`111`	`+returnxerrors.New("must be alphanumeric with hyphens")`
	`112`	`+}`
	`113`	`+returnnil`
	`114`	`+}`
	`115`	`+`
`99`	`116`	`// NormalizeUserRealName normalizes a user name such that it will pass`
`100`	`117`	`// validation by UserRealNameValid. This is done to avoid blocking`
`101`	`118`	`// little Bobby Whitespace from using Coder.`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func TestPatchGroup(t *testing.T) {`
`156`	`156`	`constdisplayName="foobar"`
`157`	`157`	`ctx:=testutil.Context(t,testutil.WaitLong)`
`158`	`158`	`group,err:=userAdminClient.CreateGroup(ctx,user.OrganizationID, codersdk.CreateGroupRequest{`
`159`		`-Name:"hi",`
	`159`	`+Name:"ff7dcee2-e7c4-4bc4-a9e4-84870770e4c5",// GUID should fit.`
`160`	`160`	`AvatarURL:"https://example.com",`
`161`	`161`	`QuotaAllowance:10,`
`162`	`162`	`DisplayName:"",`
`@@ -165,14 +165,14 @@ func TestPatchGroup(t *testing.T) {`
`165`	`165`	`require.Equal(t,10,group.QuotaAllowance)`
`166`	`166`
`167`	`167`	`group,err=userAdminClient.PatchGroup(ctx,group.ID, codersdk.PatchGroupRequest{`
`168`		`-Name:"bye",`
	`168`	`+Name:"ddd502d2-2984-4724-b5bf-1109a4d7462d",// GUID should fit.`
`169`	`169`	`AvatarURL:ptr.Ref("https://google.com"),`
`170`	`170`	`QuotaAllowance:ptr.Ref(20),`
`171`	`171`	`DisplayName:ptr.Ref(displayName),`
`172`	`172`	`})`
`173`	`173`	`require.NoError(t,err)`
`174`	`174`	`require.Equal(t,displayName,group.DisplayName)`
`175`		`-require.Equal(t,"bye",group.Name)`
	`175`	`+require.Equal(t,"ddd502d2-2984-4724-b5bf-1109a4d7462d",group.Name)`
`176`	`176`	`require.Equal(t,"https://google.com",group.AvatarURL)`
`177`	`177`	`require.Equal(t,20,group.QuotaAllowance)`
`178`	`178`	`})`

Comments

(0)