feat: add excluded routes to functions (#541)

netlify · Jun 17, 2024 · a2e272e · a2e272e
1 parent 2036c6a
commit a2e272e
Show file tree

Hide file tree

Showing 5 changed files with 131 additions and 20 deletions.
diff --git a/go/models/excluded_function_route.go b/go/models/excluded_function_route.go
diff --git a/go/models/function_config.go b/go/models/function_config.go
diff --git a/go/porcelain/deploy.go b/go/porcelain/deploy.go
@@ -825,14 +825,24 @@ 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 || function.Timeout != 0
+		excludedRoutes := make([]*models.ExcludedFunctionRoute, len(function.ExcludedRoutes))
+		for i, route := range function.ExcludedRoutes {
+			excludedRoutes[i] = &models.ExcludedFunctionRoute{
+				Pattern:    route.Pattern,
+				Literal:    route.Literal,
+				Expression: route.Expression,
+			}
+		}
+
+		hasConfig := function.DisplayName != "" || function.Generator != "" || len(routes) > 0 || len(excludedRoutes) > 0 || len(function.BuildData) > 0 || function.Priority != 0 || function.TrafficRules != nil || function.Timeout != 0
 		if hasConfig {
 			cfg := models.FunctionConfig{
-				DisplayName: function.DisplayName,
-				Generator:   function.Generator,
-				Routes:      routes,
-				BuildData:   function.BuildData,
-				Priority:    int64(function.Priority),
+				DisplayName:    function.DisplayName,
+				Generator:      function.Generator,
+				Routes:         routes,
+				ExcludedRoutes: excludedRoutes,
+				BuildData:      function.BuildData,
+				Priority:       int64(function.Priority),
 			}
 
 			if function.TrafficRules != nil {

diff --git a/go/porcelain/functions_manifest.go b/go/porcelain/functions_manifest.go
@@ -9,20 +9,21 @@ 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"`
-	Timeout        int64                  `json:"timeout"`
-	BuildData      map[string]interface{} `json:"buildData"`
-	InvocationMode string                 `json:"invocationMode"`
-	Routes         []functionRoute        `json:"routes"`
-	Priority       int                    `json:"priority"`
-	TrafficRules   *functionTrafficRules  `json:"trafficRules"`
+	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"`
+	Timeout        int64                   `json:"timeout"`
+	BuildData      map[string]interface{}  `json:"buildData"`
+	InvocationMode string                  `json:"invocationMode"`
+	Routes         []functionRoute         `json:"routes"`
+	ExcludedRoutes []excludedFunctionRoute `json:"excluded_routes"`
+	Priority       int                     `json:"priority"`
+	TrafficRules   *functionTrafficRules   `json:"trafficRules"`
 }
 
 type functionRoute struct {
@@ -33,6 +34,12 @@ type functionRoute struct {
 	PreferStatic bool     `json:"prefer_static"`
 }
 
+type excludedFunctionRoute struct {
+	Pattern    string `json:"pattern"`
+	Literal    string `json:"literal"`
+	Expression string `json:"expression"`
+}
+
 type functionTrafficRules struct {
 	Action struct {
 		Type   string `json:"type"`

diff --git a/swagger.yml b/swagger.yml
@@ -3887,6 +3887,10 @@ definitions:
         type: array
         items:
           $ref: '#/definitions/functionRoute'
+      excluded_routes:
+        type: array
+        items:
+          $ref: '#/definitions/excludedFunctionRoute'          
       priority:
         type: integer
       traffic_rules:
@@ -3907,6 +3911,15 @@ definitions:
           enum: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS']
       prefer_static:
         type: boolean
+  excludedFunctionRoute:
+    type: object
+    properties:
+      pattern:
+        type: string
+      literal:
+        type: string
+      expression:
+        type: string    
   trafficRulesConfig:
     type: object
     properties: