feat: add support for custom function routes (#481)

Author: eduardoboucas

go/models/function_config.go

@@ -793,10 +793,20 @@ func bundleFromManifest(ctx context.Context, manifestFile *os.File, observer Dep
 			})
 		}
 
-		if function.DisplayName != "" || function.Generator != "" {
+		routes := make([]*models.FunctionRoute, len(function.Routes))
+		for i, route := range function.Routes {
+			routes[i] = &models.FunctionRoute{
+				Pattern:    route.Pattern,
+				Literal:    route.Literal,
+				Expression: route.Expression,
+			}
+		}
+
+		if function.DisplayName != "" || function.Generator != "" || len(routes) > 0 {
 			functionsConfig[file.Name] = models.FunctionConfig{
 				DisplayName: function.DisplayName,
 				Generator:   function.Generator,
+				Routes:      routes,
 			}
 		}
 

go/models/function_route.go

@@ -472,7 +472,17 @@ func TestBundleWithManifest(t *testing.T) {
 				"displayName": "Hello Javascript Function",
 				"generator": "@netlify/[email protected]",
 				"name": "hello-js-function-test",
-				"schedule": "* * * * *"
+				"schedule": "* * * * *",
+				"routes": [
+					{
+						"pattern": "/products",
+						"literal": "/products"
+					},
+					{
+						"pattern": "/products/:id",
+						"expression": "^/products/(.*)$"
+					}
+				]
 			},
 			{
 				"path": "%s",
@@ -502,9 +512,19 @@ func TestBundleWithManifest(t *testing.T) {
 	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)
 
+	helloJSConfig := functionsConfig["hello-js-function-test"]
+
 	assert.Equal(t, 1, len(functionsConfig))
-	assert.Equal(t, "Hello Javascript Function", functionsConfig["hello-js-function-test"].DisplayName)
-	assert.Equal(t, "@netlify/[email protected]", functionsConfig["hello-js-function-test"].Generator)
+	assert.Equal(t, "Hello Javascript Function", helloJSConfig.DisplayName)
+	assert.Equal(t, "@netlify/[email protected]", helloJSConfig.Generator)
+
+	assert.Equal(t, "/products", helloJSConfig.Routes[0].Pattern)
+	assert.Equal(t, "/products", helloJSConfig.Routes[0].Literal)
+	assert.Empty(t, helloJSConfig.Routes[0].Expression)
+
+	assert.Equal(t, "/products/:id", helloJSConfig.Routes[1].Pattern)
+	assert.Empty(t, helloJSConfig.Routes[1].Literal)
+	assert.Equal(t, "^/products/(.*)$", helloJSConfig.Routes[1].Expression)
 }
 
 func TestReadZipRuntime(t *testing.T) {

go/porcelain/deploy.go

@@ -7,13 +7,20 @@ type functionsManifest struct {
 }
 
 type functionsManifestEntry struct {
-	MainFile       string `json:"mainFile"`
-	Name           string `json:"name"`
-	Path           string `json:"path"`
-	Runtime        string `json:"runtime"`
-	RuntimeVersion string `json:"runtimeVersion"`
-	Schedule       string `json:"schedule"`
-	DisplayName    string `json:"displayName"`
-	Generator      string `json:"generator"`
-	InvocationMode string `json:"invocationMode"`
+	MainFile       string          `json:"mainFile"`
+	Name           string          `json:"name"`
+	Path           string          `json:"path"`
+	Runtime        string          `json:"runtime"`
+	RuntimeVersion string          `json:"runtimeVersion"`
+	Schedule       string          `json:"schedule"`
+	DisplayName    string          `json:"displayName"`
+	Generator      string          `json:"generator"`
+	InvocationMode string          `json:"invocationMode"`
+	Routes         []functionRoute `json:"routes"`
+}
+
+type functionRoute struct {
+	Pattern    string `json:"pattern"`
+	Literal    string `json:"literal"`
+	Expression string `json:"expression"`
 }

go/porcelain/deploy_test.go

@@ -3620,6 +3620,19 @@ definitions:
         type: string
       generator:
         type: string
+      routes:
+        type: array
+        items:
+          $ref: '#/definitions/functionRoute'      
+  functionRoute:
+    type: object
+    properties:
+      pattern:
+        type: string
+      literal:
+        type: string
+      expression:
+        type: string          
 parameters:
   page:
     type: integer