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

more strict configuration of routes

Browse Source 
* idle_timeout max of 1h
* timeout max of 120s for sync, 1h for async
* max memory of 8GB
* do full route validation before call invocation
* ensure that idle_timeout >= timeout

we are now doing validation of updating route inside of the database
transaction, which is what we should have been doing all along really.
we need this behavior to ensure that the idle timeout is longer than the
timeout, among other benefits (like not updating the most recent version of
the existing struct and overwriting previous updates, yay). since we have
this, we can get rid of the weird skipZero behavior on validate too and
validate the real deal holyfield.

validating the route before making the call is handy so that we don't do weird
things like run a func that wants to use 300GB of RAM and run for 3 weeks.

closes #192
closes #344
closes #162
This commit is contained in:
Reed Allman
2017-09-20 23:10:15 -07:00
parent 93e6bf45d0
commit caba9e0ec6
18 changed files with 175 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
api/models/route.go
View File

@@ -8,8 +8,14 @@ import (
)
const (
DefaultRouteTimeout = 30 // seconds
DefaultIdleTimeout = 30 // seconds
DefaultTimeout = 30 // seconds
DefaultIdleTimeout = 30 // seconds
DefaultMemory = 128 // MB
MaxSyncTimeout = 120 // 2 minutes
MaxAsyncTimeout = 3600 // 1 hour
MaxIdleTimeout = MaxAsyncTimeout
MaxMemory = 1024 * 8 // 8GB TODO should probably be a var of machine max?
)
type Routes []*Route
@@ -30,7 +36,7 @@ type Route struct {
// SetDefaults sets zeroed field to defaults.
func (r *Route) SetDefaults() {
if r.Memory == 0 {
r.Memory = 128
r.Memory = DefaultMemory
}
if r.Type == TypeNone {
@@ -50,7 +56,7 @@ func (r *Route) SetDefaults() {
}
if r.Timeout == 0 {
r.Timeout = DefaultRouteTimeout
r.Timeout = DefaultTimeout
}
if r.IdleTimeout == 0 {
@@ -58,24 +64,15 @@ func (r *Route) SetDefaults() {
}
}
// Validate validates field values, skipping zeroed fields if skipZero is true.
// it returns the first error, if any.
func (r *Route) Validate(skipZero bool) error {
if !skipZero {
if r.AppName == "" {
return ErrMissingAppName
}
if r.Path == "" {
return ErrMissingPath
}
if r.Image == "" {
return ErrMissingImage
}
// Validate validates all field values, returning the first error, if any.
func (r *Route) Validate() error {
if r.AppName == "" {
return ErrRoutesMissingAppName
}
if !skipZero || r.Path != "" {
if r.Path == "" {
return ErrRoutesMissingPath
} else {
u, err := url.Parse(r.Path)
if err != nil {
return ErrPathMalformed
@@ -86,28 +83,38 @@ func (r *Route) Validate(skipZero bool) error {
}
if !path.IsAbs(u.Path) {
return ErrInvalidPath
return ErrRoutesInvalidPath
}
}
if !skipZero || r.Type != "" {
if r.Type != TypeAsync && r.Type != TypeSync {
return ErrInvalidType
}
if r.Image == "" {
return ErrRoutesMissingImage
}
if !skipZero || r.Format != "" {
if r.Format != FormatDefault && r.Format != FormatHTTP {
return ErrInvalidFormat
}
if r.Type != TypeAsync && r.Type != TypeSync {
return ErrRoutesInvalidType
}
if r.Timeout < 0 {
return ErrNegativeTimeout
if r.Format != FormatDefault && r.Format != FormatHTTP {
return ErrRoutesInvalidFormat
}
if r.IdleTimeout < 0 {
return ErrNegativeIdleTimeout
if r.Timeout <= 0 ||
(r.Type == TypeSync && r.Timeout > MaxSyncTimeout) ||
(r.Type == TypeAsync && r.Timeout > MaxAsyncTimeout) {
return ErrRoutesInvalidTimeout
}
if r.IdleTimeout <= 0 || r.IdleTimeout > MaxIdleTimeout {
return ErrRoutesInvalidIdleTimeout
}
if r.Timeout > r.IdleTimeout {
return ErrRoutesTimeoutLongerThanIdle
}
if r.Memory < 1 || r.Memory > MaxMemory {
return ErrRoutesInvalidMemory
}
return nil