@@ -166,8 +166,8 @@ func (api *API) workspaceBuildByBuildNumber(rw http.ResponseWriter, r *http.Requ
166166workspaceName := chi .URLParam (r ,"workspacename" )
167167buildNumber ,err := strconv .ParseInt (chi .URLParam (r ,"buildnumber" ),10 ,32 )
168168if err != nil {
169- httpapi .Write (rw ,http .StatusInternalServerError , httpapi.Response {
170- Message :"Internal error parsing build number as integer." ,
169+ httpapi .Write (rw ,http .StatusBadRequest , httpapi.Response {
170+ Message :"Failed to parse build number as integer." ,
171171Detail :err .Error (),
172172})
173173return
@@ -177,14 +177,20 @@ func (api *API) workspaceBuildByBuildNumber(rw http.ResponseWriter, r *http.Requ
177177OwnerID :owner .ID ,
178178Name :workspaceName ,
179179})
180-
180+ if errors .Is (err ,sql .ErrNoRows ) {
181+ httpapi .Write (rw ,http .StatusNotFound , httpapi.Response {
182+ Message :fmt .Sprintf ("Workspace %q does not exist." ,workspaceName ),
183+ })
184+ return
185+ }
181186if err != nil {
182187httpapi .Write (rw ,http .StatusInternalServerError , httpapi.Response {
183188Message :"Internal error fetching workspace by name." ,
184189Detail :err .Error (),
185190})
186191return
187192}
193+
188194if ! api .Authorize (rw ,r ,rbac .ActionRead ,rbac .ResourceWorkspace .
189195InOrg (workspace .OrganizationID ).WithOwner (workspace .OwnerID .String ()).WithID (workspace .ID .String ())) {
190196return
@@ -194,6 +200,12 @@ func (api *API) workspaceBuildByBuildNumber(rw http.ResponseWriter, r *http.Requ
194200WorkspaceID :workspace .ID ,
195201BuildNumber :int32 (buildNumber ),
196202})
203+ if errors .Is (err ,sql .ErrNoRows ) {
204+ httpapi .Write (rw ,http .StatusNotFound , httpapi.Response {
205+ Message :fmt .Sprintf ("Workspace %q Build %q does not exist." ,workspaceName ,buildNumber ),
206+ })
207+ return
208+ }
197209if err != nil {
198210httpapi .Write (rw ,http .StatusInternalServerError , httpapi.Response {
199211Message :"Internal error fetching workspace build." ,