diff --git a/store/adapters/rdbms/filter.go b/store/adapters/rdbms/filter.go index 52a3c4560..92d313606 100644 --- a/store/adapters/rdbms/filter.go +++ b/store/adapters/rdbms/filter.go @@ -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 } diff --git a/store/adapters/rdbms/filters.gen.go b/store/adapters/rdbms/filters.gen.go index 9a7566a8a..dff37f993 100644 --- a/store/adapters/rdbms/filters.gen.go +++ b/store/adapters/rdbms/filters.gen.go @@ -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)) } diff --git a/store/tests/apigw_route_test.go b/store/tests/apigw_route_test.go index 8268ea542..fd1053ec7 100644 --- a/store/tests/apigw_route_test.go +++ b/store/tests/apigw_route_test.go @@ -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) }) diff --git a/system/apigw_route.cue b/system/apigw_route.cue index cdd8c7010..6df0ece76 100644 --- a/system/apigw_route.cue +++ b/system/apigw_route.cue @@ -63,7 +63,7 @@ apigw_route: { disabled: {goType: "filter.State", storeIdent: "enabled"} } - byValue: ["route", "endpoint", "method"] + byValue: ["route", "method"] byNilState: ["deleted"] byFalseState: ["disabled"] }