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

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
+8 -3
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
@@ -0,0 +1,10 @@
// Package httpapiconstraints contain types that can be used and implemented
// across the application to return specific HTTP status codes without pulling
// in large dependency trees.
package httpapiconstraints
// IsUnauthorizedError is an interface that can be implemented in other packages
// in order to return 404.
type IsUnauthorizedError interface {
IsUnauthorized() bool
}
+3 -4
View File
@@ -10,7 +10,6 @@ import (
"github.com/google/uuid"
"golang.org/x/xerrors"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/codersdk"
)
@@ -158,10 +157,10 @@ func (p *QueryParamParser) Strings(vals url.Values, def []string, queryParam str
})
}
// ValidEnum parses enum query params. Add more to the list as needed.
// ValidEnum represents an enum that can be parsed and validated.
type ValidEnum interface {
database.ResourceType | database.AuditAction | database.BuildReason | database.UserStatus |
database.WorkspaceStatus
// Add more types as needed (avoid importing large dependency trees).
~string
// Valid is required on the enum type to be used with ParseEnum.
Valid() bool