Add appfilter and tests (#337)

add appfilter and tests

api/datastore/bolt/bolt.go

@@ -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
 			}
+			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)
+}

api/datastore/bolt_test.go

@@ -225,6 +225,15 @@ func TestBolt(t *testing.T) {
 		t.Fatalf("Test GetRoutes: expected `app.Name` to be `%s` but it was `%s`", testRoute.Path, routes[0].Path)
 	}
 
+	apps, err = ds.GetApps(ctx, &models.AppFilter{Name: "Tes%"})
+	if err != nil {
+		t.Log(buf.String())
+		t.Fatalf("Test GetApps(filter): unexpected error %v", err)
+	}
+	if len(apps) == 0 {
+		t.Fatal("Test GetApps(filter): expected result count to be greater than 0")
+	}
+
 	// Testing app delete
 	err = ds.RemoveRoute(ctx, "", "")
 	if err != models.ErrDatastoreEmptyAppName {

api/datastore/mock.go

@@ -80,10 +80,8 @@ func (m *Mock) GetRoute(ctx context.Context, appName, routePath string) (*models
 
 func (m *Mock) GetRoutes(ctx context.Context, routeFilter *models.RouteFilter) (routes []*models.Route, err error) {
 	for _, r := range m.Routes {
-		if models.ApplyRouteFilter(r, routeFilter) {
 		routes = append(routes, r)
 	}
-	}
 	return
 }
 

api/datastore/postgres/postgres.go

@@ -213,10 +213,9 @@ func scanApp(scanner rowScanner, app *models.App) error {
 func (ds *PostgresDatastore) GetApps(ctx context.Context, filter *models.AppFilter) ([]*models.App, error) {
 	res := []*models.App{}
 
-	rows, err := ds.db.Query(`
+	filterQuery := buildFilterAppQuery(filter)
-		SELECT DISTINCT *
+	rows, err := ds.db.Query(fmt.Sprintf("SELECT DISTINCT * FROM apps %s", filterQuery))
-		FROM apps`,
+
-	)
 	if err != nil {
 		return nil, err
 	}
@@ -407,7 +406,7 @@ func (ds *PostgresDatastore) GetRoute(ctx context.Context, appName, routePath st
 
 func (ds *PostgresDatastore) GetRoutes(ctx context.Context, filter *models.RouteFilter) ([]*models.Route, error) {
 	res := []*models.Route{}
-	filterQuery := buildFilterQuery(filter)
+	filterQuery := buildFilterRouteQuery(filter)
 	rows, err := ds.db.Query(fmt.Sprintf("%s %s", routeSelector, filterQuery))
 	// todo: check for no rows so we don't respond with a sql 500 err
 	if err != nil {
@@ -433,7 +432,7 @@ func (ds *PostgresDatastore) GetRoutes(ctx context.Context, filter *models.Route
 func (ds *PostgresDatastore) GetRoutesByApp(ctx context.Context, appName string, filter *models.RouteFilter) ([]*models.Route, error) {
 	res := []*models.Route{}
 	filter.AppName = appName
-	filterQuery := buildFilterQuery(filter)
+	filterQuery := buildFilterRouteQuery(filter)
 	rows, err := ds.db.Query(fmt.Sprintf("%s %s", routeSelector, filterQuery))
 	// todo: check for no rows so we don't respond with a sql 500 err
 	if err != nil {
@@ -456,7 +455,26 @@ func (ds *PostgresDatastore) GetRoutesByApp(ctx context.Context, appName string,
 	return res, nil
 }
 
-func buildFilterQuery(filter *models.RouteFilter) string {
+func buildFilterAppQuery(filter *models.AppFilter) string {
+	filterQuery := ""
+
+	filterQueries := []string{}
+	if filter.Name != "" {
+		filterQueries = append(filterQueries, fmt.Sprintf("name LIKE '%s'", filter.Name))
+	}
+
+	for i, field := range filterQueries {
+		if i == 0 {
+			filterQuery = fmt.Sprintf("WHERE %s ", field)
+		} else {
+			filterQuery = fmt.Sprintf("%s AND %s", filterQuery, field)
+		}
+	}
+
+	return filterQuery
+}
+
+func buildFilterRouteQuery(filter *models.RouteFilter) string {
 	filterQuery := ""
 
 	filterQueries := []string{}

api/datastore/postgres_test.go

@@ -126,6 +126,15 @@ func TestPostgres(t *testing.T) {
 		t.Fatalf("Test GetApps: expected `app.Name` to be `%s` but it was `%s`", app.Name, testApp.Name)
 	}
 
+	apps, err = ds.GetApps(ctx, &models.AppFilter{Name: "Tes%"})
+	if err != nil {
+		t.Log(buf.String())
+		t.Fatalf("Test GetApps(filter): unexpected error %v", err)
+	}
+	if len(apps) == 0 {
+		t.Fatal("Test GetApps(filter): expected result count to be greater than 0")
+	}
+
 	// Testing app delete
 	err = ds.RemoveApp(ctx, "")
 	if err != models.ErrDatastoreEmptyAppName {

api/models/app.go

@@ -53,4 +53,5 @@ func (a *App) Validate() error {
 }
 
 type AppFilter struct {
+	Name string
 }

api/models/datastore.go

@@ -31,9 +31,3 @@ var (
 	ErrDatastoreEmptyApp       = errors.New("Missing app")
 	ErrDatastoreEmptyRoute     = errors.New("Missing route")
 )
-
-func ApplyRouteFilter(route *Route, filter *RouteFilter) bool {
-	return (filter.Path == "" || route.Path == filter.Path) &&
-		(filter.AppName == "" || route.AppName == filter.AppName) &&
-		(filter.Image == "" || route.Image == filter.Image)
-}