Commit0d8e814

committed

review

1 parent3adc3a3 commit0d8e814Copy full SHA for 0d8e814

File tree

+16

-14

lines changed

+16

-14

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (r RootCmd) create() serpent.Command {`
`62`	`62`	`Validate:func(workspaceNamestring)error {`
`63`	`63`	`err=codersdk.NameValid(workspaceName)`
`64`	`64`	`iferr!=nil {`
`65`		`-returnxerrors.Errorf("workspace name: %w",err)`
	`65`	`+returnxerrors.Errorf("workspace name %q is invalid: %w",workspaceName,err)`
`66`	`66`	`}`
`67`	`67`	`_,err=client.WorkspaceByOwnerAndName(inv.Context(),workspaceOwner,workspaceName, codersdk.WorkspaceOptions{})`
`68`	`68`	`iferr==nil {`
`@@ -77,7 +77,7 @@ func (r RootCmd) create() serpent.Command {`
`77`	`77`	`}`
`78`	`78`	`err=codersdk.NameValid(workspaceName)`
`79`	`79`	`iferr!=nil {`
`80`		`-returnxerrors.Errorf("workspace name: %w",err)`
	`80`	`+returnxerrors.Errorf("workspace name %q is invalid: %w",workspaceName,err)`
`81`	`81`	`}`
`82`	`82`	`_,err=client.WorkspaceByOwnerAndName(inv.Context(),workspaceOwner,workspaceName, codersdk.WorkspaceOptions{})`
`83`	`83`	`iferr==nil {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (r RootCmd) createOrganization() serpent.Command {`
`32`	`32`
`33`	`33`	`err:=codersdk.NameValid(orgName)`
`34`	`34`	`iferr!=nil {`
`35`		`-returnxerrors.Errorf("organization name: %w",err)`
	`35`	`+returnxerrors.Errorf("organization name %q is invalid: %w",orgName,err)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// This check is not perfect since not all users can read all organizations.`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,13 @@ func (r RootCmd) templatePush() serpent.Command {`
`58`	`58`
`59`	`59`	`err=codersdk.NameValid(name)`
`60`	`60`	`iferr!=nil {`
`61`		`-returnxerrors.Errorf("template name: %w",err)`
	`61`	`+returnxerrors.Errorf("template name %q is invalid: %w",name,err)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`ifversionName!="" {`
`65`	`65`	`err=codersdk.TemplateVersionNameValid(versionName)`
`66`	`66`	`iferr!=nil {`
`67`		`-returnxerrors.Errorf("template version name: %w",err)`
	`67`	`+returnxerrors.Errorf("template version name %q is invalid: %w",versionName,err)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (r RootCmd) userCreate() serpent.Command {`
`47`	`47`	`Validate:func(usernamestring)error {`
`48`	`48`	`err=codersdk.NameValid(username)`
`49`	`49`	`iferr!=nil {`
`50`		`-returnxerrors.Errorf("username: %w",err)`
	`50`	`+returnxerrors.Errorf("username %q is invalid: %w",username,err)`
`51`	`51`	`}`
`52`	`52`	`returnnil`
`53`	`53`	`},`
@@ -151,11 +151,12 @@ Create a workspace `+pretty.Sprint(cliui.DefaultStyles.Code, "coder create")+`!
`151`	`151`	`Flag:"username",`
`152`	`152`	`FlagShorthand:"u",`
`153`	`153`	`Description:"Specifies a username for the new user.",`
`154`		`-Value:serpent.Validate(serpent.StringOf(&username),func(username*serpent.String)error {`
`155`		`-ifusername.String()!="" {`
`156`		`-err:=codersdk.NameValid(username.String())`
	`154`	`+Value:serpent.Validate(serpent.StringOf(&username),func(_username*serpent.String)error {`
	`155`	`+username:=_username.String()`
	`156`	`+ifusername!="" {`
	`157`	`+err:=codersdk.NameValid(username)`
`157`	`158`	`iferr!=nil {`
`158`		`-returnxerrors.Errorf("username: %w",err)`
	`159`	`+returnxerrors.Errorf("username %q is invalid: %w",username,err)`
`159`	`160`	`}`
`160`	`161`	`}`
`161`	`162`	`returnnil`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,12 @@ func (r RootCmd) groupCreate() serpent.Command {`
`66`	`66`	`Flag:"display-name",`
`67`	`67`	Description:`Optional human friendly name for the group.`,
`68`	`68`	`Env:"CODER_DISPLAY_NAME",`
`69`		`-Value:serpent.Validate(serpent.StringOf(&displayName),func(displayName*serpent.String)error {`
`70`		`-ifdisplayName.String()!="" {`
`71`		`-err:=codersdk.DisplayNameValid(displayName.String())`
	`69`	`+Value:serpent.Validate(serpent.StringOf(&displayName),func(_displayName*serpent.String)error {`
	`70`	`+displayName:=_displayName.String()`
	`71`	`+ifdisplayName!="" {`
	`72`	`+err:=codersdk.DisplayNameValid(displayName)`
`72`	`73`	`iferr!=nil {`
`73`		`-returnxerrors.Errorf("group display name: %w",err)`
	`74`	`+returnxerrors.Errorf("group display name %q is invalid: %w",displayName,err)`
`74`	`75`	`}`
`75`	`76`	`}`
`76`	`77`	`returnnil`

Comments

(0)