alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: handle nil filters (#340)

Browse Source 
fix bug when filter is nil
This commit is contained in:
Pedro Nasser
2016-11-24 15:29:07 -02:00
committed by GitHub
parent af149045f1
commit 107033d5d7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/datastore/bolt/bolt.go
View File

@@ -518,7 +518,7 @@ func (ds *BoltDatastore) Get(ctx context.Context, key []byte) ([]byte, error) {
} }
func applyAppFilter(app *models.App, filter *models.AppFilter) bool { func applyAppFilter(app *models.App, filter *models.AppFilter) bool {
if filter.Name != "" { if filter != nil && filter.Name != "" {
nameLike, err := regexp.MatchString(strings.Replace(filter.Name, "%", ".*", -1), app.Name) nameLike, err := regexp.MatchString(strings.Replace(filter.Name, "%", ".*", -1), app.Name)
return err == nil && nameLike return err == nil && nameLike
} }
@@ -527,7 +527,7 @@ func applyAppFilter(app *models.App, filter *models.AppFilter) bool {
} }
func applyRouteFilter(route *models.Route, filter *models.RouteFilter) bool { func applyRouteFilter(route *models.Route, filter *models.RouteFilter) bool {
return (filter.Path == "" || route.Path == filter.Path) && return filter == nil || (filter.Path == "" || route.Path == filter.Path) &&
(filter.AppName == "" || route.AppName == filter.AppName) && (filter.AppName == "" || route.AppName == filter.AppName) &&
(filter.Image == "" || route.Image == filter.Image) (filter.Image == "" || route.Image == filter.Image)
} }