Fixed apigw route search
Apigw route filtering works with partial endpoint values now instead of literal search
This commit is contained in:
@@ -332,6 +332,16 @@ func DefaultFilters() (f *extendedFilters) {
|
||||
return ee, f, err
|
||||
}
|
||||
|
||||
f.ApigwRoute = func(s *Store, f systemType.ApigwRouteFilter) (ee []goqu.Expression, _ systemType.ApigwRouteFilter, err error) {
|
||||
if ee, f, err = ApigwRouteFilter(f); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
ee = append(ee, goqu.C("endpoint").Like("%"+f.Endpoint+"%"))
|
||||
|
||||
return ee, f, nil
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Generated
-4
@@ -230,10 +230,6 @@ func ApigwRouteFilter(f systemType.ApigwRouteFilter) (ee []goqu.Expression, _ sy
|
||||
ee = append(ee, goqu.C("id").Eq(f.Route))
|
||||
}
|
||||
|
||||
if val := strings.TrimSpace(f.Endpoint); len(val) > 0 {
|
||||
ee = append(ee, goqu.C("endpoint").Eq(f.Endpoint))
|
||||
}
|
||||
|
||||
if val := strings.TrimSpace(f.Method); len(val) > 0 {
|
||||
ee = append(ee, goqu.C("method").Eq(f.Method))
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ func testApigwRoutes(t *testing.T, s store.ApigwRoutes) {
|
||||
new,
|
||||
))
|
||||
|
||||
set, _, err := s.SearchApigwRoutes(ctx, types.ApigwRouteFilter{Endpoint: "/foo"})
|
||||
set, _, err := s.SearchApigwRoutes(ctx, types.ApigwRouteFilter{Endpoint: "fo"})
|
||||
req.NoError(err)
|
||||
req.Len(set, 1)
|
||||
})
|
||||
|
||||
@@ -63,7 +63,7 @@ apigw_route: {
|
||||
disabled: {goType: "filter.State", storeIdent: "enabled"}
|
||||
}
|
||||
|
||||
byValue: ["route", "endpoint", "method"]
|
||||
byValue: ["route", "method"]
|
||||
byNilState: ["deleted"]
|
||||
byFalseState: ["disabled"]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user