public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Storage: Content root storage (#54929)

Browse Source 
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
This commit is contained in:
Artur Wierzbicki
2022-09-12 18:34:46 -04:00
committed by GitHub
co-authored by Ryan McKinley
parent 89d94eeab2
commit e19f36649f
12 changed files with 538 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/filestorage/filter.go
+1 -1
View File
@@ -244,6 +244,6 @@ func (m allOfPathFilter) asSQLFilter() accesscontrol.SQLFilter {
}
}
func newAndPathFilter(filters ...PathFilter) PathFilter {
func NewAndPathFilter(filters ...PathFilter) PathFilter {
return &allOfPathFilter{filters: filters}
}
pkg/infra/filestorage/wrapper.go
+2 -2
View File
@@ -240,7 +240,7 @@ func (b wrapper) listOptionsWithDefaults(options *ListOptions) *ListOptions {
var filter PathFilter
if options.Filter != nil {
filter = newAndPathFilter(b.filter, wrapPathFilter(options.Filter, b.rootFolder))
filter = NewAndPathFilter(b.filter, wrapPathFilter(options.Filter, b.rootFolder))
} else {
filter = b.filter
}
@@ -283,7 +283,7 @@ func (b wrapper) deleteFolderOptionsWithDefaults(options *DeleteFolderOptions) *
var filter PathFilter
if options.AccessFilter != nil {
filter = newAndPathFilter(b.filter, wrapPathFilter(options.AccessFilter, b.rootFolder))
filter = NewAndPathFilter(b.filter, wrapPathFilter(options.AccessFilter, b.rootFolder))
} else {
filter = b.filter
}