sever/vclient

Author: fulmicoton-dd

.github/workflows/publish_lambda.yaml

@@ -45,7 +45,7 @@ jobs:
           echo "QW_COMMIT_TAGS=$(git tag --points-at HEAD | tr '\n' ',')" >> $GITHUB_ENV
 
       - name: Build Lambda binary
-        run: cross build --release --features lambda-release --target aarch64-unknown-linux-gnu -p quickwit-lambda --bin quickwit-aws-lambda-leaf-search
+        run: cross build --release --features lambda-release --target aarch64-unknown-linux-gnu -p quickwit-lambda-server --bin quickwit-aws-lambda-leaf-search
         env:
           QW_COMMIT_DATE: ${{ env.QW_COMMIT_DATE }}
           QW_COMMIT_HASH: ${{ env.QW_COMMIT_HASH }}

LICENSE-3rdparty.csv

@@ -529,9 +529,11 @@ unicode-width,https://github.com/unicode-rs/unicode-width,MIT OR Apache-2.0,"kwa
 unit-prefix,https://codeberg.org/commons-rs/unit-prefix,MIT,"Fabio Valentini <decathorpe@gmail.com>, Benjamin Sago <ogham@bsago.me>"
 unsafe-libyaml,https://github.com/dtolnay/unsafe-libyaml,MIT,David Tolnay <dtolnay@gmail.com>
 untrusted,https://github.com/briansmith/untrusted,ISC,Brian Smith <brian@briansmith.org>
+ureq-proto,https://github.com/algesten/ureq-proto,MIT OR Apache-2.0,Martin Algesten <martin@algesten.se>
 url,https://github.com/servo/rust-url,MIT OR Apache-2.0,The rust-url developers
 urlencoding,https://github.com/kornelski/rust_urlencoding,MIT,"Kornel <kornel@geekhood.net>, Bertram Truong <b@bertramtruong.com>"
 username,https://pijul.org/darcs/user,MIT OR Apache-2.0,Pierre-Étienne Meunier <pierre-etienne.meunier@aalto.fi>
+utf-8,https://github.com/SimonSapin/rust-utf8,MIT OR Apache-2.0,Simon Sapin <simon.sapin@exyr.org>
 utf8-ranges,https://github.com/BurntSushi/utf8-ranges,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
 utf8_iter,https://github.com/hsivonen/utf8_iter,Apache-2.0 OR MIT,Henri Sivonen <hsivonen@hsivonen.fi>
 utf8parse,https://github.com/alacritty/vte,Apache-2.0 OR MIT,"Joe Wilm <joe@jwilm.com>, Christian Duerr <contact@christianduerr.com>"

quickwit/Cargo.lock

@@ -19,7 +19,8 @@ members = [
   "quickwit-integration-tests",
   "quickwit-jaeger",
   "quickwit-janitor",
-  "quickwit-lambda",
+  "quickwit-lambda-client",
+  "quickwit-lambda-server",
   "quickwit-macros",
   "quickwit-metastore",
 
@@ -57,7 +58,8 @@ default-members = [
   "quickwit-integration-tests",
   "quickwit-jaeger",
   "quickwit-janitor",
-  "quickwit-lambda",
+  "quickwit-lambda-client",
+  "quickwit-lambda-server",
   "quickwit-macros",
   "quickwit-metastore",
   "quickwit-opentelemetry",
@@ -361,7 +363,8 @@ quickwit-ingest = { path = "quickwit-ingest" }
 quickwit-integration-tests = { path = "quickwit-integration-tests" }
 quickwit-jaeger = { path = "quickwit-jaeger" }
 quickwit-janitor = { path = "quickwit-janitor" }
-quickwit-lambda = { path = "quickwit-lambda" }
+quickwit-lambda-client = { path = "quickwit-lambda-client" }
+quickwit-lambda-server = { path = "quickwit-lambda-server" }
 quickwit-macros = { path = "quickwit-macros" }
 quickwit-metastore = { path = "quickwit-metastore" }
 quickwit-opentelemetry = { path = "quickwit-opentelemetry" }

quickwit/Cargo.toml

@@ -102,7 +102,6 @@ release-feature-set = [
   "quickwit-indexing/pulsar",
   "quickwit-indexing/sqs",
   "quickwit-indexing/vrl",
-  "quickwit-serve/lambda-auto-deploy",
   "quickwit-storage/azure",
   "quickwit-storage/gcs",
   "quickwit-metastore/postgres",
@@ -117,7 +116,6 @@ release-feature-vendored-set = [
   "quickwit-indexing/sqs",
   "quickwit-indexing/vrl",
   "quickwit-indexing/vendored-kafka",
-  "quickwit-serve/lambda-auto-deploy",
   "quickwit-storage/azure",
   "quickwit-storage/gcs",
   "quickwit-metastore/postgres",
@@ -131,7 +129,6 @@ release-macos-feature-vendored-set = [
   "quickwit-indexing/sqs",
   "quickwit-indexing/vrl",
   "quickwit-indexing/vendored-kafka-macos",
-  "quickwit-serve/lambda-auto-deploy",
   "quickwit-storage/azure",
   "quickwit-storage/gcs",
   "quickwit-metastore/postgres",

quickwit/quickwit-cli/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "quickwit-lambda-client"
+description = "AWS Lambda client for Quickwit leaf search invocation and deployment"
+
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+documentation.workspace = true
+repository.workspace = true
+authors.workspace = true
+license.workspace = true
+
+[dependencies]
+async-trait = { workspace = true }
+aws-config = { workspace = true }
+aws-sdk-lambda = { workspace = true }
+base64 = { workspace = true }
+prost = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+
+quickwit-config = { workspace = true }
+quickwit-lambda-server = { workspace = true }
+quickwit-proto = { workspace = true }
+quickwit-search = { workspace = true }
+
+[build-dependencies]
+ureq = { workspace = true }
+
+[features]
+default = []
+testsuite = []

quickwit/quickwit-lambda-client/Cargo.toml

@@ -12,40 +12,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Build script for quickwit-lambda.
+//! Build script for quickwit-lambda-client.
 //!
-//! When the `auto-deploy` feature is enabled, this script:
-//! 1. Downloads the pre-built Lambda zip from a GitHub release
-//! 2. Places the zip in OUT_DIR for embedding via include_bytes!
+//! This script downloads the pre-built Lambda zip from a GitHub release
+//! and places it in OUT_DIR for embedding via include_bytes!
 //!
 //! The Lambda binary is built separately in CI and published as a GitHub release.
 
-fn main() {
-    #[cfg(feature = "auto-deploy")]
-    auto_deploy_build();
-
-    #[cfg(not(feature = "auto-deploy"))]
-    println!("cargo:rerun-if-changed=build.rs");
-}
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
 
 /// URL to download the pre-built Lambda zip from GitHub releases.
 /// This should be updated when a new Lambda binary is released.
-#[cfg(feature = "auto-deploy")]
 const LAMBDA_ZIP_URL: &str =
     "https://github.com/quickwit-oss/quickwit/releases/download/lambda-506751fb/quickwit-aws-lambda--aarch64.zip";
 
 /// AWS Lambda direct upload limit is 50MB.
 /// Larger artifacts must be uploaded via S3.
-#[cfg(feature = "auto-deploy")]
 const MAX_LAMBDA_ZIP_SIZE: usize = 50 * 1024 * 1024;
 
-#[cfg(feature = "auto-deploy")]
-fn auto_deploy_build() {
-    use std::env;
-    use std::fs::File;
-    use std::io::Write;
-    use std::path::PathBuf;
-
+fn main() {
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rerun-if-env-changed=QUICKWIT_LAMBDA_ZIP_URL");
 
@@ -73,11 +61,10 @@ fn auto_deploy_build() {
     }
 }
 
-#[cfg(feature = "auto-deploy")]
 fn download_lambda_zip(url: &str) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
-    let response = ureq::get(url).call()?;
+    let response = ureq::get(url).call();
     // Set limit higher than MAX_LAMBDA_ZIP_SIZE so we can provide a better error message
-    let data = response
+    let data = response?
         .into_body()
         .with_config()
         .limit(MAX_LAMBDA_ZIP_SIZE as u64 + 1) // We download one more byte to trigger the panic below.