blop

Author: fulmicoton-dd

quickwit/quickwit-cli/Cargo.toml

@@ -102,6 +102,7 @@ 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",
@@ -116,6 +117,7 @@ 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",
@@ -129,6 +131,7 @@ 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-config/src/node_config/mod.rs

@@ -317,9 +317,6 @@ pub struct LambdaConfig {
     /// AWS Lambda function name or ARN.
     #[serde(default = "LambdaConfig::default_function_name")]
     pub function_name: String,
-    /// Optional function qualifier (alias or version).
-    #[serde(default)]
-    pub function_qualifier: Option<String>,
     /// Maximum number of splits per Lambda invocation.
     #[serde(default = "LambdaConfig::default_max_splits_per_invocation")]
     pub max_splits_per_invocation: usize,
@@ -358,7 +355,6 @@ impl Default for LambdaConfig {
     fn default() -> Self {
         Self {
             function_name: Self::default_function_name(),
-            function_qualifier: None,
             max_splits_per_invocation: Self::default_max_splits_per_invocation(),
             auto_deploy: None,
         }

quickwit/quickwit-lambda/src/deployer.rs

@@ -17,45 +17,35 @@
 //! This module provides functionality to automatically deploy or update
 //! the Lambda function used for leaf search operations.
 
-#[cfg(feature = "auto-deploy")]
 use std::collections::HashMap;
 
 use aws_sdk_lambda::Client as LambdaClient;
-#[cfg(feature = "auto-deploy")]
 use aws_sdk_lambda::error::SdkError;
-#[cfg(feature = "auto-deploy")]
 use aws_sdk_lambda::operation::create_function::CreateFunctionError;
-#[cfg(feature = "auto-deploy")]
 use aws_sdk_lambda::operation::get_function::GetFunctionOutput;
-#[cfg(feature = "auto-deploy")]
 use aws_sdk_lambda::primitives::Blob;
-#[cfg(feature = "auto-deploy")]
 use aws_sdk_lambda::types::{Architecture, Environment, FunctionCode, Runtime};
-#[cfg(feature = "auto-deploy")]
+use quickwit_config::LambdaDeployConfig;
 use tracing::{debug, info, warn};
 
 use crate::config::LambdaDeployConfig;
 use crate::error::{LambdaError, LambdaResult};
 
 /// Embedded Lambda binary (arm64, compressed).
 /// This is included at compile time when the `auto-deploy` feature is enabled.
-#[cfg(feature = "auto-deploy")]
 const LAMBDA_BINARY: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/lambda_bootstrap.zip"));
 
 /// Version tag key used to track deployed Quickwit version.
-#[cfg(feature = "auto-deploy")]
 const VERSION_TAG_KEY: &str = "quickwit_version";
 
 /// Description prefix for auto-deployed Lambda functions.
-#[cfg(feature = "auto-deploy")]
 const FUNCTION_DESCRIPTION: &str = "Quickwit Lambda leaf search handler";
 
 /// Lambda function deployer.
 ///
 /// Handles creating and updating Lambda functions for the auto-deploy feature.
 /// Safe for concurrent calls from multiple Quickwit nodes - CreateFunction is idempotent.
 pub struct LambdaDeployer {
-    #[allow(dead_code)]
     client: LambdaClient,
 }
 
@@ -68,7 +58,6 @@ impl LambdaDeployer {
     }
 
     /// Create a new Lambda deployer with a custom client.
-    #[allow(dead_code)]
     pub fn with_client(client: LambdaClient) -> Self {
         Self { client }
     }
@@ -77,7 +66,6 @@ impl LambdaDeployer {
     ///
     /// Safe for concurrent calls from multiple Quickwit nodes - CreateFunction is idempotent.
     /// Returns the function ARN.
-    #[cfg(feature = "auto-deploy")]
     pub async fn deploy(
         &self,
         function_name: &str,
@@ -114,24 +102,13 @@ impl LambdaDeployer {
         }
     }
 
-    /// Deploy is a no-op when auto-deploy feature is not enabled.
-    #[cfg(not(feature = "auto-deploy"))]
-    pub async fn deploy(
-        &self,
-        _function_name: &str,
-        _deploy_config: &LambdaDeployConfig,
-    ) -> LambdaResult<String> {
-        Err(LambdaError::Configuration(
-            "auto-deploy feature is not enabled at compile time".into(),
-        ))
-    }
+
 
     /// Create the Lambda function.
     ///
     /// Note: CreateFunction is idempotent - if the function already exists, AWS returns
     /// ResourceConflictException. Multiple Quickwit nodes starting simultaneously is safe;
     /// one will succeed and others will fall back to update_function.
-    #[cfg(feature = "auto-deploy")]
     async fn create_function(
         &self,
         name: &str,
@@ -199,7 +176,6 @@ impl LambdaDeployer {
     ///
     /// Compares the deployed version tag with the current Quickwit version
     /// and updates if they differ.
-    #[cfg(feature = "auto-deploy")]
     async fn update_function_if_needed(
         &self,
         name: &str,
@@ -278,7 +254,6 @@ impl LambdaDeployer {
     }
 
     /// Wait for function update to complete.
-    #[cfg(feature = "auto-deploy")]
     async fn wait_for_update_complete(&self, name: &str) -> LambdaResult<()> {
         // Poll until the function state is Active and LastUpdateStatus is Successful
         for _ in 0..60 {
@@ -319,7 +294,6 @@ impl LambdaDeployer {
     }
 
     /// Check if the function needs to be updated based on version tag.
-    #[cfg(feature = "auto-deploy")]
     fn needs_update(&self, existing: &GetFunctionOutput) -> bool {
         let current_version = env!("CARGO_PKG_VERSION");
 
@@ -370,7 +344,6 @@ impl LambdaDeployer {
     }
 
     /// Build environment variables for the Lambda function.
-    #[cfg(feature = "auto-deploy")]
     fn build_environment(&self) -> Environment {
         let mut env_vars = HashMap::new();
         // Set reasonable defaults for logging
@@ -381,7 +354,6 @@ impl LambdaDeployer {
     }
 
     /// Build tags for the Lambda function.
-    #[cfg(feature = "auto-deploy")]
     fn build_tags(&self) -> HashMap<String, String> {
         let mut tags = HashMap::new();
         tags.insert(
@@ -393,7 +365,17 @@ impl LambdaDeployer {
     }
 }
 
-#[cfg(all(test, feature = "auto-deploy"))]
+pub async fn deploy(
+    function_name: &str,
+    deploy_config: &LambdaDeployConfig,
+) -> LambdaResult<String> {
+    let lambda_deployer = LambdaDeployer::new().await?;
+    let lambda_arn = lambda_deployer.deploy(function_name, deploy_config).await?;
+    info!("successfully deployed lambda function `{}`", lambda_arn);
+    Ok(lambda_arn)
+}
+
+#[cfg(test)]
 mod tests {
     use super::*;
 

quickwit/quickwit-lambda/src/invoker.rs

@@ -30,7 +30,6 @@ use crate::handler::{LeafSearchPayload, LeafSearchResponsePayload};
 pub struct AwsLambdaInvoker {
     client: LambdaClient,
     function_name: String,
-    qualifier: Option<String>,
 }
 
 impl AwsLambdaInvoker {
@@ -42,20 +41,17 @@ impl AwsLambdaInvoker {
         Ok(Self {
             client,
             function_name: config.function_name.clone(),
-            qualifier: config.function_qualifier.clone(),
         })
     }
 
     /// Create a new AWS Lambda invoker with a custom client.
     pub fn with_client(
         client: LambdaClient,
         function_name: String,
-        qualifier: Option<String>,
     ) -> Self {
         Self {
             client,
             function_name,
-            qualifier,
         }
     }
 

quickwit/quickwit-lambda/src/lib.rs

@@ -28,7 +28,28 @@ mod invoker;
 
 pub use config::{LambdaConfig, LambdaSearcherConfig};
 pub use context::LambdaSearcherContext;
+
+#[cfg(feature = "auto-deploy")]
+mod deployer;
+#[cfg(feature = "auto-deploy")]
 pub use deployer::LambdaDeployer;
+
+#[cfg(feature = "auto-deploy")]
+mod deployer;
+#[cfg(feature = "auto-deploy")]
+pub use deployer::deploy;
+
 pub use error::{LambdaError, LambdaResult};
 pub use handler::{LeafSearchPayload, LeafSearchResponsePayload, handle_leaf_search};
 pub use invoker::AwsLambdaInvoker;
+
+/// Deploy is a no-op when auto-deploy feature is not enabled.
+#[cfg(not(feature = "auto-deploy"))]
+pub async fn deploy(
+    _function_name: &str,
+    _deploy_config: &quickwit_config::LambdaDeployConfig,
+) -> LambdaResult<String> {
+    Err(LambdaError::Configuration(
+        "auto-deploy feature is not enabled at compile time".into(),
+    ))
+}

quickwit/quickwit-serve/Cargo.toml

@@ -110,6 +110,9 @@ pprof = [
 jemalloc-profiled = [
   "quickwit-common/jemalloc-profiled"
 ]
+lambda-auto-deploy = [
+  "quickwit-lambda/auto-deploy"
+]
 testsuite = []
 sqs-for-tests = [
   "quickwit-indexing/sqs",

quickwit/quickwit-serve/src/lib.rs

@@ -1027,13 +1027,8 @@ async fn setup_searcher(
             // Auto-deploy Lambda function if configured
             if let Some(deploy_config) = &lambda_config.auto_deploy {
                 info!("auto-deploying Lambda function");
-                let deployer = LambdaDeployer::new()
-                    .await
-                    .context("failed to create Lambda deployer")?;
-                deployer
-                    .deploy(&lambda_config.function_name, deploy_config)
-                    .await
-                    .context("failed to deploy Lambda function")?;
+                quickwit_lambda::deploy(&lambda_config.function_name, deploy_config)
+                    .context("failed to deploy lambda function")?;
             }
 
             let invoker = AwsLambdaInvoker::new(lambda_config)