Commit8a7b733

committed

chore(cli): validate various names locally

1 parentb8e14b0 commit8a7b733Copy full SHA for 8a7b733

File tree

+55

-8

lines changed

+55

-8

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,11 @@ func (r RootCmd) create() serpent.Command {`
`60`	`60`	`workspaceName,err=cliui.Prompt(inv, cliui.PromptOptions{`
`61`	`61`	`Text:"Specify a name for your workspace:",`
`62`	`62`	`Validate:func(workspaceNamestring)error {`
`63`		`-_,err=client.WorkspaceByOwnerAndName(inv.Context(),codersdk.Me,workspaceName, codersdk.WorkspaceOptions{})`
	`63`	`+err=codersdk.NameValid(workspaceName)`
	`64`	`+iferr!=nil {`
	`65`	`+returnxerrors.Errorf("Workspace name %s",err)`
	`66`	`+}`
	`67`	`+_,err=client.WorkspaceByOwnerAndName(inv.Context(),workspaceOwner,workspaceName, codersdk.WorkspaceOptions{})`
`64`	`68`	`iferr==nil {`
`65`	`69`	`returnxerrors.Errorf("A workspace already exists named %q!",workspaceName)`
`66`	`70`	`}`
`@@ -71,7 +75,10 @@ func (r RootCmd) create() serpent.Command {`
`71`	`75`	`returnerr`
`72`	`76`	`}`
`73`	`77`	`}`
`74`		`-`
	`78`	`+err=codersdk.NameValid(workspaceName)`
	`79`	`+iferr!=nil {`
	`80`	`+returnxerrors.Errorf("Workspace name %s",err)`
	`81`	`+}`
`75`	`82`	`_,err=client.WorkspaceByOwnerAndName(inv.Context(),workspaceOwner,workspaceName, codersdk.WorkspaceOptions{})`
`76`	`83`	`iferr==nil {`
`77`	`84`	`returnxerrors.Errorf("A workspace already exists named %q!",workspaceName)`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ func (r RootCmd) createOrganization() serpent.Command {`
`30`	`30`	`Handler:func(inv*serpent.Invocation)error {`
`31`	`31`	`orgName:=inv.Args[0]`
`32`	`32`
	`33`	`+err:=codersdk.NameValid(orgName)`
	`34`	`+iferr!=nil {`
	`35`	`+returnxerrors.Errorf("Organization name %w",err)`
	`36`	`+}`
	`37`	`+`
`33`	`38`	`// This check is not perfect since not all users can read all organizations.`
`34`	`39`	`// So ignore the error and if the org already exists, prevent the user`
`35`	`40`	`// from creating it.`
`@@ -38,7 +43,7 @@ func (r RootCmd) createOrganization() serpent.Command {`
`38`	`43`	`returnxerrors.Errorf("organization %q already exists",orgName)`
`39`	`44`	`}`
`40`	`45`
`41`		`-_,err:=cliui.Prompt(inv, cliui.PromptOptions{`
	`46`	`+_,err=cliui.Prompt(inv, cliui.PromptOptions{`
`42`	`47`	`Text:fmt.Sprintf("Are you sure you want to create an organization with the name %s?\n%s",`
`43`	`48`	`pretty.Sprint(cliui.DefaultStyles.Code,orgName),`
`44`	`49`	`pretty.Sprint(cliui.BoldFmt(),"This action is irreversible."),`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"path/filepath"`
`11`	`11`	`"strings"`
`12`	`12`	`"time"`
`13`		`-"unicode/utf8"`
`14`	`13`
`15`	`14`	`"github.com/briandowns/spinner"`
`16`	`15`	`"github.com/google/uuid"`
`@@ -57,8 +56,16 @@ func (r RootCmd) templatePush() serpent.Command {`
`57`	`56`	`returnerr`
`58`	`57`	`}`
`59`	`58`
`60`		`-ifutf8.RuneCountInString(name)>32 {`
`61`		`-returnxerrors.Errorf("Template name must be no more than 32 characters")`
	`59`	`+err=codersdk.NameValid(name)`
	`60`	`+iferr!=nil {`
	`61`	`+returnxerrors.Errorf("Template name %w",err)`
	`62`	`+}`
	`63`	`+`
	`64`	`+ifversionName!="" {`
	`65`	`+err=codersdk.TemplateVersionNameValid(versionName)`
	`66`	`+iferr!=nil {`
	`67`	`+returnxerrors.Errorf("Template version name %w",err)`
	`68`	`+}`
`62`	`69`	`}`
`63`	`70`
`64`	`71`	`varcreateTemplatebool`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,13 @@ func (r RootCmd) userCreate() serpent.Command {`
`44`	`44`	`ifusername=="" {`
`45`	`45`	`username,err=cliui.Prompt(inv, cliui.PromptOptions{`
`46`	`46`	`Text:"Username:",`
	`47`	`+Validate:func(usernamestring)error {`
	`48`	`+err=codersdk.NameValid(username)`
	`49`	`+iferr!=nil {`
	`50`	`+returnxerrors.Errorf("Username %s",err)`
	`51`	`+}`
	`52`	`+returnnil`
	`53`	`+},`
`47`	`54`	`})`
`48`	`55`	`iferr!=nil {`
`49`	`56`	`returnerr`
@@ -144,7 +151,15 @@ Create a workspace `+pretty.Sprint(cliui.DefaultStyles.Code, "coder create")+`!
`144`	`151`	`Flag:"username",`
`145`	`152`	`FlagShorthand:"u",`
`146`	`153`	`Description:"Specifies a username for the new user.",`
`147`		`-Value:serpent.StringOf(&username),`
	`154`	`+Value:serpent.Validate(serpent.StringOf(&username),func(username*serpent.String)error {`
	`155`	`+ifusername.String()!="" {`
	`156`	`+err:=codersdk.NameValid(username.String())`
	`157`	`+iferr!=nil {`
	`158`	`+returnxerrors.Errorf("Username %s",err)`
	`159`	`+}`
	`160`	`+}`
	`161`	`+returnnil`
	`162`	`+}),`
`148`	`163`	`},`
`149`	`164`	`{`
`150`	`165`	`Flag:"full-name",`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ func (r RootCmd) groupCreate() serpent.Command {`
`35`	`35`	`returnxerrors.Errorf("current organization: %w",err)`
`36`	`36`	`}`
`37`	`37`
	`38`	`+err=codersdk.GroupNameValid(inv.Args[0])`
	`39`	`+iferr!=nil {`
	`40`	`+returnxerrors.Errorf("Group name %w",err)`
	`41`	`+}`
	`42`	`+`
`38`	`43`	`group,err:=client.CreateGroup(ctx,org.ID, codersdk.CreateGroupRequest{`
`39`	`44`	`Name:inv.Args[0],`
`40`	`45`	`DisplayName:displayName,`
`@@ -61,7 +66,15 @@ func (r RootCmd) groupCreate() serpent.Command {`
`61`	`66`	`Flag:"display-name",`
`62`	`67`	Description:`Optional human friendly name for the group.`,
`63`	`68`	`Env:"CODER_DISPLAY_NAME",`
`64`		`-Value:serpent.StringOf(&displayName),`
	`69`	`+Value:serpent.Validate(serpent.StringOf(&displayName),func(displayName*serpent.String)error {`
	`70`	`+ifdisplayName.String()!="" {`
	`71`	`+err:=codersdk.DisplayNameValid(displayName.String())`
	`72`	`+iferr!=nil {`
	`73`	`+returnxerrors.Errorf("Group display name %w",err)`
	`74`	`+}`
	`75`	`+}`
	`76`	`+returnnil`
	`77`	`+}),`
`65`	`78`	`},`
`66`	`79`	`}`
`67`	`80`	`orgContext.AttachOptions(cmd)`

Comments

(0)