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

Add appfilter and tests (#337)

Browse Source 
add appfilter and tests
This commit is contained in:
Pedro Nasser
2016-11-24 03:46:42 -02:00
committed by GitHub
parent c307c9375b
commit 01d5a81389
7 changed files with 67 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,8 @@ import (
"github.com/Sirupsen/logrus"
"github.com/boltdb/bolt"
"github.com/iron-io/functions/api/models"
"regexp"
"strings"
)
type BoltDatastore struct {
@@ -199,7 +201,9 @@ func (ds *BoltDatastore) GetApps(ctx context.Context, filter *models.AppFilter)
if err != nil {
return err
}
res = append(res, app)
if applyAppFilter(app, filter) {
res = append(res, app)
}
return nil
})
if err2 != nil {
@@ -444,7 +448,7 @@ func (ds *BoltDatastore) GetRoutesByApp(ctx context.Context, appName string, fil
if err != nil {
return err
}
if models.ApplyRouteFilter(&route, filter) {
if applyRouteFilter(&route, filter) {
i++
res = append(res, &route)
}
@@ -480,7 +484,7 @@ func (ds *BoltDatastore) GetRoutes(ctx context.Context, filter *models.RouteFilt
if err != nil {
return err
}
if models.ApplyRouteFilter(&route, filter) {
if applyRouteFilter(&route, filter) {
i++
res = append(res, &route)
}
@@ -512,3 +516,18 @@ func (ds *BoltDatastore) Get(ctx context.Context, key []byte) ([]byte, error) {
})
return ret, nil
}
func applyAppFilter(app *models.App, filter *models.AppFilter) bool {
if filter.Name != "" {
nameLike, err := regexp.MatchString(strings.Replace(filter.Name, "%", ".*", -1), app.Name)
return err == nil && nameLike
}
return true
}
func applyRouteFilter(route *models.Route, filter *models.RouteFilter) bool {
return (filter.Path == "" || route.Path == filter.Path) &&
(filter.AppName == "" || route.AppName == filter.AppName) &&
(filter.Image == "" || route.Image == filter.Image)
}