lint, prettier, tests

Kira-Pilot · Kira-Pilot · commit f399fb8322b3 · 2023-02-27T21:45:35.000Z
diff --git a/cli/testdata/coder_tokens_--help.golden b/cli/testdata/coder_tokens_--help.golden
@@ -22,7 +22,7 @@ Get Started:
       [;m$ coder tokens rm WuoWs4ZsMX[0m 
 
 Commands:
-  create      Create a tokens
+  create      Create a token
   list        List tokens
   remove      Delete a token
 
diff --git a/cli/testdata/coder_tokens_create_--help.golden b/cli/testdata/coder_tokens_create_--help.golden
@@ -1,4 +1,4 @@
-Create a tokens
+Create a token
 
 Usage:
   coder tokens create [flags]
@@ -7,6 +7,7 @@ Flags:
   -h, --help                help for create
       --lifetime duration   Specify a duration for the lifetime of the token.
                             Consumes $CODER_TOKEN_LIFETIME (default 720h0m0s)
+  -n, --name string         Specify a human-readable name.
 
 Global Flags:
       --global-config coder   Path to the global coder config directory.
diff --git a/cli/testdata/coder_tokens_list_--help.golden b/cli/testdata/coder_tokens_list_--help.golden
@@ -9,9 +9,9 @@ Aliases:
 Flags:
   -a, --all              Specifies whether all users' tokens will be listed or not (must have
                          Owner role to see all tokens).
-  -c, --column strings   Columns to display in table output. Available columns: id, last used,
-                         expires at, created at, owner (default [id,last used,expires
-                         at,created at])
+  -c, --column strings   Columns to display in table output. Available columns: id, name, last
+                         used, expires at, created at, owner (default [id,name,last
+                         used,expires at,created at])
   -h, --help             help for list
   -o, --output string    Output format. Available formats: table, json (default "table")
 
diff --git a/coderd/apikey.go b/coderd/apikey.go
@@ -96,6 +96,7 @@ func (api *API) postToken(rw http.ResponseWriter, r *http.Request) {
 					Detail: "This value is already in use and should be unique.",
 				}},
 			})
+			return
 		}
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Failed to create API key.",
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -307,7 +307,7 @@ func (server *Server) includeLastVariableValues(ctx context.Context, templateVer
 
 	templateVersion, err := server.Database.GetTemplateVersionByID(ctx, templateVersionID)
 	if err != nil {
-		return nil, fmt.Errorf("get template version: %w", err)
+		return nil, xerrors.New("get template version: %w", err)
 	}
 
 	if templateVersion.TemplateID.UUID == uuid.Nil {
@@ -316,7 +316,7 @@ func (server *Server) includeLastVariableValues(ctx context.Context, templateVer
 
 	template, err := server.Database.GetTemplateByID(ctx, templateVersion.TemplateID.UUID)
 	if err != nil {
-		return nil, fmt.Errorf("get template: %w", err)
+		return nil, xerrors.New("get template: %w", err)
 	}
 
 	if template.ActiveVersionID == uuid.Nil {
@@ -325,7 +325,7 @@ func (server *Server) includeLastVariableValues(ctx context.Context, templateVer
 
 	templateVariables, err := server.Database.GetTemplateVersionVariables(ctx, template.ActiveVersionID)
 	if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
-		return nil, fmt.Errorf("get template version variables: %w", err)
+		return nil, xerrors.New("get template version variables: %w", err)
 	}
 
 	for _, templateVariable := range templateVariables {
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -41,6 +41,7 @@ export const MockTokens: TypesGen.APIKey[] = [
     login_type: "token",
     scope: "all",
     lifetime_seconds: 2592000,
+    token_name: "token-one",
   },
   {
     id: "tBoVE3dqLl",
@@ -52,6 +53,7 @@ export const MockTokens: TypesGen.APIKey[] = [
     login_type: "token",
     scope: "all",
     lifetime_seconds: 2592000,
+    token_name: "token-two",
   },
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ func (api API) postToken(rw http.ResponseWriter, r http.Request) {`
`96`	`96`	`Detail: "This value is already in use and should be unique.",`
`97`	`97`	`}},`
`98`	`98`	`})`
	`99`	`+ return`
`99`	`100`	`}`
`100`	`101`	`httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{`
`101`	`102`	`Message: "Failed to create API key.",`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ func (server *Server) includeLastVariableValues(ctx context.Context, templateVer`
`307`	`307`
`308`	`308`	`templateVersion, err := server.Database.GetTemplateVersionByID(ctx, templateVersionID)`
`309`	`309`	`if err != nil {`
`310`		`- return nil, fmt.Errorf("get template version: %w", err)`
	`310`	`+ return nil, xerrors.New("get template version: %w", err)`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`if templateVersion.TemplateID.UUID == uuid.Nil {`
`@@ -316,7 +316,7 @@ func (server *Server) includeLastVariableValues(ctx context.Context, templateVer`
`316`	`316`
`317`	`317`	`template, err := server.Database.GetTemplateByID(ctx, templateVersion.TemplateID.UUID)`
`318`	`318`	`if err != nil {`
`319`		`- return nil, fmt.Errorf("get template: %w", err)`
	`319`	`+ return nil, xerrors.New("get template: %w", err)`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`if template.ActiveVersionID == uuid.Nil {`
`@@ -325,7 +325,7 @@ func (server *Server) includeLastVariableValues(ctx context.Context, templateVer`
`325`	`325`
`326`	`326`	`templateVariables, err := server.Database.GetTemplateVersionVariables(ctx, template.ActiveVersionID)`
`327`	`327`	`if err != nil && !xerrors.Is(err, sql.ErrNoRows) {`
`328`		`- return nil, fmt.Errorf("get template version variables: %w", err)`
	`328`	`+ return nil, xerrors.New("get template version variables: %w", err)`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`for _, templateVariable := range templateVariables {`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ export const MockTokens: TypesGen.APIKey[] = [`
`41`	`41`	`login_type: "token",`
`42`	`42`	`scope: "all",`
`43`	`43`	`lifetime_seconds: 2592000,`
	`44`	`+ token_name: "token-one",`
`44`	`45`	`},`
`45`	`46`	`{`
`46`	`47`	`id: "tBoVE3dqLl",`
`@@ -52,6 +53,7 @@ export const MockTokens: TypesGen.APIKey[] = [`
`52`	`53`	`login_type: "token",`
`53`	`54`	`scope: "all",`
`54`	`55`	`lifetime_seconds: 2592000,`
	`56`	`+ token_name: "token-two",`
`55`	`57`	`},`
`56`	`58`	`]`
`57`	`59`