adjust error message

johnstcn · johnstcn · commit ac80426efb1d · 2022-07-29T11:46:53.000+01:00
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -638,7 +638,7 @@ func (api *API) putExtendWorkspace(rw http.ResponseWriter, r *http.Request) {
 			// Normally, we would put the validation error in Validations, but this endpoint is
 			// not tied to a form or specific named user input on the FE.
 			code = http.StatusBadRequest
-			resp.Message = err.Error()
+			resp.Message = "Cannot extend workspace: " + err.Error()
 			return err
 		}
 
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -1063,15 +1063,15 @@ func TestWorkspaceExtend(t *testing.T) {
 	err = client.PutExtendWorkspace(ctx, workspace.ID, codersdk.PutExtendWorkspaceRequest{
 		Deadline: deadlineTooSoon,
 	})
-	require.ErrorContains(t, err, "unexpected status code 400: new deadline must be at least 30 minutes in the future", "setting a deadline less than 30 minutes in the future should fail")
+	require.ErrorContains(t, err, "unexpected status code 400: Cannot extend workspace: new deadline must be at least 30 minutes in the future", "setting a deadline less than 30 minutes in the future should fail")
 
 	// And with a deadline greater than the template max_ttl should also fail
 	deadlineExceedsMaxTTL := time.Now().Add(time.Duration(template.MaxTTLMillis) * time.Millisecond).Add(time.Minute)
 	err = client.PutExtendWorkspace(ctx, workspace.ID, codersdk.PutExtendWorkspaceRequest{
 		Deadline: deadlineExceedsMaxTTL,
 	})
 
-	require.ErrorContains(t, err, "unexpected status code 400: new deadline is greater than template allows", "setting a deadline greater than that allowed by the template should fail")
+	require.ErrorContains(t, err, "unexpected status code 400: Cannot extend workspace: new deadline is greater than template allows", "setting a deadline greater than that allowed by the template should fail")
 
 	// Updating with a deadline 30 minutes in the future should succeed
 	deadlineJustSoonEnough := time.Now().Add(30 * time.Minute)

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ func (api API) putExtendWorkspace(rw http.ResponseWriter, r http.Request) {`
`638`	`638`	`// Normally, we would put the validation error in Validations, but this endpoint is`
`639`	`639`	`// not tied to a form or specific named user input on the FE.`
`640`	`640`	`code = http.StatusBadRequest`
`641`		`- resp.Message = err.Error()`
	`641`	`+ resp.Message = "Cannot extend workspace: " + err.Error()`
`642`	`642`	`return err`
`643`	`643`	`}`
`644`	`644`