netlify-cli 17.13.2 → 17.14.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "17.13.2",
+  "version": "17.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "17.13.2",
+      "version": "17.14.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.13.2",
+  "version": "17.14.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {

package/src/commands/functions/functions-create.js

@@ -23,7 +23,6 @@ import { readRepoURL, validateRepoURL } from '../../utils/read-repo-url.js';
 const copyTemplateDir = promisify(copyTemplateDirOriginal);
 const require = createRequire(import.meta.url);
 const templatesDir = path.resolve(dirname(fileURLToPath(import.meta.url)), '../../functions-templates');
-const showRustTemplates = process.env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE === 'true';
 /**
  * Ensure that there's a sub-directory in `src/functions-templates` named after
  * each `value` property in this list.
@@ -32,7 +31,7 @@ const languages = [
     { name: 'JavaScript', value: 'javascript' },
     { name: 'TypeScript', value: 'typescript' },
     { name: 'Go', value: 'go' },
-    showRustTemplates && { name: 'Rust', value: 'rust' },
+    { name: 'Rust', value: 'rust' },
 ];
 /**
  * prompt for a name if name not supplied
@@ -153,11 +152,9 @@ const pickTemplate = async function ({ language: languageFromFlag }, funcType) {
     let language = languageFromFlag;
     if (language === undefined) {
         const langs = funcType === 'edge'
-            ? // @ts-expect-error TS(2339) FIXME: Property 'value' does not exist on type 'false | {... Remove this comment to see the full error message
-                languages.filter((lang) => lang.value === 'javascript' || lang.value === 'typescript')
+            ? languages.filter((lang) => lang.value === 'javascript' || lang.value === 'typescript')
             : languages.filter(Boolean);
         const { language: languageFromPrompt } = await inquirer.prompt({
-            // @ts-expect-error
             choices: langs,
             message: 'Select the language of your function',
             name: 'language',
@@ -202,7 +199,7 @@ const DEFAULT_PRIORITY = 999;
 const selectTypeOfFunc = async () => {
     const functionTypes = [
         { name: 'Edge function (Deno)', value: 'edge' },
-        { name: 'Serverless function (Node/Go)', value: 'serverless' },
+        { name: 'Serverless function (Node/Go/Rust)', value: 'serverless' },
     ];
     const { functionType } = await inquirer.prompt([
         {
@@ -468,6 +465,11 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
         }
         await installAddons(command, addons, path.resolve(functionPath));
         await handleOnComplete({ command, onComplete });
+        log();
+        log(chalk.greenBright(`Function created!`));
+        if (lang == 'rust') {
+            log(chalk.green(`Please note that Rust functions require setting the NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE environment variable to 'true' on your site.`));
+        }
     }
 };
 const TEMPLATE_PERMISSIONS = 0o777;

package/src/functions-templates/rust/hello-world/src/main.rs

@@ -1,7 +1,7 @@
 use aws_lambda_events::event::apigw::{ApiGatewayProxyRequest, ApiGatewayProxyResponse};
 use aws_lambda_events::encodings::Body;
 use http::header::HeaderMap;
-use lambda_runtime::{handler_fn, Context, Error};
+use lambda_runtime::{service_fn, Error, LambdaEvent};
 use log::LevelFilter;
 use simple_logger::SimpleLogger;
 
@@ -9,13 +9,13 @@ use simple_logger::SimpleLogger;
 async fn main() -> Result<(), Error> {
     SimpleLogger::new().with_utc_timestamps().with_level(LevelFilter::Info).init().unwrap();
 
-    let func = handler_fn(my_handler);
+    let func = service_fn(my_handler);
     lambda_runtime::run(func).await?;
     Ok(())
 }
 
-pub(crate) async fn my_handler(event: ApiGatewayProxyRequest, _ctx: Context) -> Result<ApiGatewayProxyResponse, Error> {
-    let path = event.path.unwrap();
+pub(crate) async fn my_handler(event: LambdaEvent<ApiGatewayProxyRequest>) -> Result<ApiGatewayProxyResponse, Error> {
+    let path = event.payload.path.unwrap();
 
     let resp = ApiGatewayProxyResponse {
         status_code: 200,