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

remove idle_timeout > timeout check. d'oh

Browse Source
This commit is contained in:
Reed Allman
2017-09-21 04:32:56 -07:00
parent caba9e0ec6
commit 84239b4a14
3 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/models/error.go
View File

@@ -156,10 +156,6 @@ var (
code: http.StatusBadRequest,
error: fmt.Errorf("memory value is invalid. 0 < memory < %d", MaxMemory),
}
ErrRoutesTimeoutLongerThanIdle = err{
code: http.StatusBadRequest,
error: errors.New("timeout must be less than idle_timeout"),
}
ErrCallNotFound = err{
code: http.StatusNotFound,
error: errors.New("Call not found"),

4
api/models/route.go
View File

@@ -109,10 +109,6 @@ func (r *Route) Validate() error {
return ErrRoutesInvalidIdleTimeout
}
if r.Timeout > r.IdleTimeout {
return ErrRoutesTimeoutLongerThanIdle
}
if r.Memory < 1 || r.Memory > MaxMemory {
return ErrRoutesInvalidMemory
}

1
api/server/routes_test.go
View File

@@ -290,7 +290,6 @@ func TestRouteUpdate(t *testing.T) {
{ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "type": "async", "timeout": 3601 } }`, http.StatusBadRequest, models.ErrRoutesInvalidTimeout},
{ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "type": "async", "timeout": 121, "idle_timeout": 240 } }`, http.StatusOK, nil}, // should work if async
{ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "idle_timeout": 3601 } }`, http.StatusBadRequest, models.ErrRoutesInvalidIdleTimeout},
{ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "timeout": 241 } }`, http.StatusBadRequest, models.ErrRoutesTimeoutLongerThanIdle},
{ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "memory": 100000000000000 } }`, http.StatusBadRequest, models.ErrRoutesInvalidMemory},
// TODO this should be correct, waiting for patch to come in
//{ds, logs.NewMock(), http.MethodPatch, "/v1/apps/b/routes/myroute/dont", `{ "route": {} }`, http.StatusNotFound, models.ErrAppsNotFound},