add lambda.timeout back, defaulting to 60s. Closes #814

I will leave this undocumented for now since it is an uncommon use-case at the moment,
but you can make this whatever you like for background processing by crafting your own
Lambda event which looks like a request, bypassing API Gateway

Author: tj

config/lambda.go

@@ -1,9 +1,5 @@
 package config
 
-import (
-	"errors"
-)
-
 // defaultRuntime is the default runtime.
 var defaultRuntime = "nodejs10.x"
 
@@ -54,6 +50,10 @@ type Lambda struct {
 
 // Default implementation.
 func (l *Lambda) Default() error {
+	if l.Timeout == 0 {
+		l.Timeout = 60
+	}
+
 	if l.Memory == 0 {
 		l.Memory = 512
 	}
@@ -69,10 +69,6 @@ func (l *Lambda) Default() error {
 
 // Validate implementation.
 func (l *Lambda) Validate() error {
-	if l.Timeout != 0 {
-		return errors.New(".lambda.timeout is deprecated, use .proxy.timeout")
-	}
-
 	return nil
 }
 

config/lambda_test.go

@@ -9,7 +9,7 @@ import (
 func TestLambda(t *testing.T) {
 	c := &Lambda{}
 	assert.NoError(t, c.Default(), "default")
-	assert.Equal(t, 0, c.Timeout, "timeout")
+	assert.Equal(t, 60, c.Timeout, "timeout")
 	assert.Equal(t, 512, c.Memory, "timeout")
 }
 

platform/lambda/lambda.go

@@ -563,7 +563,7 @@ retry:
 		Runtime:      &p.config.Lambda.Runtime,
 		Role:         &p.config.Lambda.Role,
 		MemorySize:   aws.Int64(int64(p.config.Lambda.Memory)),
-		Timeout:      aws.Int64(int64(p.config.Proxy.Timeout + 3)),
+		Timeout:      aws.Int64(int64(p.config.Lambda.Timeout)),
 		Publish:      aws.Bool(true),
 		Environment:  env,
 		Code: &lambda.FunctionCode{
@@ -627,7 +627,7 @@ func (p *Platform) updateFunction(c *lambda.Lambda, a *apigateway.APIGateway, up
 		Runtime:      &p.config.Lambda.Runtime,
 		Role:         &p.config.Lambda.Role,
 		MemorySize:   aws.Int64(int64(p.config.Lambda.Memory)),
-		Timeout:      aws.Int64(int64(p.config.Proxy.Timeout + 3)),
+		Timeout:      aws.Int64(int64(p.config.Lambda.Timeout)),
 		Environment:  env,
 		VpcConfig:    p.vpc(),
 	})