review

ethanndickson · ethanndickson · commit 4dfff4436187 · 2024-09-04T08:18:07.000Z
diff --git a/cli/create.go b/cli/create.go
@@ -62,7 +62,7 @@ func (r *RootCmd) create() *serpent.Command {
 					Validate: func(workspaceName string) error {
 						err = codersdk.NameValid(workspaceName)
 						if err != nil {
-							return xerrors.Errorf("workspace name: %w", err)
+							return xerrors.Errorf("workspace name %q is invalid: %w", workspaceName, err)
 						}
 						_, err = client.WorkspaceByOwnerAndName(inv.Context(), workspaceOwner, workspaceName, codersdk.WorkspaceOptions{})
 						if err == nil {
@@ -77,7 +77,7 @@ func (r *RootCmd) create() *serpent.Command {
 			}
 			err = codersdk.NameValid(workspaceName)
 			if err != nil {
-				return xerrors.Errorf("workspace name: %w", err)
+				return xerrors.Errorf("workspace name %q is invalid: %w", workspaceName, err)
 			}
 			_, err = client.WorkspaceByOwnerAndName(inv.Context(), workspaceOwner, workspaceName, codersdk.WorkspaceOptions{})
 			if err == nil {
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 %q is invalid: %w", orgName, 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 %q is invalid: %w", name, err)
 			}
 
 			if versionName != "" {
 				err = codersdk.TemplateVersionNameValid(versionName)
 				if err != nil {
-					return xerrors.Errorf("template version name: %w", err)
+					return xerrors.Errorf("template version name %q is invalid: %w", versionName, 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: %w", err)
+							return xerrors.Errorf("username %q is invalid: %w", username, err)
 						}
 						return nil
 					},
@@ -151,11 +151,12 @@ Create a workspace  `+pretty.Sprint(cliui.DefaultStyles.Code, "coder create")+`!
 			Flag:          "username",
 			FlagShorthand: "u",
 			Description:   "Specifies a username for the new user.",
-			Value: serpent.Validate(serpent.StringOf(&username), func(username *serpent.String) error {
-				if username.String() != "" {
-					err := codersdk.NameValid(username.String())
+			Value: serpent.Validate(serpent.StringOf(&username), func(_username *serpent.String) error {
+				username := _username.String()
+				if username != "" {
+					err := codersdk.NameValid(username)
 					if err != nil {
-						return xerrors.Errorf("username: %w", err)
+						return xerrors.Errorf("username %q is invalid: %w", username, err)
 					}
 				}
 				return nil
diff --git a/enterprise/cli/groupcreate.go b/enterprise/cli/groupcreate.go
@@ -66,11 +66,12 @@ func (r *RootCmd) groupCreate() *serpent.Command {
 			Flag:        "display-name",
 			Description: `Optional human friendly name for the group.`,
 			Env:         "CODER_DISPLAY_NAME",
-			Value: serpent.Validate(serpent.StringOf(&displayName), func(displayName *serpent.String) error {
-				if displayName.String() != "" {
-					err := codersdk.DisplayNameValid(displayName.String())
+			Value: serpent.Validate(serpent.StringOf(&displayName), func(_displayName *serpent.String) error {
+				displayName := _displayName.String()
+				if displayName != "" {
+					err := codersdk.DisplayNameValid(displayName)
 					if err != nil {
-						return xerrors.Errorf("group display name: %w", err)
+						return xerrors.Errorf("group display name %q is invalid: %w", displayName, err)
 					}
 				}
 				return nil

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ 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: %w", err)`
	`65`	`+ return xerrors.Errorf("workspace name %q is invalid: %w", workspaceName, err)`
`66`	`66`	`}`
`67`	`67`	`_, err = client.WorkspaceByOwnerAndName(inv.Context(), workspaceOwner, workspaceName, codersdk.WorkspaceOptions{})`
`68`	`68`	`if err == nil {`
`@@ -77,7 +77,7 @@ 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: %w", err)`
	`80`	`+ return xerrors.Errorf("workspace name %q is invalid: %w", workspaceName, err)`
`81`	`81`	`}`
`82`	`82`	`_, err = client.WorkspaceByOwnerAndName(inv.Context(), workspaceOwner, workspaceName, codersdk.WorkspaceOptions{})`
`83`	`83`	`if err == nil {`
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 %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.`
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 %q is invalid: %w", name, 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 %q is invalid: %w", versionName, err)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`