Merge branch 'main' of https://github.com/vercel-community/rust

ecklf · ecklf · commit 1599765fc162 · 2023-03-23T17:36:16.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,16 +2,9 @@
 
 members = [
     "vercel_runtime",
-    "examples/cron",
-    "examples/nextjs",
-    "examples/simple",
+    "examples/*",
 ]
 
 exclude = [
-    "test/fixtures/01-include-files",
-    "test/fixtures/02-with-utility",
-    "test/fixtures/03-with-function",
-    "test/fixtures/04-with-parameter",
-    "test/fixtures/05-with-similar-entrypaths",
-    "test/fixtures/06-with-toolchain-override"
+    "test/*",
 ]
diff --git a/examples/cron/Cargo.toml b/examples/cron/Cargo.toml
@@ -13,8 +13,8 @@ serde_json = { version = "1.0.86", features = ["raw_value"] }
 serde_derive = "1.0.9"
 rand = "0.8.5"
 slack-morphism = { version = "1.2.2", features = ["hyper"] }
-vercel_runtime = "0.2.1"
-# vercel_runtime = { version = "0.2.1", path = "../../vercel_runtime" }
+url = "2.3.1"
+vercel_runtime = "0.3.4"
 
 [[bin]]
 name = "cron"
diff --git a/examples/cron/api/cron.rs b/examples/cron/api/cron.rs
@@ -1,4 +1,6 @@
 use slack_morphism::{errors::SlackClientError, prelude::*};
+use std::collections::HashMap;
+use url::Url;
 use vercel_runtime::{run, Body, Error, Request, Response, StatusCode};
 
 #[derive(Debug, Clone)]
@@ -28,7 +30,18 @@ impl<T: SlackClientHttpConnector + Send + Sync> Lambda<'_, T> {
         self.slack.chat_post_message(&post_chat_req).await
     }
 
-    pub async fn handler(&self, _req: Request) -> Result<Response<Body>, Error> {
+    pub async fn handler(&self, req: Request) -> Result<Response<Body>, Error> {
+        let parsed_url = Url::parse(&req.uri().to_string()).unwrap();
+        let hash_query: HashMap<String, String> = parsed_url.query_pairs().into_owned().collect();
+        let secret = hash_query.get("secret").map(|x| &**x);
+
+        // https://vercel.com/docs/cron-jobs#how-to-secure-cron-jobs
+        if secret != Some("geheim") {
+            return Ok(Response::builder()
+                .status(StatusCode::NOT_FOUND)
+                .body(().into())?);
+        }
+
         let message = SlackMessage {};
 
         self.post_message(&message, "#general").await?;
diff --git a/examples/cron/public/.gitkeep b/examples/cron/public/.gitkeep
diff --git a/examples/cron/vercel.json b/examples/cron/vercel.json
@@ -1,12 +1,13 @@
 {
+  "outputDirectory": "public",
   "functions": {
     "api/**/*.rs": {
       "runtime": "vercel-rust@4.0.0-beta.3"
     }
   },
   "crons": [
     {
-      "path": "/api/cron",
+      "path": "/api/cron?secret=geheim",
       "schedule": "30 9 * * *"
     }
   ]
diff --git a/examples/nextjs/Cargo.toml b/examples/nextjs/Cargo.toml
@@ -13,8 +13,7 @@ serde_json = { version = "1.0.86", features = ["raw_value"] }
 serde_derive = "1.0.9"
 rand = "0.8.5"
 oorandom = "11.1.3"
-vercel_runtime = "0.2.1"
-# vercel_runtime = { version = "0.2.1", path = "../../vercel_runtime" }
+vercel_runtime = "0.3.4"
 
 [[bin]]
 name = "rust"
diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
@@ -30,5 +30,8 @@
     "postcss": "^8.4.21",
     "tailwindcss": "^3.2.7",
     "tailwindcss-radix": "^2.8.0"
+  },
+  "engines": {
+    "node": ">=16 <18"
   }
 }
diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml
@@ -12,8 +12,7 @@ serde_json = { version = "1.0.86", features = ["raw_value"] }
 serde_derive = "1.0.9"
 rand = "0.8.5"
 url = "2.3.1"
-vercel_runtime = "0.2.1"
-# vercel_runtime = { version = "0.2.1", path = "../../vercel_runtime" }
+vercel_runtime = "0.3.4"
 
 [lib]
 path = "src-rs/lib.rs"
diff --git a/examples/simple/public/.gitkeep b/examples/simple/public/.gitkeep
diff --git a/examples/simple/vercel.json b/examples/simple/vercel.json
@@ -1,4 +1,5 @@
 {
+  "outputDirectory": "public",
   "functions": {
     "api/**/*.rs": {
       "runtime": "vercel-rust@4.0.0-beta.3"

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`{`
	`2`	`+ "outputDirectory": "public",`
`2`	`3`	`"functions": {`
`3`	`4`	`"api/*/.rs": {`
`4`	`5`	`"runtime": "vercel-rust@4.0.0-beta.3"`
`5`	`6`	`}`
`6`	`7`	`},`
`7`	`8`	`"crons": [`
`8`	`9`	`{`
`9`		`- "path": "/api/cron",`
	`10`	`+ "path": "/api/cron?secret=geheim",`
`10`	`11`	`"schedule": "30 9 * * *"`
`11`	`12`	`}`
`12`	`13`	`]`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,8 @@`
`30`	`30`	`"postcss": "^8.4.21",`
`31`	`31`	`"tailwindcss": "^3.2.7",`
`32`	`32`	`"tailwindcss-radix": "^2.8.0"`
	`33`	`+ },`
	`34`	`+ "engines": {`
	`35`	`+ "node": ">=16 <18"`
`33`	`36`	`}`
`34`	`37`	`}`