netlify-cli 9.13.6 → 9.16.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "9.13.6",
+  "version": "9.16.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "9.13.6",
+      "version": "9.16.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -15,7 +15,7 @@
         "@netlify/framework-info": "^9.0.2",
         "@netlify/local-functions-proxy": "^1.1.1",
         "@netlify/plugin-edge-handlers": "^3.0.7",
-        "@netlify/plugins-list": "^6.17.0",
+        "@netlify/plugins-list": "^6.18.1",
         "@netlify/routing-local-proxy": "^0.34.1",
         "@netlify/zip-it-and-ship-it": "^5.9.0",
         "@octokit/rest": "^18.0.0",
@@ -126,7 +126,7 @@
       },
       "devDependencies": {
         "@babel/preset-react": "^7.12.13",
-        "@netlify/eslint-config-node": "^5.1.7",
+        "@netlify/eslint-config-node": "^5.1.8",
         "ava": "^4.0.0",
         "c8": "^7.11.0",
         "eslint-plugin-sort-destructure-keys": "^1.3.5",
@@ -3452,9 +3452,9 @@
       }
     },
     "node_modules/@netlify/eslint-config-node": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-5.1.7.tgz",
-      "integrity": "sha512-5s1FtyIsfOru4kmsio3FGdApl8KvJTYeVfOT13f9KW5qeLkQfON8KldaJSJsSqJPC7T0ZELNwTEXrZSMihhtSQ==",
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-5.1.8.tgz",
+      "integrity": "sha512-A1UsNwPXsjryQxBPXGmEynIVaYq4o2VpCiDfkZiIQ0FTXzJv+aBopxwaKBvdE4NgHueLAgpUlWWCJ7Xkt4zN0Q==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.13.8",
@@ -4317,9 +4317,9 @@
       }
     },
     "node_modules/@netlify/plugins-list": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.17.0.tgz",
-      "integrity": "sha512-XQMijnVOxbZwkOeSzUZ8Hwon8WIv9uka5R6+mjJs25lcFiTscA8HqHWjhSHf2xPSrcKopJm4BNJZja5YHV3NQg==",
+      "version": "6.18.1",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.18.1.tgz",
+      "integrity": "sha512-4aAF+lpoBYOIVMuTxge2YNjNKdMxnsV1equq0VtknBW6EGJ9yFiTPyL0NU0MXDWTWk7dNu8tS5+Uw7LN7+sgcg==",
       "engines": {
         "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
@@ -26726,9 +26726,9 @@
       "integrity": "sha512-tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="
     },
     "@netlify/eslint-config-node": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-5.1.7.tgz",
-      "integrity": "sha512-5s1FtyIsfOru4kmsio3FGdApl8KvJTYeVfOT13f9KW5qeLkQfON8KldaJSJsSqJPC7T0ZELNwTEXrZSMihhtSQ==",
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-5.1.8.tgz",
+      "integrity": "sha512-A1UsNwPXsjryQxBPXGmEynIVaYq4o2VpCiDfkZiIQ0FTXzJv+aBopxwaKBvdE4NgHueLAgpUlWWCJ7Xkt4zN0Q==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.13.8",
@@ -27260,9 +27260,9 @@
       }
     },
     "@netlify/plugins-list": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.17.0.tgz",
-      "integrity": "sha512-XQMijnVOxbZwkOeSzUZ8Hwon8WIv9uka5R6+mjJs25lcFiTscA8HqHWjhSHf2xPSrcKopJm4BNJZja5YHV3NQg=="
+      "version": "6.18.1",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.18.1.tgz",
+      "integrity": "sha512-4aAF+lpoBYOIVMuTxge2YNjNKdMxnsV1equq0VtknBW6EGJ9yFiTPyL0NU0MXDWTWk7dNu8tS5+Uw7LN7+sgcg=="
     },
     "@netlify/routing-local-proxy": {
       "version": "0.34.1",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "9.13.6",
+  "version": "9.16.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -30,6 +30,7 @@
     "Cole Bosmann",
     "Dan Croak (https://twitter.com/croaky)",
     "Dan Loewenherz <dan@lionheartsw.com> (https://twitter.com/dwlz)",
+    "Daniel Woelfel <dwwoelfel@gmail.com> (https://twitter.com/danielwoelfel)",
     "Dave Ackerman <dmackerman@gmail.com>",
     "David Calavera <david@netlify.com> (https://twitter.com/calavera)",
     "David Lemler <dlemler@pm.me> (https://twitter.com/davidlemlerm)",
@@ -47,7 +48,7 @@
     "Gergely Nemeth (https://twitter.com/nthgergo)",
     "HonkingGoose",
     "Ian Martorell <ianmartorell@gmail.com>",
-    "Ibrahima",
+    "Ibrahima G. Coulibaly",
     "Jackie Macharia (wangoimacharia.dev)",
     "Jacob Schatz",
     "Jake Jarvis <jake@jarv.is> (https://twitter.com/jakejarvis)",
@@ -209,7 +210,7 @@
     "@netlify/framework-info": "^9.0.2",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugin-edge-handlers": "^3.0.7",
-    "@netlify/plugins-list": "^6.17.0",
+    "@netlify/plugins-list": "^6.18.1",
     "@netlify/routing-local-proxy": "^0.34.1",
     "@netlify/zip-it-and-ship-it": "^5.9.0",
     "@octokit/rest": "^18.0.0",
@@ -316,7 +317,7 @@
   },
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
-    "@netlify/eslint-config-node": "^5.1.7",
+    "@netlify/eslint-config-node": "^5.1.8",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",

package/src/commands/dev/dev.js

@@ -294,7 +294,9 @@ const startPollingForAPIAuthentication = async function (options) {
         process.env.ONEGRAPH_AUTHLIFY_TOKEN = netlifyGraphJWT
         process.env.NETLIFY_GRAPH_TOKEN = netlifyGraphJWT
       }
-    } else {
+    } else if (!authlifyTokenId) {
+      // If there's no `authlifyTokenId`, it's because the user disabled API
+      // Auth. Delete the config in this case.
       delete config.netlifyGraphConfig
     }
 

package/src/functions-templates/go/scheduled-function/.netlify-function-template.js

@@ -0,0 +1,5 @@
+module.exports = {
+  name: 'scheduled-function',
+  priority: 1,
+  description: 'Basic implementation of a scheduled function in Go.',
+}

package/src/functions-templates/go/scheduled-function/go.mod

@@ -0,0 +1,5 @@
+module github.com/your-github-handle/{{name}}
+
+go 1.17
+
+require github.com/aws/aws-lambda-go v1.28.0

package/src/functions-templates/go/scheduled-function/go.sum

@@ -0,0 +1,21 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/aws/aws-lambda-go v1.28.0 h1:fZiik1PZqW2IyAN4rj+Y0UBaO1IDFlsNo9Zz/XnArK4=
+github.com/aws/aws-lambda-go v1.28.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

package/src/functions-templates/go/scheduled-function/netlify.toml

@@ -0,0 +1,11 @@
+[build]
+functions = "functions"
+
+[build.environment]
+GO_VERSION = "1.17"
+
+[functions]
+directory = "src/"
+
+[functions.hourly-schedule]
+schedule = "@hourly"

package/src/functions-templates/go/scheduled-function/src/hourly-schedule/main.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"log"
+	"net/http"
+	"time"
+
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/aws/aws-lambda-go/lambda"
+)
+
+type requestBody struct {
+	NextRun time.Time `json:"next_run"`
+}
+
+// The schedule for this function is defined inside the netlify.toml file. To learn about scheduled functions 
+// and supported cron extensions, visit https://ntl.fyi/sched-func.
+func handler(ctx context.Context, request events.APIGatewayProxyRequest) (*events.APIGatewayProxyResponse, error) {
+	requestBody := requestBody{}
+
+	if err := json.Unmarshal([]byte(request.Body), &requestBody); err != nil {
+		log.Fatalf("cannot parse request body: %s", err.Error())
+	}
+
+	log.Printf("Next run at %s\n", requestBody.NextRun.Local())
+
+	return &events.APIGatewayProxyResponse{
+		StatusCode: http.StatusNoContent,
+	}, nil
+}
+
+func main() {
+	lambda.Start(handler)
+}

package/src/lib/functions/netlify-function.js

@@ -41,7 +41,9 @@ class NetlifyFunction {
     // Determines whether this is a background function based on the function
     // name.
     this.isBackground = name.endsWith(BACKGROUND_SUFFIX)
-    this.schedule = null
+
+    const functionConfig = config.functions && config.functions[name]
+    this.schedule = functionConfig && functionConfig.schedule
 
     // List of the function's source files. This starts out as an empty set
     // and will get populated on every build.
@@ -91,7 +93,7 @@ class NetlifyFunction {
 
       this.buildData = buildData
       this.srcFiles = srcFilesSet
-      this.schedule = schedule
+      this.schedule = schedule || this.schedule
 
       return { srcFilesDiff }
     } catch (error) {

package/src/lib/functions/registry.js

@@ -177,6 +177,7 @@ class FunctionsRegistry {
         buildGoSource: true,
         buildRustSource: env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE === 'true',
       },
+      config: this.config,
     })
 
     // Before registering any functions, we look for any functions that were on

package/src/lib/functions/server.js

@@ -113,6 +113,7 @@ const createHandler = function (options) {
       const jwt = generateNetlifyGraphJWT(config.netlifyGraphConfig)
       event.authlifyToken = jwt
       event.netlifyGraphToken = jwt
+      event.headers['X-Nf-Graph-Token'] = jwt
     }
 
     const clientContext = buildClientContext(request.headers) || {}
@@ -160,7 +161,7 @@ const createHandler = function (options) {
         return
       }
 
-      handleSynchronousFunction(error, result, response)
+      handleSynchronousFunction(error, result, request, response)
     }
   }
 }

package/src/lib/functions/synchronous.js

@@ -1,5 +1,7 @@
 // @ts-check
 const { Buffer } = require('buffer')
+const { readFile } = require('fs').promises
+const { join } = require('path')
 
 const { NETLIFYDEVERR } = require('../../utils')
 
@@ -15,15 +17,15 @@ const addHeaders = (headers, response) => {
   })
 }
 
-const handleSynchronousFunction = function (err, result, response) {
+const handleSynchronousFunction = function (err, result, request, response) {
   if (err) {
-    return handleErr(err, response)
+    return handleErr(err, request, response)
   }
 
   const { error } = validateLambdaResponse(result)
   if (error) {
     console.log(`${NETLIFYDEVERR} ${error}`)
-    return handleErr(error, response)
+    return handleErr(error, request, response)
   }
 
   response.statusCode = result.statusCode
@@ -36,14 +38,36 @@ const handleSynchronousFunction = function (err, result, response) {
   response.end()
 }
 
-const formatLambdaLocalError = (err) => `${err.errorType}: ${err.errorMessage}\n  ${err.stackTrace.join('\n  ')}`
+const formatLambdaLocalError = (err, acceptsHtml) =>
+  acceptsHtml
+    ? JSON.stringify({
+        errorType: err.errorType,
+        errorMessage: err.errorMessage,
+        trace: err.stackTrace,
+      })
+    : `${err.errorType}: ${err.errorMessage}\n ${err.stackTrace.join('\n ')}`
 
-const handleErr = function (err, response) {
+let errorTemplateFile
+
+const renderErrorTemplate = async (errString) => {
+  const regexPattern = /<!--@ERROR-DETAILS-->/g
+  errorTemplateFile = errorTemplateFile || (await readFile(join(__dirname, './templates/function-error.html'), 'utf-8'))
+
+  return errorTemplateFile.replace(regexPattern, errString)
+}
+
+const processRenderedResponse = async (err, request) => {
+  const acceptsHtml = request.headers && request.headers.accept && request.headers.accept.includes('text/html')
+  const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err, acceptsHtml)
+
+  return acceptsHtml ? await renderErrorTemplate(errorString) : errorString
+}
+
+const handleErr = async (err, request, response) => {
   detectAwsSdkError({ err })
 
   response.statusCode = 500
-  const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err)
-  response.end(errorString)
+  response.end(await processRenderedResponse(err, request))
 }
 
 const validateLambdaResponse = (lambdaResponse) => {