Chore: remove IsDisabled method for access control (#74340)
remove IsDisabled method for access control, clean up tests
This commit is contained in:
@@ -22,7 +22,6 @@ type Calls struct {
|
||||
Evaluate []interface{}
|
||||
GetUserPermissions []interface{}
|
||||
ClearUserPermissionCache []interface{}
|
||||
IsDisabled []interface{}
|
||||
DeclareFixedRoles []interface{}
|
||||
DeclarePluginRoles []interface{}
|
||||
GetUserBuiltInRoles []interface{}
|
||||
@@ -38,8 +37,6 @@ type Calls struct {
|
||||
type Mock struct {
|
||||
// Unless an override is provided, permissions will be returned by GetUserPermissions
|
||||
permissions []accesscontrol.Permission
|
||||
// Unless an override is provided, disabled will be returned by IsDisabled
|
||||
disabled bool
|
||||
// Unless an override is provided, builtInRoles will be returned by GetUserBuiltInRoles
|
||||
builtInRoles []string
|
||||
|
||||
@@ -50,7 +47,6 @@ type Mock struct {
|
||||
EvaluateFunc func(context.Context, *user.SignedInUser, accesscontrol.Evaluator) (bool, error)
|
||||
GetUserPermissionsFunc func(context.Context, *user.SignedInUser, accesscontrol.Options) ([]accesscontrol.Permission, error)
|
||||
ClearUserPermissionCacheFunc func(*user.SignedInUser)
|
||||
IsDisabledFunc func() bool
|
||||
DeclareFixedRolesFunc func(...accesscontrol.RoleRegistration) error
|
||||
DeclarePluginRolesFunc func(context.Context, string, string, []plugins.RoleRegistration) error
|
||||
GetUserBuiltInRolesFunc func(user *user.SignedInUser) []string
|
||||
@@ -72,7 +68,6 @@ var _ fullAccessControl = New()
|
||||
func New() *Mock {
|
||||
mock := &Mock{
|
||||
Calls: Calls{},
|
||||
disabled: false,
|
||||
permissions: []accesscontrol.Permission{},
|
||||
builtInRoles: []string{},
|
||||
scopeResolvers: accesscontrol.NewResolvers(log.NewNopLogger()),
|
||||
@@ -90,11 +85,6 @@ func (m *Mock) WithPermissions(permissions []accesscontrol.Permission) *Mock {
|
||||
return m
|
||||
}
|
||||
|
||||
func (m *Mock) WithDisabled() *Mock {
|
||||
m.disabled = true
|
||||
return m
|
||||
}
|
||||
|
||||
func (m *Mock) WithBuiltInRoles(builtInRoles []string) *Mock {
|
||||
m.builtInRoles = builtInRoles
|
||||
return m
|
||||
@@ -160,18 +150,6 @@ func (m *Mock) ClearUserPermissionCache(usr identity.Requester) {
|
||||
}
|
||||
}
|
||||
|
||||
// Middleware checks if service disabled or not to switch to fallback authorization.
|
||||
// This mock return m.disabled unless an override is provided.
|
||||
func (m *Mock) IsDisabled() bool {
|
||||
m.Calls.IsDisabled = append(m.Calls.IsDisabled, struct{}{})
|
||||
// Use override if provided
|
||||
if m.IsDisabledFunc != nil {
|
||||
return m.IsDisabledFunc()
|
||||
}
|
||||
// Otherwise return the Disabled bool
|
||||
return m.disabled
|
||||
}
|
||||
|
||||
// DeclareFixedRoles allow the caller to declare, to the service, fixed roles and their
|
||||
// assignments to organization roles ("Viewer", "Editor", "Admin") or "Grafana Admin"
|
||||
// This mock returns no error unless an override is provided.
|
||||
|
||||
Reference in New Issue
Block a user