feat: support function timeout property (#537)

Co-authored-by: Antonio Rodríguez <antonio.rodriguez@netlify.com>

Author: Skn0tt

go/plumbing/operations/upload_deploy_function_parameters.go

@@ -127,6 +127,7 @@ type FileBundle struct {
 
 type FunctionMetadata struct {
 InvocationMode string
+Timeout int64
 }
 
 type toolchainSpec struct {
@@ -536,10 +537,11 @@ func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundl
 
 if f.FunctionMetadata != nil {
 params = params.WithInvocationMode(&f.FunctionMetadata.InvocationMode)
+params = params.WithTimeout(&f.FunctionMetadata.Timeout)
 }
 
 if timeout != 0 {
-params.SetTimeout(timeout)
+params.SetRequestTimeout(timeout)
 }
 _, operationError = n.Operations.UploadDeployFunction(params, authInfo)
 if operationError != nil {
@@ -797,6 +799,7 @@ func bundleFromManifest(ctx context.Context, manifestFile *os.File, observer Dep
 
 meta := FunctionMetadata{
 InvocationMode: function.InvocationMode,
+Timeout: function.Timeout,
 }
 file, err := newFunctionFile(function.Path, fileInfo, runtime, &meta, observer)
 
@@ -822,7 +825,7 @@ func bundleFromManifest(ctx context.Context, manifestFile *os.File, observer Dep
 }
 }
 
-hasConfig := function.DisplayName != "" || function.Generator != "" || len(routes) > 0 || len(function.BuildData) > 0 || function.Priority != 0 || function.TrafficRules != nil
+hasConfig := function.DisplayName != "" || function.Generator != "" || len(routes) > 0 || len(function.BuildData) > 0 || function.Priority != 0 || function.TrafficRules != nil || function.Timeout != 0
 if hasConfig {
 cfg := models.FunctionConfig{
 DisplayName: function.DisplayName,

go/porcelain/deploy.go

@@ -646,6 +646,7 @@ func TestBundleWithManifest(t *testing.T) {
 "mainFile": "/some/path/hello-js-function-test.js",
 "displayName": "Hello Javascript Function",
 "generator": "@netlify/fake-plugin@1.0.0",
+"timeout": 60,
 "buildData": { "runtimeAPIVersion": 2 },
 "name": "hello-js-function-test",
 "schedule": "* * * * *",
@@ -693,6 +694,7 @@ func TestBundleWithManifest(t *testing.T) {
 assert.Equal(t, 3, len(functions.Files))
 assert.Equal(t, "a-runtime", functions.Files["hello-js-function-test"].Runtime)
 assert.Empty(t, functions.Files["hello-js-function-test"].FunctionMetadata.InvocationMode)
+assert.Equal(t, int64(60), functions.Files["hello-js-function-test"].FunctionMetadata.Timeout)
 assert.Equal(t, "some-other-runtime", functions.Files["hello-py-function-test"].Runtime)
 assert.Equal(t, "stream", functions.Files["hello-py-function-test"].FunctionMetadata.InvocationMode)
 assert.Equal(t, "provided.al2", functions.Files["hello-go-binary-function"].Runtime)

go/porcelain/deploy_test.go

@@ -17,6 +17,7 @@ type functionsManifestEntry struct {
 Schedule string `json:"schedule"`
 DisplayName string `json:"displayName"`
 Generator string `json:"generator"`
+Timeout int64 `json:"timeout"`
 BuildData map[string]interface{} `json:"buildData"`
 InvocationMode string `json:"invocationMode"`
 Routes []functionRoute `json:"routes"`

go/porcelain/functions_manifest.go

@@ -1478,6 +1478,9 @@ paths:
  - name: invocation_mode
  in: query
  type: string
+ - name: timeout
+ in: query
+ type: integer
  - name: size
  type: integer
  in: query