refactor: move timeout to query param

Author: Skn0tt

go/models/function_config.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)
 
@@ -830,7 +833,6 @@ func bundleFromManifest(ctx context.Context, manifestFile *os.File, observer Dep
 				Routes:      routes,
 				BuildData:   function.BuildData,
 				Priority:    int64(function.Priority),
-				Timeout:     int64(function.Timeout),
 			}
 
 			if function.TrafficRules != nil {

go/plumbing/operations/upload_deploy_function_parameters.go

@@ -694,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)
@@ -704,7 +705,6 @@ func TestBundleWithManifest(t *testing.T) {
 	assert.Equal(t, 1, len(functionsConfig))
 	assert.Equal(t, "Hello Javascript Function", helloJSConfig.DisplayName)
 	assert.Equal(t, "@netlify/[email protected]", helloJSConfig.Generator)
-	assert.Equal(t, int64(60), helloJSConfig.Timeout)
 	assert.EqualValues(t, 2, helloJSConfig.BuildData.(map[string]interface{})["runtimeAPIVersion"])
 
 	assert.Equal(t, "/products", helloJSConfig.Routes[0].Pattern)

go/porcelain/deploy.go

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

go/porcelain/deploy_test.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
@@ -3859,8 +3862,6 @@ definitions:
         type: string
       generator:
         type: string
-      timeout:
-        type: integer
       build_data:
         type: object
       routes: