Merge branch 'master' into erikw/lambda-error-msg

Author: jenae-janzen

CHANGELOG.md

@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [2.21.1](https://github.com/netlify/open-api/compare/v2.21.0...v2.21.1) (2023-09-07)
+
+
+### Bug Fixes
+
+* fileUpload error casting does not conform to interface ([#486](https://github.com/netlify/open-api/issues/486)) ([f95a00b](https://github.com/netlify/open-api/commit/f95a00bf160dcbbcd89a71e98f6e4eda986e8f9b))
+
+## [2.21.0](https://github.com/netlify/open-api/compare/v2.20.0...v2.21.0) (2023-08-25)
+
+
+### Features
+
+* support function route `methods` field ([b930d21](https://github.com/netlify/open-api/commit/b930d21384358d86ec9ec6f06fec403ade9119f0))
+
+## [2.20.0](https://github.com/netlify/open-api/compare/v2.19.1...v2.20.0) (2023-08-09)
+
+
+### Features
+
+* add support for custom function routes ([#481](https://github.com/netlify/open-api/issues/481)) ([d30c25b](https://github.com/netlify/open-api/commit/d30c25b9f6d2f9626c51e4a938c11cfbfc51ee93))
+
 ## [2.19.1](https://github.com/netlify/open-api/compare/v2.19.0...v2.19.1) (2023-07-12)
 
 

go/models/function_config.go

@@ -21,7 +21,6 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
-	apierrors "github.com/go-openapi/errors"
 	"github.com/pkg/errors"
 	"github.com/rsc/goversion/version"
 	"github.com/sirupsen/logrus"
@@ -101,6 +100,11 @@ type DeployOptions struct {
 	functionsConfig   map[string]models.FunctionConfig
 }
 
+type deployApiError interface {
+	error
+	Code() int
+}
+
 type uploadError struct {
 	err   error
 	mutex *sync.Mutex
@@ -473,6 +477,7 @@ func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundl
 		"deploy_id": d.ID,
 		"file_path": f.Name,
 		"file_sum":  f.Sum,
+		"file_size": f.Size,
 	}).Debug("Uploading file")
 
 	b := backoff.NewExponentialBackOff()
@@ -539,7 +544,7 @@ func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundl
 
 		if operationError != nil {
 			context.GetLogger(ctx).WithError(operationError).Errorf("Failed to upload file %v", f.Name)
-			apiErr, ok := operationError.(apierrors.Error)
+			apiErr, ok := operationError.(deployApiError)
 
 			if ok {
 				if apiErr.Code() == 401 {
@@ -801,10 +806,21 @@ 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,
+				Methods:    route.Methods,
+			}
+		}
+
+		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

@@ -593,7 +593,18 @@ 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/(.*)$",
+						"methods": ["GET", "POST"]
+					}
+				]
 			},
 			{
 				"path": "%s",
@@ -623,9 +634,20 @@ 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)
+	assert.Equal(t, []string{"GET", "POST"}, helloJSConfig.Routes[1].Methods)
 }
 
 func TestReadZipRuntime(t *testing.T) {

go/porcelain/deploy.go

@@ -7,13 +7,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"`
-	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"`
+	Methods    []string `json:"methods"`
 }

go/porcelain/deploy_test.go

@@ -1,7 +1,7 @@
 {
   "name": "@netlify/open-api",
   "description": "Netlify's open-api definition as a module",
-  "version": "2.19.1",
+  "version": "2.21.1",
   "author": "Netlify",
   "ava": {
     "files": [

go/porcelain/functions_manifest.go

@@ -1,6 +1,6 @@
 swagger: '2.0'
 info:
-  version: 2.19.1
+  version: 2.21.1
   title: Netlify's API documentation
   description: >-
     Netlify is a hosting service for the programmable web. It understands your
@@ -3620,6 +3620,24 @@ 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    
+      methods:
+        type: array
+        items:
+          type: string
+          enum: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS']
 parameters:
   page:
     type: integer