review

ethanndickson · ethanndickson · commit d24cdd7adffc · 2024-09-04T08:18:07.000Z
diff --git a/cli/create.go b/cli/create.go
@@ -62,11 +62,11 @@ func (r *RootCmd) create() *serpent.Command {
 					Validate: func(workspaceName string) error {
 						err = codersdk.NameValid(workspaceName)
 						if err != nil {
-							return xerrors.Errorf("Workspace name %s", err)
+							return xerrors.Errorf("workspace name: %w", err)
 						}
 						_, err = client.WorkspaceByOwnerAndName(inv.Context(), workspaceOwner, workspaceName, codersdk.WorkspaceOptions{})
 						if err == nil {
-							return xerrors.Errorf("A workspace already exists named %q!", workspaceName)
+							return xerrors.Errorf("a workspace already exists named %q!", workspaceName)
 						}
 						return nil
 					},
@@ -77,11 +77,11 @@ func (r *RootCmd) create() *serpent.Command {
 			}
 			err = codersdk.NameValid(workspaceName)
 			if err != nil {
-				return xerrors.Errorf("Workspace name %s", err)
+				return xerrors.Errorf("workspace name: %w", err)
 			}
 			_, err = client.WorkspaceByOwnerAndName(inv.Context(), workspaceOwner, workspaceName, codersdk.WorkspaceOptions{})
 			if err == nil {
-				return xerrors.Errorf("A workspace already exists named %q!", workspaceName)
+				return xerrors.Errorf("a workspace already exists named %q!", workspaceName)
 			}
 
 			var sourceWorkspace codersdk.Workspace
diff --git a/cli/organizationmanage.go b/cli/organizationmanage.go
@@ -32,7 +32,7 @@ func (r *RootCmd) createOrganization() *serpent.Command {
 
 			err := codersdk.NameValid(orgName)
 			if err != nil {
-				return xerrors.Errorf("Organization name %w", err)
+				return xerrors.Errorf("organization name: %w", err)
 			}
 
 			// This check is not perfect since not all users can read all organizations.
diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -58,13 +58,13 @@ func (r *RootCmd) templatePush() *serpent.Command {
 
 			err = codersdk.NameValid(name)
 			if err != nil {
-				return xerrors.Errorf("Template name %w", err)
+				return xerrors.Errorf("template name: %w", err)
 			}
 
 			if versionName != "" {
 				err = codersdk.TemplateVersionNameValid(versionName)
 				if err != nil {
-					return xerrors.Errorf("Template version name %w", err)
+					return xerrors.Errorf("template version name: %w", err)
 				}
 			}
 
diff --git a/cli/usercreate.go b/cli/usercreate.go
@@ -47,7 +47,7 @@ func (r *RootCmd) userCreate() *serpent.Command {
 					Validate: func(username string) error {
 						err = codersdk.NameValid(username)
 						if err != nil {
-							return xerrors.Errorf("Username %s", err)
+							return xerrors.Errorf("username: %w", err)
 						}
 						return nil
 					},
@@ -155,7 +155,7 @@ Create a workspace  `+pretty.Sprint(cliui.DefaultStyles.Code, "coder create")+`!
 				if username.String() != "" {
 					err := codersdk.NameValid(username.String())
 					if err != nil {
-						return xerrors.Errorf("Username %s", err)
+						return xerrors.Errorf("username: %w", err)
 					}
 				}
 				return nil
diff --git a/enterprise/cli/groupcreate.go b/enterprise/cli/groupcreate.go
@@ -37,7 +37,7 @@ func (r *RootCmd) groupCreate() *serpent.Command {
 
 			err = codersdk.GroupNameValid(inv.Args[0])
 			if err != nil {
-				return xerrors.Errorf("Group name %w", err)
+				return xerrors.Errorf("group name: %w", err)
 			}
 
 			group, err := client.CreateGroup(ctx, org.ID, codersdk.CreateGroupRequest{
@@ -70,7 +70,7 @@ func (r *RootCmd) groupCreate() *serpent.Command {
 				if displayName.String() != "" {
 					err := codersdk.DisplayNameValid(displayName.String())
 					if err != nil {
-						return xerrors.Errorf("Group display name %w", err)
+						return xerrors.Errorf("group display name: %w", err)
 					}
 				}
 				return nil

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,11 @@ func (r RootCmd) create() serpent.Command {`
`62`	`62`	`Validate: func(workspaceName string) error {`
`63`	`63`	`err = codersdk.NameValid(workspaceName)`
`64`	`64`	`if err != nil {`
`65`		`- return xerrors.Errorf("Workspace name %s", err)`
	`65`	`+ return xerrors.Errorf("workspace name: %w", err)`
`66`	`66`	`}`
`67`	`67`	`_, err = client.WorkspaceByOwnerAndName(inv.Context(), workspaceOwner, workspaceName, codersdk.WorkspaceOptions{})`
`68`	`68`	`if err == nil {`
`69`		`- return xerrors.Errorf("A workspace already exists named %q!", workspaceName)`
	`69`	`+ return xerrors.Errorf("a workspace already exists named %q!", workspaceName)`
`70`	`70`	`}`
`71`	`71`	`return nil`
`72`	`72`	`},`
`@@ -77,11 +77,11 @@ func (r RootCmd) create() serpent.Command {`
`77`	`77`	`}`
`78`	`78`	`err = codersdk.NameValid(workspaceName)`
`79`	`79`	`if err != nil {`
`80`		`- return xerrors.Errorf("Workspace name %s", err)`
	`80`	`+ return xerrors.Errorf("workspace name: %w", err)`
`81`	`81`	`}`
`82`	`82`	`_, err = client.WorkspaceByOwnerAndName(inv.Context(), workspaceOwner, workspaceName, codersdk.WorkspaceOptions{})`
`83`	`83`	`if err == nil {`
`84`		`- return xerrors.Errorf("A workspace already exists named %q!", workspaceName)`
	`84`	`+ return xerrors.Errorf("a workspace already exists named %q!", workspaceName)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`var sourceWorkspace codersdk.Workspace`
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`	`if err != nil {`
`35`		`- return xerrors.Errorf("Organization name %w", err)`
	`35`	`+ return xerrors.Errorf("organization name: %w", err)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// This check is not perfect since not all users can read all organizations.`
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`	`if err != nil {`
`61`		`- return xerrors.Errorf("Template name %w", err)`
	`61`	`+ return xerrors.Errorf("template name: %w", err)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if versionName != "" {`
`65`	`65`	`err = codersdk.TemplateVersionNameValid(versionName)`
`66`	`66`	`if err != nil {`
`67`		`- return xerrors.Errorf("Template version name %w", err)`
	`67`	`+ return xerrors.Errorf("template version name: %w", err)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (r RootCmd) userCreate() serpent.Command {`
`47`	`47`	`Validate: func(username string) error {`
`48`	`48`	`err = codersdk.NameValid(username)`
`49`	`49`	`if err != nil {`
`50`		`- return xerrors.Errorf("Username %s", err)`
	`50`	`+ return xerrors.Errorf("username: %w", err)`
`51`	`51`	`}`
`52`	`52`	`return nil`
`53`	`53`	`},`
@@ -155,7 +155,7 @@ Create a workspace `+pretty.Sprint(cliui.DefaultStyles.Code, "coder create")+`!
`155`	`155`	`if username.String() != "" {`
`156`	`156`	`err := codersdk.NameValid(username.String())`
`157`	`157`	`if err != nil {`
`158`		`- return xerrors.Errorf("Username %s", err)`
	`158`	`+ return xerrors.Errorf("username: %w", err)`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (r RootCmd) groupCreate() serpent.Command {`
`37`	`37`
`38`	`38`	`err = codersdk.GroupNameValid(inv.Args[0])`
`39`	`39`	`if err != nil {`
`40`		`- return xerrors.Errorf("Group name %w", err)`
	`40`	`+ return xerrors.Errorf("group name: %w", err)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`group, err := client.CreateGroup(ctx, org.ID, codersdk.CreateGroupRequest{`
`@@ -70,7 +70,7 @@ func (r RootCmd) groupCreate() serpent.Command {`
`70`	`70`	`if displayName.String() != "" {`
`71`	`71`	`err := codersdk.DisplayNameValid(displayName.String())`
`72`	`72`	`if err != nil {`
`73`		`- return xerrors.Errorf("Group display name %w", err)`
	`73`	`+ return xerrors.Errorf("group display name: %w", err)`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`return nil`