synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(coderd/httpapi): remove database, dbauthz and rbac imports (#9481)

Browse Source 
Ref: #9380
This commit is contained in:
Mathias Fredriksson
2023-09-04 19:39:14 +03:00
committed by GitHub
parent d2115941b7
commit 6fc1f5276d
5 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coderd/httpapi/httpapi.go
View File

@ -16,8 +16,7 @@ import (
"github.com/go-playground/validator/v10"
"golang.org/x/xerrors"
"github.com/coder/coder/v2/coderd/database/dbauthz"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/coderd/httpapi/httpapiconstraints"
"github.com/coder/coder/v2/coderd/tracing"
"github.com/coder/coder/v2/codersdk"
)
@ -90,7 +89,13 @@ func Is404Error(err error) bool {
if err == nil {
return false
}
return xerrors.Is(err, sql.ErrNoRows) || dbauthz.IsNotAuthorizedError(err) || rbac.IsUnauthorizedError(err)
// This tests for dbauthz.IsNotAuthorizedError and rbac.IsUnauthorizedError.
var unauthorized httpapiconstraints.IsUnauthorizedError
if errors.As(err, &unauthorized) && unauthorized.IsUnauthorized() {
return true
}
return xerrors.Is(err, sql.ErrNoRows)
}
// Convenience error functions don't take contexts since their responses are