mirror of
https://github.com/meilisearch/meilisearch.git
synced 2025-09-04 03:36:30 +00:00
@ -202,6 +202,10 @@ impl CompatV5ToV6 {
|
|||||||
pub fn network(&self) -> Result<Option<&v6::Network>> {
|
pub fn network(&self) -> Result<Option<&v6::Network>> {
|
||||||
Ok(None)
|
Ok(None)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn webhooks(&self) -> Option<&v6::Webhooks> {
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub enum CompatIndexV5ToV6 {
|
pub enum CompatIndexV5ToV6 {
|
||||||
|
@ -138,6 +138,13 @@ impl DumpReader {
|
|||||||
DumpReader::Compat(compat) => compat.network(),
|
DumpReader::Compat(compat) => compat.network(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn webhooks(&self) -> Option<&v6::Webhooks> {
|
||||||
|
match self {
|
||||||
|
DumpReader::Current(current) => current.webhooks(),
|
||||||
|
DumpReader::Compat(compat) => compat.webhooks(),
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<V6Reader> for DumpReader {
|
impl From<V6Reader> for DumpReader {
|
||||||
@ -365,6 +372,7 @@ pub(crate) mod test {
|
|||||||
|
|
||||||
assert_eq!(dump.features().unwrap().unwrap(), RuntimeTogglableFeatures::default());
|
assert_eq!(dump.features().unwrap().unwrap(), RuntimeTogglableFeatures::default());
|
||||||
assert_eq!(dump.network().unwrap(), None);
|
assert_eq!(dump.network().unwrap(), None);
|
||||||
|
assert_eq!(dump.webhooks(), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -435,6 +443,43 @@ pub(crate) mod test {
|
|||||||
insta::assert_snapshot!(network.remotes.get("ms-2").as_ref().unwrap().search_api_key.as_ref().unwrap(), @"foo");
|
insta::assert_snapshot!(network.remotes.get("ms-2").as_ref().unwrap().search_api_key.as_ref().unwrap(), @"foo");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn import_dump_v6_webhooks() {
|
||||||
|
let dump = File::open("tests/assets/v6-with-webhooks.dump").unwrap();
|
||||||
|
let dump = DumpReader::open(dump).unwrap();
|
||||||
|
|
||||||
|
// top level infos
|
||||||
|
insta::assert_snapshot!(dump.date().unwrap(), @"2025-07-31 9:21:30.479544 +00:00:00");
|
||||||
|
insta::assert_debug_snapshot!(dump.instance_uid().unwrap(), @r"
|
||||||
|
Some(
|
||||||
|
cb887dcc-34b3-48d1-addd-9815ae721a81,
|
||||||
|
)
|
||||||
|
");
|
||||||
|
|
||||||
|
// webhooks
|
||||||
|
let webhooks = dump.webhooks().unwrap();
|
||||||
|
insta::assert_json_snapshot!(webhooks, @r#"
|
||||||
|
{
|
||||||
|
"webhooks": {
|
||||||
|
"627ea538-733d-4545-8d2d-03526eb381ce": {
|
||||||
|
"url": "https://example.com/authorization-less",
|
||||||
|
"headers": {}
|
||||||
|
},
|
||||||
|
"771b0a28-ef28-4082-b984-536f82958c65": {
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": {
|
||||||
|
"authorization": "TOKEN"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"f3583083-f8a7-4cbf-a5e7-fb3f1e28a7e9": {
|
||||||
|
"url": "https://third.com",
|
||||||
|
"headers": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn import_dump_v5() {
|
fn import_dump_v5() {
|
||||||
let dump = File::open("tests/assets/v5.dump").unwrap();
|
let dump = File::open("tests/assets/v5.dump").unwrap();
|
||||||
|
@ -25,6 +25,7 @@ pub type Key = meilisearch_types::keys::Key;
|
|||||||
pub type ChatCompletionSettings = meilisearch_types::features::ChatCompletionSettings;
|
pub type ChatCompletionSettings = meilisearch_types::features::ChatCompletionSettings;
|
||||||
pub type RuntimeTogglableFeatures = meilisearch_types::features::RuntimeTogglableFeatures;
|
pub type RuntimeTogglableFeatures = meilisearch_types::features::RuntimeTogglableFeatures;
|
||||||
pub type Network = meilisearch_types::features::Network;
|
pub type Network = meilisearch_types::features::Network;
|
||||||
|
pub type Webhooks = meilisearch_types::webhooks::WebhooksDumpView;
|
||||||
|
|
||||||
// ===== Other types to clarify the code of the compat module
|
// ===== Other types to clarify the code of the compat module
|
||||||
// everything related to the tasks
|
// everything related to the tasks
|
||||||
@ -59,6 +60,7 @@ pub struct V6Reader {
|
|||||||
keys: BufReader<File>,
|
keys: BufReader<File>,
|
||||||
features: Option<RuntimeTogglableFeatures>,
|
features: Option<RuntimeTogglableFeatures>,
|
||||||
network: Option<Network>,
|
network: Option<Network>,
|
||||||
|
webhooks: Option<Webhooks>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl V6Reader {
|
impl V6Reader {
|
||||||
@ -93,8 +95,8 @@ impl V6Reader {
|
|||||||
Err(e) => return Err(e.into()),
|
Err(e) => return Err(e.into()),
|
||||||
};
|
};
|
||||||
|
|
||||||
let network_file = match fs::read(dump.path().join("network.json")) {
|
let network = match fs::read(dump.path().join("network.json")) {
|
||||||
Ok(network_file) => Some(network_file),
|
Ok(network_file) => Some(serde_json::from_reader(&*network_file)?),
|
||||||
Err(error) => match error.kind() {
|
Err(error) => match error.kind() {
|
||||||
// Allows the file to be missing, this will only result in all experimental features disabled.
|
// Allows the file to be missing, this will only result in all experimental features disabled.
|
||||||
ErrorKind::NotFound => {
|
ErrorKind::NotFound => {
|
||||||
@ -104,10 +106,16 @@ impl V6Reader {
|
|||||||
_ => return Err(error.into()),
|
_ => return Err(error.into()),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
let network = if let Some(network_file) = network_file {
|
|
||||||
Some(serde_json::from_reader(&*network_file)?)
|
let webhooks = match fs::read(dump.path().join("webhooks.json")) {
|
||||||
} else {
|
Ok(webhooks_file) => Some(serde_json::from_reader(&*webhooks_file)?),
|
||||||
None
|
Err(error) => match error.kind() {
|
||||||
|
ErrorKind::NotFound => {
|
||||||
|
debug!("`webhooks.json` not found in dump");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
_ => return Err(error.into()),
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(V6Reader {
|
Ok(V6Reader {
|
||||||
@ -119,6 +127,7 @@ impl V6Reader {
|
|||||||
features,
|
features,
|
||||||
network,
|
network,
|
||||||
dump,
|
dump,
|
||||||
|
webhooks,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -229,6 +238,10 @@ impl V6Reader {
|
|||||||
pub fn network(&self) -> Option<&Network> {
|
pub fn network(&self) -> Option<&Network> {
|
||||||
self.network.as_ref()
|
self.network.as_ref()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn webhooks(&self) -> Option<&Webhooks> {
|
||||||
|
self.webhooks.as_ref()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct UpdateFile {
|
pub struct UpdateFile {
|
||||||
|
@ -8,6 +8,7 @@ use meilisearch_types::batches::Batch;
|
|||||||
use meilisearch_types::features::{ChatCompletionSettings, Network, RuntimeTogglableFeatures};
|
use meilisearch_types::features::{ChatCompletionSettings, Network, RuntimeTogglableFeatures};
|
||||||
use meilisearch_types::keys::Key;
|
use meilisearch_types::keys::Key;
|
||||||
use meilisearch_types::settings::{Checked, Settings};
|
use meilisearch_types::settings::{Checked, Settings};
|
||||||
|
use meilisearch_types::webhooks::WebhooksDumpView;
|
||||||
use serde_json::{Map, Value};
|
use serde_json::{Map, Value};
|
||||||
use tempfile::TempDir;
|
use tempfile::TempDir;
|
||||||
use time::OffsetDateTime;
|
use time::OffsetDateTime;
|
||||||
@ -74,6 +75,13 @@ impl DumpWriter {
|
|||||||
Ok(std::fs::write(self.dir.path().join("network.json"), serde_json::to_string(&network)?)?)
|
Ok(std::fs::write(self.dir.path().join("network.json"), serde_json::to_string(&network)?)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn create_webhooks(&self, webhooks: WebhooksDumpView) -> Result<()> {
|
||||||
|
Ok(std::fs::write(
|
||||||
|
self.dir.path().join("webhooks.json"),
|
||||||
|
serde_json::to_string(&webhooks)?,
|
||||||
|
)?)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn persist_to(self, mut writer: impl Write) -> Result<()> {
|
pub fn persist_to(self, mut writer: impl Write) -> Result<()> {
|
||||||
let gz_encoder = GzEncoder::new(&mut writer, Compression::default());
|
let gz_encoder = GzEncoder::new(&mut writer, Compression::default());
|
||||||
let mut tar_encoder = tar::Builder::new(gz_encoder);
|
let mut tar_encoder = tar::Builder::new(gz_encoder);
|
||||||
|
BIN
crates/dump/tests/assets/v6-with-webhooks.dump
Normal file
BIN
crates/dump/tests/assets/v6-with-webhooks.dump
Normal file
Binary file not shown.
@ -182,6 +182,7 @@ impl FeatureData {
|
|||||||
..persisted_features
|
..persisted_features
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
// Once this is stabilized, network should be stored along with webhooks in index-scheduler's persisted database
|
||||||
let network_db = runtime_features_db.remap_data_type::<SerdeJson<Network>>();
|
let network_db = runtime_features_db.remap_data_type::<SerdeJson<Network>>();
|
||||||
let network: Network = network_db.get(wtxn, db_keys::NETWORK)?.unwrap_or_default();
|
let network: Network = network_db.get(wtxn, db_keys::NETWORK)?.unwrap_or_default();
|
||||||
|
|
||||||
|
@ -26,11 +26,11 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
|
|||||||
version,
|
version,
|
||||||
queue,
|
queue,
|
||||||
scheduler,
|
scheduler,
|
||||||
|
persisted,
|
||||||
|
|
||||||
index_mapper,
|
index_mapper,
|
||||||
features: _,
|
features: _,
|
||||||
webhook_url: _,
|
webhooks: _,
|
||||||
webhook_authorization_header: _,
|
|
||||||
test_breakpoint_sdr: _,
|
test_breakpoint_sdr: _,
|
||||||
planned_failures: _,
|
planned_failures: _,
|
||||||
run_loop_iteration: _,
|
run_loop_iteration: _,
|
||||||
@ -62,6 +62,13 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
|
|||||||
}
|
}
|
||||||
snap.push_str("\n----------------------------------------------------------------------\n");
|
snap.push_str("\n----------------------------------------------------------------------\n");
|
||||||
|
|
||||||
|
let persisted_db_snapshot = snapshot_persisted_db(&rtxn, persisted);
|
||||||
|
if !persisted_db_snapshot.is_empty() {
|
||||||
|
snap.push_str("### Persisted:\n");
|
||||||
|
snap.push_str(&persisted_db_snapshot);
|
||||||
|
snap.push_str("----------------------------------------------------------------------\n");
|
||||||
|
}
|
||||||
|
|
||||||
snap.push_str("### All Tasks:\n");
|
snap.push_str("### All Tasks:\n");
|
||||||
snap.push_str(&snapshot_all_tasks(&rtxn, queue.tasks.all_tasks));
|
snap.push_str(&snapshot_all_tasks(&rtxn, queue.tasks.all_tasks));
|
||||||
snap.push_str("----------------------------------------------------------------------\n");
|
snap.push_str("----------------------------------------------------------------------\n");
|
||||||
@ -200,6 +207,16 @@ pub fn snapshot_date_db(rtxn: &RoTxn, db: Database<BEI128, CboRoaringBitmapCodec
|
|||||||
snap
|
snap
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn snapshot_persisted_db(rtxn: &RoTxn, db: &Database<Str, Str>) -> String {
|
||||||
|
let mut snap = String::new();
|
||||||
|
let iter = db.iter(rtxn).unwrap();
|
||||||
|
for next in iter {
|
||||||
|
let (key, value) = next.unwrap();
|
||||||
|
snap.push_str(&format!("{key}: {value}\n"));
|
||||||
|
}
|
||||||
|
snap
|
||||||
|
}
|
||||||
|
|
||||||
pub fn snapshot_task(task: &Task) -> String {
|
pub fn snapshot_task(task: &Task) -> String {
|
||||||
let mut snap = String::new();
|
let mut snap = String::new();
|
||||||
let Task {
|
let Task {
|
||||||
@ -311,6 +328,7 @@ pub fn snapshot_status(
|
|||||||
}
|
}
|
||||||
snap
|
snap
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn snapshot_kind(rtxn: &RoTxn, db: Database<SerdeBincode<Kind>, RoaringBitmapCodec>) -> String {
|
pub fn snapshot_kind(rtxn: &RoTxn, db: Database<SerdeBincode<Kind>, RoaringBitmapCodec>) -> String {
|
||||||
let mut snap = String::new();
|
let mut snap = String::new();
|
||||||
let iter = db.iter(rtxn).unwrap();
|
let iter = db.iter(rtxn).unwrap();
|
||||||
@ -331,6 +349,7 @@ pub fn snapshot_index_tasks(rtxn: &RoTxn, db: Database<Str, RoaringBitmapCodec>)
|
|||||||
}
|
}
|
||||||
snap
|
snap
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn snapshot_canceled_by(rtxn: &RoTxn, db: Database<BEU32, RoaringBitmapCodec>) -> String {
|
pub fn snapshot_canceled_by(rtxn: &RoTxn, db: Database<BEU32, RoaringBitmapCodec>) -> String {
|
||||||
let mut snap = String::new();
|
let mut snap = String::new();
|
||||||
let iter = db.iter(rtxn).unwrap();
|
let iter = db.iter(rtxn).unwrap();
|
||||||
|
@ -65,13 +65,16 @@ use meilisearch_types::milli::vector::{
|
|||||||
use meilisearch_types::milli::{self, Index};
|
use meilisearch_types::milli::{self, Index};
|
||||||
use meilisearch_types::task_view::TaskView;
|
use meilisearch_types::task_view::TaskView;
|
||||||
use meilisearch_types::tasks::{KindWithContent, Task};
|
use meilisearch_types::tasks::{KindWithContent, Task};
|
||||||
|
use meilisearch_types::webhooks::{Webhook, WebhooksDumpView, WebhooksView};
|
||||||
use milli::vector::db::IndexEmbeddingConfig;
|
use milli::vector::db::IndexEmbeddingConfig;
|
||||||
use processing::ProcessingTasks;
|
use processing::ProcessingTasks;
|
||||||
pub use queue::Query;
|
pub use queue::Query;
|
||||||
use queue::Queue;
|
use queue::Queue;
|
||||||
use roaring::RoaringBitmap;
|
use roaring::RoaringBitmap;
|
||||||
use scheduler::Scheduler;
|
use scheduler::Scheduler;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
use time::OffsetDateTime;
|
use time::OffsetDateTime;
|
||||||
|
use uuid::Uuid;
|
||||||
use versioning::Versioning;
|
use versioning::Versioning;
|
||||||
|
|
||||||
use crate::index_mapper::IndexMapper;
|
use crate::index_mapper::IndexMapper;
|
||||||
@ -80,7 +83,15 @@ use crate::utils::clamp_to_page_size;
|
|||||||
pub(crate) type BEI128 = I128<BE>;
|
pub(crate) type BEI128 = I128<BE>;
|
||||||
|
|
||||||
const TASK_SCHEDULER_SIZE_THRESHOLD_PERCENT_INT: u64 = 40;
|
const TASK_SCHEDULER_SIZE_THRESHOLD_PERCENT_INT: u64 = 40;
|
||||||
const CHAT_SETTINGS_DB_NAME: &str = "chat-settings";
|
|
||||||
|
mod db_name {
|
||||||
|
pub const CHAT_SETTINGS: &str = "chat-settings";
|
||||||
|
pub const PERSISTED: &str = "persisted";
|
||||||
|
}
|
||||||
|
|
||||||
|
mod db_keys {
|
||||||
|
pub const WEBHOOKS: &str = "webhooks";
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct IndexSchedulerOptions {
|
pub struct IndexSchedulerOptions {
|
||||||
@ -98,10 +109,10 @@ pub struct IndexSchedulerOptions {
|
|||||||
pub snapshots_path: PathBuf,
|
pub snapshots_path: PathBuf,
|
||||||
/// The path to the folder containing the dumps.
|
/// The path to the folder containing the dumps.
|
||||||
pub dumps_path: PathBuf,
|
pub dumps_path: PathBuf,
|
||||||
/// The URL on which we must send the tasks statuses
|
/// The webhook url that was set by the CLI.
|
||||||
pub webhook_url: Option<String>,
|
pub cli_webhook_url: Option<String>,
|
||||||
/// The value we will send into the Authorization HTTP header on the webhook URL
|
/// The Authorization header to send to the webhook URL that was set by the CLI.
|
||||||
pub webhook_authorization_header: Option<String>,
|
pub cli_webhook_authorization: Option<String>,
|
||||||
/// The maximum size, in bytes, of the task index.
|
/// The maximum size, in bytes, of the task index.
|
||||||
pub task_db_size: usize,
|
pub task_db_size: usize,
|
||||||
/// The size, in bytes, with which a meilisearch index is opened the first time of each meilisearch index.
|
/// The size, in bytes, with which a meilisearch index is opened the first time of each meilisearch index.
|
||||||
@ -171,10 +182,11 @@ pub struct IndexScheduler {
|
|||||||
/// Whether we should use the old document indexer or the new one.
|
/// Whether we should use the old document indexer or the new one.
|
||||||
pub(crate) experimental_no_edition_2024_for_dumps: bool,
|
pub(crate) experimental_no_edition_2024_for_dumps: bool,
|
||||||
|
|
||||||
/// The webhook url we should send tasks to after processing every batches.
|
/// A database to store single-keyed data that is persisted across restarts.
|
||||||
pub(crate) webhook_url: Option<String>,
|
persisted: Database<Str, Str>,
|
||||||
/// The Authorization header to send to the webhook URL.
|
|
||||||
pub(crate) webhook_authorization_header: Option<String>,
|
/// Webhook, loaded and stored in the `persisted` database
|
||||||
|
webhooks: Arc<Webhooks>,
|
||||||
|
|
||||||
/// A map to retrieve the runtime representation of an embedder depending on its configuration.
|
/// A map to retrieve the runtime representation of an embedder depending on its configuration.
|
||||||
///
|
///
|
||||||
@ -214,8 +226,9 @@ impl IndexScheduler {
|
|||||||
index_mapper: self.index_mapper.clone(),
|
index_mapper: self.index_mapper.clone(),
|
||||||
cleanup_enabled: self.cleanup_enabled,
|
cleanup_enabled: self.cleanup_enabled,
|
||||||
experimental_no_edition_2024_for_dumps: self.experimental_no_edition_2024_for_dumps,
|
experimental_no_edition_2024_for_dumps: self.experimental_no_edition_2024_for_dumps,
|
||||||
webhook_url: self.webhook_url.clone(),
|
persisted: self.persisted,
|
||||||
webhook_authorization_header: self.webhook_authorization_header.clone(),
|
|
||||||
|
webhooks: self.webhooks.clone(),
|
||||||
embedders: self.embedders.clone(),
|
embedders: self.embedders.clone(),
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
test_breakpoint_sdr: self.test_breakpoint_sdr.clone(),
|
test_breakpoint_sdr: self.test_breakpoint_sdr.clone(),
|
||||||
@ -234,6 +247,7 @@ impl IndexScheduler {
|
|||||||
+ IndexMapper::nb_db()
|
+ IndexMapper::nb_db()
|
||||||
+ features::FeatureData::nb_db()
|
+ features::FeatureData::nb_db()
|
||||||
+ 1 // chat-prompts
|
+ 1 // chat-prompts
|
||||||
|
+ 1 // persisted
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create an index scheduler and start its run loop.
|
/// Create an index scheduler and start its run loop.
|
||||||
@ -284,10 +298,18 @@ impl IndexScheduler {
|
|||||||
let version = versioning::Versioning::new(&env, from_db_version)?;
|
let version = versioning::Versioning::new(&env, from_db_version)?;
|
||||||
|
|
||||||
let mut wtxn = env.write_txn()?;
|
let mut wtxn = env.write_txn()?;
|
||||||
|
|
||||||
let features = features::FeatureData::new(&env, &mut wtxn, options.instance_features)?;
|
let features = features::FeatureData::new(&env, &mut wtxn, options.instance_features)?;
|
||||||
let queue = Queue::new(&env, &mut wtxn, &options)?;
|
let queue = Queue::new(&env, &mut wtxn, &options)?;
|
||||||
let index_mapper = IndexMapper::new(&env, &mut wtxn, &options, budget)?;
|
let index_mapper = IndexMapper::new(&env, &mut wtxn, &options, budget)?;
|
||||||
let chat_settings = env.create_database(&mut wtxn, Some(CHAT_SETTINGS_DB_NAME))?;
|
let chat_settings = env.create_database(&mut wtxn, Some(db_name::CHAT_SETTINGS))?;
|
||||||
|
|
||||||
|
let persisted = env.create_database(&mut wtxn, Some(db_name::PERSISTED))?;
|
||||||
|
let webhooks_db = persisted.remap_data_type::<SerdeJson<Webhooks>>();
|
||||||
|
let mut webhooks = webhooks_db.get(&wtxn, db_keys::WEBHOOKS)?.unwrap_or_default();
|
||||||
|
webhooks
|
||||||
|
.with_cli(options.cli_webhook_url.clone(), options.cli_webhook_authorization.clone());
|
||||||
|
|
||||||
wtxn.commit()?;
|
wtxn.commit()?;
|
||||||
|
|
||||||
// allow unreachable_code to get rids of the warning in the case of a test build.
|
// allow unreachable_code to get rids of the warning in the case of a test build.
|
||||||
@ -303,8 +325,8 @@ impl IndexScheduler {
|
|||||||
experimental_no_edition_2024_for_dumps: options
|
experimental_no_edition_2024_for_dumps: options
|
||||||
.indexer_config
|
.indexer_config
|
||||||
.experimental_no_edition_2024_for_dumps,
|
.experimental_no_edition_2024_for_dumps,
|
||||||
webhook_url: options.webhook_url,
|
persisted,
|
||||||
webhook_authorization_header: options.webhook_authorization_header,
|
webhooks: Arc::new(webhooks),
|
||||||
embedders: Default::default(),
|
embedders: Default::default(),
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@ -752,86 +774,92 @@ impl IndexScheduler {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Once the tasks changes have been committed we must send all the tasks that were updated to our webhook if there is one.
|
/// Once the tasks changes have been committed we must send all the tasks that were updated to our webhooks
|
||||||
fn notify_webhook(&self, updated: &RoaringBitmap) -> Result<()> {
|
fn notify_webhooks(&self, updated: RoaringBitmap) {
|
||||||
if let Some(ref url) = self.webhook_url {
|
struct TaskReader<'a, 'b> {
|
||||||
struct TaskReader<'a, 'b> {
|
rtxn: &'a RoTxn<'a>,
|
||||||
rtxn: &'a RoTxn<'a>,
|
index_scheduler: &'a IndexScheduler,
|
||||||
index_scheduler: &'a IndexScheduler,
|
tasks: &'b mut roaring::bitmap::Iter<'b>,
|
||||||
tasks: &'b mut roaring::bitmap::Iter<'b>,
|
buffer: Vec<u8>,
|
||||||
buffer: Vec<u8>,
|
written: usize,
|
||||||
written: usize,
|
}
|
||||||
}
|
|
||||||
|
|
||||||
impl Read for TaskReader<'_, '_> {
|
impl Read for TaskReader<'_, '_> {
|
||||||
fn read(&mut self, mut buf: &mut [u8]) -> std::io::Result<usize> {
|
fn read(&mut self, mut buf: &mut [u8]) -> std::io::Result<usize> {
|
||||||
if self.buffer.is_empty() {
|
if self.buffer.is_empty() {
|
||||||
match self.tasks.next() {
|
match self.tasks.next() {
|
||||||
None => return Ok(0),
|
None => return Ok(0),
|
||||||
Some(task_id) => {
|
Some(task_id) => {
|
||||||
let task = self
|
let task = self
|
||||||
.index_scheduler
|
.index_scheduler
|
||||||
.queue
|
.queue
|
||||||
.tasks
|
.tasks
|
||||||
.get_task(self.rtxn, task_id)
|
.get_task(self.rtxn, task_id)
|
||||||
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))?
|
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))?
|
||||||
.ok_or_else(|| {
|
.ok_or_else(|| {
|
||||||
io::Error::new(
|
io::Error::new(io::ErrorKind::Other, Error::CorruptedTaskQueue)
|
||||||
io::ErrorKind::Other,
|
})?;
|
||||||
Error::CorruptedTaskQueue,
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
serde_json::to_writer(
|
serde_json::to_writer(&mut self.buffer, &TaskView::from_task(&task))?;
|
||||||
&mut self.buffer,
|
self.buffer.push(b'\n');
|
||||||
&TaskView::from_task(&task),
|
|
||||||
)?;
|
|
||||||
self.buffer.push(b'\n');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut to_write = &self.buffer[self.written..];
|
|
||||||
let wrote = io::copy(&mut to_write, &mut buf)?;
|
|
||||||
self.written += wrote as usize;
|
|
||||||
|
|
||||||
// we wrote everything and must refresh our buffer on the next call
|
|
||||||
if self.written == self.buffer.len() {
|
|
||||||
self.written = 0;
|
|
||||||
self.buffer.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(wrote as usize)
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
let rtxn = self.env.read_txn()?;
|
let mut to_write = &self.buffer[self.written..];
|
||||||
|
let wrote = io::copy(&mut to_write, &mut buf)?;
|
||||||
|
self.written += wrote as usize;
|
||||||
|
|
||||||
let task_reader = TaskReader {
|
// we wrote everything and must refresh our buffer on the next call
|
||||||
rtxn: &rtxn,
|
if self.written == self.buffer.len() {
|
||||||
index_scheduler: self,
|
self.written = 0;
|
||||||
tasks: &mut updated.into_iter(),
|
self.buffer.clear();
|
||||||
buffer: Vec::with_capacity(50), // on average a task is around ~100 bytes
|
}
|
||||||
written: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
// let reader = GzEncoder::new(BufReader::new(task_reader), Compression::default());
|
Ok(wrote as usize)
|
||||||
let reader = GzEncoder::new(BufReader::new(task_reader), Compression::default());
|
|
||||||
let request = ureq::post(url)
|
|
||||||
.timeout(Duration::from_secs(30))
|
|
||||||
.set("Content-Encoding", "gzip")
|
|
||||||
.set("Content-Type", "application/x-ndjson");
|
|
||||||
let request = match &self.webhook_authorization_header {
|
|
||||||
Some(header) => request.set("Authorization", header),
|
|
||||||
None => request,
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Err(e) = request.send(reader) {
|
|
||||||
tracing::error!("While sending data to the webhook: {e}");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
let webhooks = self.webhooks.get_all();
|
||||||
|
if webhooks.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let this = self.private_clone();
|
||||||
|
// We must take the RoTxn before entering the thread::spawn otherwise another batch may be
|
||||||
|
// processed before we had the time to take our txn.
|
||||||
|
let rtxn = match self.env.clone().static_read_txn() {
|
||||||
|
Ok(rtxn) => rtxn,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Couldn't get an rtxn to notify the webhook: {e}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
for (uuid, Webhook { url, headers }) in webhooks.iter() {
|
||||||
|
let task_reader = TaskReader {
|
||||||
|
rtxn: &rtxn,
|
||||||
|
index_scheduler: &this,
|
||||||
|
tasks: &mut updated.iter(),
|
||||||
|
buffer: Vec::with_capacity(page_size::get()),
|
||||||
|
written: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
let reader = GzEncoder::new(BufReader::new(task_reader), Compression::default());
|
||||||
|
|
||||||
|
let mut request = ureq::post(url)
|
||||||
|
.timeout(Duration::from_secs(30))
|
||||||
|
.set("Content-Encoding", "gzip")
|
||||||
|
.set("Content-Type", "application/x-ndjson");
|
||||||
|
for (header_name, header_value) in headers.iter() {
|
||||||
|
request = request.set(header_name, header_value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Err(e) = request.send(reader) {
|
||||||
|
tracing::error!("While sending data to the webhook {uuid}: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn index_stats(&self, index_uid: &str) -> Result<IndexStats> {
|
pub fn index_stats(&self, index_uid: &str) -> Result<IndexStats> {
|
||||||
@ -862,6 +890,29 @@ impl IndexScheduler {
|
|||||||
self.features.network()
|
self.features.network()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn update_runtime_webhooks(&self, runtime: RuntimeWebhooks) -> Result<()> {
|
||||||
|
let webhooks = Webhooks::from_runtime(runtime);
|
||||||
|
let mut wtxn = self.env.write_txn()?;
|
||||||
|
let webhooks_db = self.persisted.remap_data_type::<SerdeJson<Webhooks>>();
|
||||||
|
webhooks_db.put(&mut wtxn, db_keys::WEBHOOKS, &webhooks)?;
|
||||||
|
wtxn.commit()?;
|
||||||
|
self.webhooks.update_runtime(webhooks.into_runtime());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn webhooks_dump_view(&self) -> WebhooksDumpView {
|
||||||
|
// We must not dump the cli api key
|
||||||
|
WebhooksDumpView { webhooks: self.webhooks.get_runtime() }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn webhooks_view(&self) -> WebhooksView {
|
||||||
|
WebhooksView { webhooks: self.webhooks.get_all() }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn retrieve_runtime_webhooks(&self) -> RuntimeWebhooks {
|
||||||
|
self.webhooks.get_runtime()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn embedders(
|
pub fn embedders(
|
||||||
&self,
|
&self,
|
||||||
index_uid: String,
|
index_uid: String,
|
||||||
@ -990,3 +1041,72 @@ pub struct IndexStats {
|
|||||||
/// Internal stats computed from the index.
|
/// Internal stats computed from the index.
|
||||||
pub inner_stats: index_mapper::IndexStats,
|
pub inner_stats: index_mapper::IndexStats,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// These structure are not meant to be exposed to the end user, if needed, use the meilisearch-types::webhooks structure instead.
|
||||||
|
/// /!\ Everytime you deserialize this structure you should fill the cli_webhook later on with the `with_cli` method. /!\
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
struct Webhooks {
|
||||||
|
// The cli webhook should *never* be stored in a database.
|
||||||
|
// It represent a state that only exists for this execution of meilisearch
|
||||||
|
#[serde(skip)]
|
||||||
|
pub cli: Option<CliWebhook>,
|
||||||
|
|
||||||
|
#[serde(default)]
|
||||||
|
pub runtime: RwLock<RuntimeWebhooks>,
|
||||||
|
}
|
||||||
|
|
||||||
|
type RuntimeWebhooks = BTreeMap<Uuid, Webhook>;
|
||||||
|
|
||||||
|
impl Webhooks {
|
||||||
|
pub fn with_cli(&mut self, url: Option<String>, auth: Option<String>) {
|
||||||
|
if let Some(url) = url {
|
||||||
|
let webhook = CliWebhook { url, auth };
|
||||||
|
self.cli = Some(webhook);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_runtime(webhooks: RuntimeWebhooks) -> Self {
|
||||||
|
Self { cli: None, runtime: RwLock::new(webhooks) }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn into_runtime(self) -> RuntimeWebhooks {
|
||||||
|
// safe because we own self and it cannot be cloned
|
||||||
|
self.runtime.into_inner().unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn update_runtime(&self, webhooks: RuntimeWebhooks) {
|
||||||
|
*self.runtime.write().unwrap() = webhooks;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns all the webhooks in an unified view. The cli webhook is represented with an uuid set to 0
|
||||||
|
pub fn get_all(&self) -> BTreeMap<Uuid, Webhook> {
|
||||||
|
self.cli
|
||||||
|
.as_ref()
|
||||||
|
.map(|wh| (Uuid::nil(), Webhook::from(wh)))
|
||||||
|
.into_iter()
|
||||||
|
.chain(self.runtime.read().unwrap().iter().map(|(uuid, wh)| (*uuid, wh.clone())))
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns all the runtime webhooks.
|
||||||
|
pub fn get_runtime(&self) -> BTreeMap<Uuid, Webhook> {
|
||||||
|
self.runtime.read().unwrap().iter().map(|(uuid, wh)| (*uuid, wh.clone())).collect()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default, Clone, PartialEq)]
|
||||||
|
struct CliWebhook {
|
||||||
|
pub url: String,
|
||||||
|
pub auth: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<&CliWebhook> for Webhook {
|
||||||
|
fn from(webhook: &CliWebhook) -> Self {
|
||||||
|
let mut headers = BTreeMap::new();
|
||||||
|
if let Some(ref auth) = webhook.auth {
|
||||||
|
headers.insert("Authorization".to_string(), auth.to_string());
|
||||||
|
}
|
||||||
|
Self { url: webhook.url.to_string(), headers }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -108,6 +108,7 @@ make_enum_progress! {
|
|||||||
DumpTheBatches,
|
DumpTheBatches,
|
||||||
DumpTheIndexes,
|
DumpTheIndexes,
|
||||||
DumpTheExperimentalFeatures,
|
DumpTheExperimentalFeatures,
|
||||||
|
DumpTheWebhooks,
|
||||||
CompressTheDump,
|
CompressTheDump,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -446,8 +446,7 @@ impl IndexScheduler {
|
|||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
// We shouldn't crash the tick function if we can't send data to the webhook.
|
self.notify_webhooks(ids);
|
||||||
let _ = self.notify_webhook(&ids);
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
self.breakpoint(crate::test_utils::Breakpoint::AfterProcessing);
|
self.breakpoint(crate::test_utils::Breakpoint::AfterProcessing);
|
||||||
|
@ -270,6 +270,11 @@ impl IndexScheduler {
|
|||||||
let network = self.network();
|
let network = self.network();
|
||||||
dump.create_network(network)?;
|
dump.create_network(network)?;
|
||||||
|
|
||||||
|
// 7. Dump the webhooks
|
||||||
|
progress.update_progress(DumpCreationProgress::DumpTheWebhooks);
|
||||||
|
let webhooks = self.webhooks_dump_view();
|
||||||
|
dump.create_webhooks(webhooks)?;
|
||||||
|
|
||||||
let dump_uid = started_at.format(format_description!(
|
let dump_uid = started_at.format(format_description!(
|
||||||
"[year repr:full][month repr:numerical][day padding:zero]-[hour padding:zero][minute padding:zero][second padding:zero][subsecond digits:3]"
|
"[year repr:full][month repr:numerical][day padding:zero]-[hour padding:zero][minute padding:zero][second padding:zero][subsecond digits:3]"
|
||||||
)).unwrap();
|
)).unwrap();
|
||||||
|
@ -98,8 +98,8 @@ impl IndexScheduler {
|
|||||||
indexes_path: tempdir.path().join("indexes"),
|
indexes_path: tempdir.path().join("indexes"),
|
||||||
snapshots_path: tempdir.path().join("snapshots"),
|
snapshots_path: tempdir.path().join("snapshots"),
|
||||||
dumps_path: tempdir.path().join("dumps"),
|
dumps_path: tempdir.path().join("dumps"),
|
||||||
webhook_url: None,
|
cli_webhook_url: None,
|
||||||
webhook_authorization_header: None,
|
cli_webhook_authorization: None,
|
||||||
task_db_size: 1000 * 1000 * 10, // 10 MB, we don't use MiB on purpose.
|
task_db_size: 1000 * 1000 * 10, // 10 MB, we don't use MiB on purpose.
|
||||||
index_base_map_size: 1000 * 1000, // 1 MB, we don't use MiB on purpose.
|
index_base_map_size: 1000 * 1000, // 1 MB, we don't use MiB on purpose.
|
||||||
enable_mdb_writemap: false,
|
enable_mdb_writemap: false,
|
||||||
|
@ -137,6 +137,14 @@ impl HeedAuthStore {
|
|||||||
Action::ChatsSettingsAll => {
|
Action::ChatsSettingsAll => {
|
||||||
actions.extend([Action::ChatsSettingsGet, Action::ChatsSettingsUpdate]);
|
actions.extend([Action::ChatsSettingsGet, Action::ChatsSettingsUpdate]);
|
||||||
}
|
}
|
||||||
|
Action::WebhooksAll => {
|
||||||
|
actions.extend([
|
||||||
|
Action::WebhooksGet,
|
||||||
|
Action::WebhooksUpdate,
|
||||||
|
Action::WebhooksDelete,
|
||||||
|
Action::WebhooksCreate,
|
||||||
|
]);
|
||||||
|
}
|
||||||
other => {
|
other => {
|
||||||
actions.insert(*other);
|
actions.insert(*other);
|
||||||
}
|
}
|
||||||
|
@ -418,7 +418,16 @@ InvalidChatCompletionSearchDescriptionPrompt , InvalidRequest , BAD_REQU
|
|||||||
InvalidChatCompletionSearchQueryParamPrompt , InvalidRequest , BAD_REQUEST ;
|
InvalidChatCompletionSearchQueryParamPrompt , InvalidRequest , BAD_REQUEST ;
|
||||||
InvalidChatCompletionSearchFilterParamPrompt , InvalidRequest , BAD_REQUEST ;
|
InvalidChatCompletionSearchFilterParamPrompt , InvalidRequest , BAD_REQUEST ;
|
||||||
InvalidChatCompletionSearchIndexUidParamPrompt , InvalidRequest , BAD_REQUEST ;
|
InvalidChatCompletionSearchIndexUidParamPrompt , InvalidRequest , BAD_REQUEST ;
|
||||||
InvalidChatCompletionPreQueryPrompt , InvalidRequest , BAD_REQUEST
|
InvalidChatCompletionPreQueryPrompt , InvalidRequest , BAD_REQUEST ;
|
||||||
|
// Webhooks
|
||||||
|
InvalidWebhooks , InvalidRequest , BAD_REQUEST ;
|
||||||
|
InvalidWebhookUrl , InvalidRequest , BAD_REQUEST ;
|
||||||
|
InvalidWebhookHeaders , InvalidRequest , BAD_REQUEST ;
|
||||||
|
ImmutableWebhook , InvalidRequest , BAD_REQUEST ;
|
||||||
|
InvalidWebhookUuid , InvalidRequest , BAD_REQUEST ;
|
||||||
|
WebhookNotFound , InvalidRequest , NOT_FOUND ;
|
||||||
|
ImmutableWebhookUuid , InvalidRequest , BAD_REQUEST ;
|
||||||
|
ImmutableWebhookIsEditable , InvalidRequest , BAD_REQUEST
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ErrorCode for JoinError {
|
impl ErrorCode for JoinError {
|
||||||
|
@ -365,6 +365,21 @@ pub enum Action {
|
|||||||
#[serde(rename = "*.get")]
|
#[serde(rename = "*.get")]
|
||||||
#[deserr(rename = "*.get")]
|
#[deserr(rename = "*.get")]
|
||||||
AllGet,
|
AllGet,
|
||||||
|
#[serde(rename = "webhooks.get")]
|
||||||
|
#[deserr(rename = "webhooks.get")]
|
||||||
|
WebhooksGet,
|
||||||
|
#[serde(rename = "webhooks.update")]
|
||||||
|
#[deserr(rename = "webhooks.update")]
|
||||||
|
WebhooksUpdate,
|
||||||
|
#[serde(rename = "webhooks.delete")]
|
||||||
|
#[deserr(rename = "webhooks.delete")]
|
||||||
|
WebhooksDelete,
|
||||||
|
#[serde(rename = "webhooks.create")]
|
||||||
|
#[deserr(rename = "webhooks.create")]
|
||||||
|
WebhooksCreate,
|
||||||
|
#[serde(rename = "webhooks.*")]
|
||||||
|
#[deserr(rename = "webhooks.*")]
|
||||||
|
WebhooksAll,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Action {
|
impl Action {
|
||||||
@ -416,6 +431,11 @@ impl Action {
|
|||||||
NETWORK_GET => Some(Self::NetworkGet),
|
NETWORK_GET => Some(Self::NetworkGet),
|
||||||
NETWORK_UPDATE => Some(Self::NetworkUpdate),
|
NETWORK_UPDATE => Some(Self::NetworkUpdate),
|
||||||
ALL_GET => Some(Self::AllGet),
|
ALL_GET => Some(Self::AllGet),
|
||||||
|
WEBHOOKS_GET => Some(Self::WebhooksGet),
|
||||||
|
WEBHOOKS_UPDATE => Some(Self::WebhooksUpdate),
|
||||||
|
WEBHOOKS_DELETE => Some(Self::WebhooksDelete),
|
||||||
|
WEBHOOKS_CREATE => Some(Self::WebhooksCreate),
|
||||||
|
WEBHOOKS_ALL => Some(Self::WebhooksAll),
|
||||||
_otherwise => None,
|
_otherwise => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -428,7 +448,9 @@ impl Action {
|
|||||||
match self {
|
match self {
|
||||||
// Any action that expands to others must return false, as it wouldn't be able to expand recursively.
|
// Any action that expands to others must return false, as it wouldn't be able to expand recursively.
|
||||||
All | AllGet | DocumentsAll | IndexesAll | ChatsAll | TasksAll | SettingsAll
|
All | AllGet | DocumentsAll | IndexesAll | ChatsAll | TasksAll | SettingsAll
|
||||||
| StatsAll | MetricsAll | DumpsAll | SnapshotsAll | ChatsSettingsAll => false,
|
| StatsAll | MetricsAll | DumpsAll | SnapshotsAll | ChatsSettingsAll | WebhooksAll => {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
Search => true,
|
Search => true,
|
||||||
DocumentsAdd => false,
|
DocumentsAdd => false,
|
||||||
@ -463,6 +485,10 @@ impl Action {
|
|||||||
ChatsDelete => false,
|
ChatsDelete => false,
|
||||||
ChatsSettingsGet => true,
|
ChatsSettingsGet => true,
|
||||||
ChatsSettingsUpdate => false,
|
ChatsSettingsUpdate => false,
|
||||||
|
WebhooksGet => true,
|
||||||
|
WebhooksUpdate => false,
|
||||||
|
WebhooksDelete => false,
|
||||||
|
WebhooksCreate => false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -522,6 +548,12 @@ pub mod actions {
|
|||||||
pub const CHATS_SETTINGS_ALL: u8 = ChatsSettingsAll.repr();
|
pub const CHATS_SETTINGS_ALL: u8 = ChatsSettingsAll.repr();
|
||||||
pub const CHATS_SETTINGS_GET: u8 = ChatsSettingsGet.repr();
|
pub const CHATS_SETTINGS_GET: u8 = ChatsSettingsGet.repr();
|
||||||
pub const CHATS_SETTINGS_UPDATE: u8 = ChatsSettingsUpdate.repr();
|
pub const CHATS_SETTINGS_UPDATE: u8 = ChatsSettingsUpdate.repr();
|
||||||
|
|
||||||
|
pub const WEBHOOKS_GET: u8 = WebhooksGet.repr();
|
||||||
|
pub const WEBHOOKS_UPDATE: u8 = WebhooksUpdate.repr();
|
||||||
|
pub const WEBHOOKS_DELETE: u8 = WebhooksDelete.repr();
|
||||||
|
pub const WEBHOOKS_CREATE: u8 = WebhooksCreate.repr();
|
||||||
|
pub const WEBHOOKS_ALL: u8 = WebhooksAll.repr();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@ -577,6 +609,11 @@ pub(crate) mod test {
|
|||||||
assert!(ChatsSettingsGet.repr() == 42 && CHATS_SETTINGS_GET == 42);
|
assert!(ChatsSettingsGet.repr() == 42 && CHATS_SETTINGS_GET == 42);
|
||||||
assert!(ChatsSettingsUpdate.repr() == 43 && CHATS_SETTINGS_UPDATE == 43);
|
assert!(ChatsSettingsUpdate.repr() == 43 && CHATS_SETTINGS_UPDATE == 43);
|
||||||
assert!(AllGet.repr() == 44 && ALL_GET == 44);
|
assert!(AllGet.repr() == 44 && ALL_GET == 44);
|
||||||
|
assert!(WebhooksGet.repr() == 45 && WEBHOOKS_GET == 45);
|
||||||
|
assert!(WebhooksUpdate.repr() == 46 && WEBHOOKS_UPDATE == 46);
|
||||||
|
assert!(WebhooksDelete.repr() == 47 && WEBHOOKS_DELETE == 47);
|
||||||
|
assert!(WebhooksCreate.repr() == 48 && WEBHOOKS_CREATE == 48);
|
||||||
|
assert!(WebhooksAll.repr() == 49 && WEBHOOKS_ALL == 49);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -15,6 +15,7 @@ pub mod star_or;
|
|||||||
pub mod task_view;
|
pub mod task_view;
|
||||||
pub mod tasks;
|
pub mod tasks;
|
||||||
pub mod versioning;
|
pub mod versioning;
|
||||||
|
pub mod webhooks;
|
||||||
pub use milli::{heed, Index};
|
pub use milli::{heed, Index};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
pub use versioning::VERSION_FILE_NAME;
|
pub use versioning::VERSION_FILE_NAME;
|
||||||
|
28
crates/meilisearch-types/src/webhooks.rs
Normal file
28
crates/meilisearch-types/src/webhooks.rs
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct Webhook {
|
||||||
|
pub url: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub headers: BTreeMap<String, String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Default, Clone, PartialEq)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct WebhooksView {
|
||||||
|
#[serde(default)]
|
||||||
|
pub webhooks: BTreeMap<Uuid, Webhook>,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Same as the WebhooksView instead it should never contains the CLI webhooks.
|
||||||
|
// It's the right structure to use in the dump
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Default, Clone, PartialEq)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct WebhooksDumpView {
|
||||||
|
#[serde(default)]
|
||||||
|
pub webhooks: BTreeMap<Uuid, Webhook>,
|
||||||
|
}
|
@ -223,8 +223,8 @@ pub fn setup_meilisearch(opt: &Opt) -> anyhow::Result<(Arc<IndexScheduler>, Arc<
|
|||||||
indexes_path: opt.db_path.join("indexes"),
|
indexes_path: opt.db_path.join("indexes"),
|
||||||
snapshots_path: opt.snapshot_dir.clone(),
|
snapshots_path: opt.snapshot_dir.clone(),
|
||||||
dumps_path: opt.dump_dir.clone(),
|
dumps_path: opt.dump_dir.clone(),
|
||||||
webhook_url: opt.task_webhook_url.as_ref().map(|url| url.to_string()),
|
cli_webhook_url: opt.task_webhook_url.as_ref().map(|url| url.to_string()),
|
||||||
webhook_authorization_header: opt.task_webhook_authorization_header.clone(),
|
cli_webhook_authorization: opt.task_webhook_authorization_header.clone(),
|
||||||
task_db_size: opt.max_task_db_size.as_u64() as usize,
|
task_db_size: opt.max_task_db_size.as_u64() as usize,
|
||||||
index_base_map_size: opt.max_index_size.as_u64() as usize,
|
index_base_map_size: opt.max_index_size.as_u64() as usize,
|
||||||
enable_mdb_writemap: opt.experimental_reduce_indexing_memory_usage,
|
enable_mdb_writemap: opt.experimental_reduce_indexing_memory_usage,
|
||||||
@ -491,7 +491,12 @@ fn import_dump(
|
|||||||
let _ = std::fs::write(db_path.join("instance-uid"), instance_uid.to_string().as_bytes());
|
let _ = std::fs::write(db_path.join("instance-uid"), instance_uid.to_string().as_bytes());
|
||||||
};
|
};
|
||||||
|
|
||||||
// 2. Import the `Key`s.
|
// 2. Import the webhooks
|
||||||
|
if let Some(webhooks) = dump_reader.webhooks() {
|
||||||
|
index_scheduler.update_runtime_webhooks(webhooks.webhooks.clone())?;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Import the `Key`s.
|
||||||
let mut keys = Vec::new();
|
let mut keys = Vec::new();
|
||||||
auth.raw_delete_all_keys()?;
|
auth.raw_delete_all_keys()?;
|
||||||
for key in dump_reader.keys()? {
|
for key in dump_reader.keys()? {
|
||||||
@ -500,20 +505,20 @@ fn import_dump(
|
|||||||
keys.push(key);
|
keys.push(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Import the `ChatCompletionSettings`s.
|
// 4. Import the `ChatCompletionSettings`s.
|
||||||
for result in dump_reader.chat_completions_settings()? {
|
for result in dump_reader.chat_completions_settings()? {
|
||||||
let (name, settings) = result?;
|
let (name, settings) = result?;
|
||||||
index_scheduler.put_chat_settings(&name, &settings)?;
|
index_scheduler.put_chat_settings(&name, &settings)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4. Import the runtime features and network
|
// 5. Import the runtime features and network
|
||||||
let features = dump_reader.features()?.unwrap_or_default();
|
let features = dump_reader.features()?.unwrap_or_default();
|
||||||
index_scheduler.put_runtime_features(features)?;
|
index_scheduler.put_runtime_features(features)?;
|
||||||
|
|
||||||
let network = dump_reader.network()?.cloned().unwrap_or_default();
|
let network = dump_reader.network()?.cloned().unwrap_or_default();
|
||||||
index_scheduler.put_network(network)?;
|
index_scheduler.put_network(network)?;
|
||||||
|
|
||||||
// 4.1 Use all cpus to process dump if `max_indexing_threads` not configured
|
// 5.1 Use all cpus to process dump if `max_indexing_threads` not configured
|
||||||
let backup_config;
|
let backup_config;
|
||||||
let base_config = index_scheduler.indexer_config();
|
let base_config = index_scheduler.indexer_config();
|
||||||
|
|
||||||
@ -530,7 +535,7 @@ fn import_dump(
|
|||||||
// /!\ The tasks must be imported AFTER importing the indexes or else the scheduler might
|
// /!\ The tasks must be imported AFTER importing the indexes or else the scheduler might
|
||||||
// try to process tasks while we're trying to import the indexes.
|
// try to process tasks while we're trying to import the indexes.
|
||||||
|
|
||||||
// 5. Import the indexes.
|
// 6. Import the indexes.
|
||||||
for index_reader in dump_reader.indexes()? {
|
for index_reader in dump_reader.indexes()? {
|
||||||
let mut index_reader = index_reader?;
|
let mut index_reader = index_reader?;
|
||||||
let metadata = index_reader.metadata();
|
let metadata = index_reader.metadata();
|
||||||
@ -543,12 +548,12 @@ fn import_dump(
|
|||||||
let mut wtxn = index.write_txn()?;
|
let mut wtxn = index.write_txn()?;
|
||||||
|
|
||||||
let mut builder = milli::update::Settings::new(&mut wtxn, &index, indexer_config);
|
let mut builder = milli::update::Settings::new(&mut wtxn, &index, indexer_config);
|
||||||
// 5.1 Import the primary key if there is one.
|
// 6.1 Import the primary key if there is one.
|
||||||
if let Some(ref primary_key) = metadata.primary_key {
|
if let Some(ref primary_key) = metadata.primary_key {
|
||||||
builder.set_primary_key(primary_key.to_string());
|
builder.set_primary_key(primary_key.to_string());
|
||||||
}
|
}
|
||||||
|
|
||||||
// 5.2 Import the settings.
|
// 6.2 Import the settings.
|
||||||
tracing::info!("Importing the settings.");
|
tracing::info!("Importing the settings.");
|
||||||
let settings = index_reader.settings()?;
|
let settings = index_reader.settings()?;
|
||||||
apply_settings_to_builder(&settings, &mut builder);
|
apply_settings_to_builder(&settings, &mut builder);
|
||||||
@ -560,8 +565,8 @@ fn import_dump(
|
|||||||
let rtxn = index.read_txn()?;
|
let rtxn = index.read_txn()?;
|
||||||
|
|
||||||
if index_scheduler.no_edition_2024_for_dumps() {
|
if index_scheduler.no_edition_2024_for_dumps() {
|
||||||
// 5.3 Import the documents.
|
// 6.3 Import the documents.
|
||||||
// 5.3.1 We need to recreate the grenad+obkv format accepted by the index.
|
// 6.3.1 We need to recreate the grenad+obkv format accepted by the index.
|
||||||
tracing::info!("Importing the documents.");
|
tracing::info!("Importing the documents.");
|
||||||
let file = tempfile::tempfile()?;
|
let file = tempfile::tempfile()?;
|
||||||
let mut builder = DocumentsBatchBuilder::new(BufWriter::new(file));
|
let mut builder = DocumentsBatchBuilder::new(BufWriter::new(file));
|
||||||
@ -572,7 +577,7 @@ fn import_dump(
|
|||||||
// This flush the content of the batch builder.
|
// This flush the content of the batch builder.
|
||||||
let file = builder.into_inner()?.into_inner()?;
|
let file = builder.into_inner()?.into_inner()?;
|
||||||
|
|
||||||
// 5.3.2 We feed it to the milli index.
|
// 6.3.2 We feed it to the milli index.
|
||||||
let reader = BufReader::new(file);
|
let reader = BufReader::new(file);
|
||||||
let reader = DocumentsBatchReader::from_reader(reader)?;
|
let reader = DocumentsBatchReader::from_reader(reader)?;
|
||||||
|
|
||||||
@ -651,15 +656,15 @@ fn import_dump(
|
|||||||
index_scheduler.refresh_index_stats(&uid)?;
|
index_scheduler.refresh_index_stats(&uid)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 6. Import the queue
|
// 7. Import the queue
|
||||||
let mut index_scheduler_dump = index_scheduler.register_dumped_task()?;
|
let mut index_scheduler_dump = index_scheduler.register_dumped_task()?;
|
||||||
// 6.1. Import the batches
|
// 7.1. Import the batches
|
||||||
for ret in dump_reader.batches()? {
|
for ret in dump_reader.batches()? {
|
||||||
let batch = ret?;
|
let batch = ret?;
|
||||||
index_scheduler_dump.register_dumped_batch(batch)?;
|
index_scheduler_dump.register_dumped_batch(batch)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 6.2. Import the tasks
|
// 7.2. Import the tasks
|
||||||
for ret in dump_reader.tasks()? {
|
for ret in dump_reader.tasks()? {
|
||||||
let (task, file) = ret?;
|
let (task, file) = ret?;
|
||||||
index_scheduler_dump.register_dumped_task(task, file)?;
|
index_scheduler_dump.register_dumped_task(task, file)?;
|
||||||
|
@ -206,11 +206,13 @@ pub struct Opt {
|
|||||||
pub env: String,
|
pub env: String,
|
||||||
|
|
||||||
/// Called whenever a task finishes so a third party can be notified.
|
/// Called whenever a task finishes so a third party can be notified.
|
||||||
|
/// See also the dedicated API `/webhooks`.
|
||||||
#[clap(long, env = MEILI_TASK_WEBHOOK_URL)]
|
#[clap(long, env = MEILI_TASK_WEBHOOK_URL)]
|
||||||
pub task_webhook_url: Option<Url>,
|
pub task_webhook_url: Option<Url>,
|
||||||
|
|
||||||
/// The Authorization header to send on the webhook URL whenever
|
/// The Authorization header to send on the webhook URL whenever
|
||||||
/// a task finishes so a third party can be notified.
|
/// a task finishes so a third party can be notified.
|
||||||
|
/// See also the dedicated API `/webhooks`.
|
||||||
#[clap(long, env = MEILI_TASK_WEBHOOK_AUTHORIZATION_HEADER)]
|
#[clap(long, env = MEILI_TASK_WEBHOOK_AUTHORIZATION_HEADER)]
|
||||||
pub task_webhook_authorization_header: Option<String>,
|
pub task_webhook_authorization_header: Option<String>,
|
||||||
|
|
||||||
|
@ -41,6 +41,7 @@ use crate::routes::indexes::IndexView;
|
|||||||
use crate::routes::multi_search::SearchResults;
|
use crate::routes::multi_search::SearchResults;
|
||||||
use crate::routes::network::{Network, Remote};
|
use crate::routes::network::{Network, Remote};
|
||||||
use crate::routes::swap_indexes::SwapIndexesPayload;
|
use crate::routes::swap_indexes::SwapIndexesPayload;
|
||||||
|
use crate::routes::webhooks::{WebhookResults, WebhookSettings, WebhookWithMetadata};
|
||||||
use crate::search::{
|
use crate::search::{
|
||||||
FederatedSearch, FederatedSearchResult, Federation, FederationOptions, MergeFacets,
|
FederatedSearch, FederatedSearchResult, Federation, FederationOptions, MergeFacets,
|
||||||
SearchQueryWithIndex, SearchResultWithIndex, SimilarQuery, SimilarResult,
|
SearchQueryWithIndex, SearchResultWithIndex, SimilarQuery, SimilarResult,
|
||||||
@ -70,6 +71,7 @@ mod swap_indexes;
|
|||||||
pub mod tasks;
|
pub mod tasks;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tasks_test;
|
mod tasks_test;
|
||||||
|
mod webhooks;
|
||||||
|
|
||||||
#[derive(OpenApi)]
|
#[derive(OpenApi)]
|
||||||
#[openapi(
|
#[openapi(
|
||||||
@ -89,6 +91,7 @@ mod tasks_test;
|
|||||||
(path = "/experimental-features", api = features::ExperimentalFeaturesApi),
|
(path = "/experimental-features", api = features::ExperimentalFeaturesApi),
|
||||||
(path = "/export", api = export::ExportApi),
|
(path = "/export", api = export::ExportApi),
|
||||||
(path = "/network", api = network::NetworkApi),
|
(path = "/network", api = network::NetworkApi),
|
||||||
|
(path = "/webhooks", api = webhooks::WebhooksApi),
|
||||||
),
|
),
|
||||||
paths(get_health, get_version, get_stats),
|
paths(get_health, get_version, get_stats),
|
||||||
tags(
|
tags(
|
||||||
@ -99,7 +102,7 @@ mod tasks_test;
|
|||||||
url = "/",
|
url = "/",
|
||||||
description = "Local server",
|
description = "Local server",
|
||||||
)),
|
)),
|
||||||
components(schemas(PaginationView<KeyView>, PaginationView<IndexView>, IndexView, DocumentDeletionByFilter, AllBatches, BatchStats, ProgressStepView, ProgressView, BatchView, RuntimeTogglableFeatures, SwapIndexesPayload, DocumentEditionByFunction, MergeFacets, FederationOptions, SearchQueryWithIndex, Federation, FederatedSearch, FederatedSearchResult, SearchResults, SearchResultWithIndex, SimilarQuery, SimilarResult, PaginationView<serde_json::Value>, BrowseQuery, UpdateIndexRequest, IndexUid, IndexCreateRequest, KeyView, Action, CreateApiKey, UpdateStderrLogs, LogMode, GetLogs, IndexStats, Stats, HealthStatus, HealthResponse, VersionResponse, Code, ErrorType, AllTasks, TaskView, Status, DetailsView, ResponseError, Settings<Unchecked>, Settings<Checked>, TypoSettings, MinWordSizeTyposSetting, FacetingSettings, PaginationSettings, SummarizedTaskView, Kind, Network, Remote, FilterableAttributesRule, FilterableAttributesPatterns, AttributePatterns, FilterableAttributesFeatures, FilterFeatures, Export))
|
components(schemas(PaginationView<KeyView>, PaginationView<IndexView>, IndexView, DocumentDeletionByFilter, AllBatches, BatchStats, ProgressStepView, ProgressView, BatchView, RuntimeTogglableFeatures, SwapIndexesPayload, DocumentEditionByFunction, MergeFacets, FederationOptions, SearchQueryWithIndex, Federation, FederatedSearch, FederatedSearchResult, SearchResults, SearchResultWithIndex, SimilarQuery, SimilarResult, PaginationView<serde_json::Value>, BrowseQuery, UpdateIndexRequest, IndexUid, IndexCreateRequest, KeyView, Action, CreateApiKey, UpdateStderrLogs, LogMode, GetLogs, IndexStats, Stats, HealthStatus, HealthResponse, VersionResponse, Code, ErrorType, AllTasks, TaskView, Status, DetailsView, ResponseError, Settings<Unchecked>, Settings<Checked>, TypoSettings, MinWordSizeTyposSetting, FacetingSettings, PaginationSettings, SummarizedTaskView, Kind, Network, Remote, FilterableAttributesRule, FilterableAttributesPatterns, AttributePatterns, FilterableAttributesFeatures, FilterFeatures, Export, WebhookSettings, WebhookResults, WebhookWithMetadata))
|
||||||
)]
|
)]
|
||||||
pub struct MeilisearchApi;
|
pub struct MeilisearchApi;
|
||||||
|
|
||||||
@ -120,7 +123,8 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
|
|||||||
.service(web::scope("/experimental-features").configure(features::configure))
|
.service(web::scope("/experimental-features").configure(features::configure))
|
||||||
.service(web::scope("/network").configure(network::configure))
|
.service(web::scope("/network").configure(network::configure))
|
||||||
.service(web::scope("/export").configure(export::configure))
|
.service(web::scope("/export").configure(export::configure))
|
||||||
.service(web::scope("/chats").configure(chats::configure));
|
.service(web::scope("/chats").configure(chats::configure))
|
||||||
|
.service(web::scope("/webhooks").configure(webhooks::configure));
|
||||||
|
|
||||||
#[cfg(feature = "swagger")]
|
#[cfg(feature = "swagger")]
|
||||||
{
|
{
|
||||||
|
@ -51,7 +51,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
|
|||||||
get,
|
get,
|
||||||
path = "",
|
path = "",
|
||||||
tag = "Network",
|
tag = "Network",
|
||||||
security(("Bearer" = ["network.get", "network.*", "*"])),
|
security(("Bearer" = ["network.get", "*"])),
|
||||||
responses(
|
responses(
|
||||||
(status = OK, description = "Known nodes are returned", body = Network, content_type = "application/json", example = json!(
|
(status = OK, description = "Known nodes are returned", body = Network, content_type = "application/json", example = json!(
|
||||||
{
|
{
|
||||||
@ -168,7 +168,7 @@ impl Aggregate for PatchNetworkAnalytics {
|
|||||||
path = "",
|
path = "",
|
||||||
tag = "Network",
|
tag = "Network",
|
||||||
request_body = Network,
|
request_body = Network,
|
||||||
security(("Bearer" = ["network.update", "network.*", "*"])),
|
security(("Bearer" = ["network.update", "*"])),
|
||||||
responses(
|
responses(
|
||||||
(status = OK, description = "New network state is returned", body = Network, content_type = "application/json", example = json!(
|
(status = OK, description = "New network state is returned", body = Network, content_type = "application/json", example = json!(
|
||||||
{
|
{
|
||||||
|
483
crates/meilisearch/src/routes/webhooks.rs
Normal file
483
crates/meilisearch/src/routes/webhooks.rs
Normal file
@ -0,0 +1,483 @@
|
|||||||
|
use std::collections::BTreeMap;
|
||||||
|
use std::str::FromStr;
|
||||||
|
|
||||||
|
use actix_http::header::{
|
||||||
|
HeaderName, HeaderValue, InvalidHeaderName as ActixInvalidHeaderName,
|
||||||
|
InvalidHeaderValue as ActixInvalidHeaderValue,
|
||||||
|
};
|
||||||
|
use actix_web::web::{self, Data, Path};
|
||||||
|
use actix_web::{HttpRequest, HttpResponse};
|
||||||
|
use core::convert::Infallible;
|
||||||
|
use deserr::actix_web::AwebJson;
|
||||||
|
use deserr::{DeserializeError, Deserr, ValuePointerRef};
|
||||||
|
use index_scheduler::IndexScheduler;
|
||||||
|
use meilisearch_types::deserr::{immutable_field_error, DeserrJsonError};
|
||||||
|
use meilisearch_types::error::deserr_codes::{
|
||||||
|
BadRequest, InvalidWebhookHeaders, InvalidWebhookUrl,
|
||||||
|
};
|
||||||
|
use meilisearch_types::error::{Code, ErrorCode, ResponseError};
|
||||||
|
use meilisearch_types::keys::actions;
|
||||||
|
use meilisearch_types::milli::update::Setting;
|
||||||
|
use meilisearch_types::webhooks::Webhook;
|
||||||
|
use serde::Serialize;
|
||||||
|
use tracing::debug;
|
||||||
|
use url::Url;
|
||||||
|
use utoipa::{OpenApi, ToSchema};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use crate::analytics::{Aggregate, Analytics};
|
||||||
|
use crate::extractors::authentication::policies::ActionPolicy;
|
||||||
|
use crate::extractors::authentication::GuardedData;
|
||||||
|
use crate::extractors::sequential_extractor::SeqHandler;
|
||||||
|
use WebhooksError::*;
|
||||||
|
|
||||||
|
#[derive(OpenApi)]
|
||||||
|
#[openapi(
|
||||||
|
paths(get_webhooks, get_webhook, post_webhook, patch_webhook, delete_webhook),
|
||||||
|
tags((
|
||||||
|
name = "Webhooks",
|
||||||
|
description = "The `/webhooks` route allows you to register endpoints to be called once tasks are processed.",
|
||||||
|
external_docs(url = "https://www.meilisearch.com/docs/reference/api/webhooks"),
|
||||||
|
)),
|
||||||
|
)]
|
||||||
|
pub struct WebhooksApi;
|
||||||
|
|
||||||
|
pub fn configure(cfg: &mut web::ServiceConfig) {
|
||||||
|
cfg.service(
|
||||||
|
web::resource("")
|
||||||
|
.route(web::get().to(get_webhooks))
|
||||||
|
.route(web::post().to(SeqHandler(post_webhook))),
|
||||||
|
)
|
||||||
|
.service(
|
||||||
|
web::resource("/{uuid}")
|
||||||
|
.route(web::get().to(get_webhook))
|
||||||
|
.route(web::patch().to(SeqHandler(patch_webhook)))
|
||||||
|
.route(web::delete().to(SeqHandler(delete_webhook))),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserr, ToSchema)]
|
||||||
|
#[deserr(error = DeserrJsonError, rename_all = camelCase, deny_unknown_fields = deny_immutable_fields_webhook)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[schema(rename_all = "camelCase")]
|
||||||
|
pub(super) struct WebhookSettings {
|
||||||
|
#[schema(value_type = Option<String>, example = "https://your.site/on-tasks-completed")]
|
||||||
|
#[deserr(default, error = DeserrJsonError<InvalidWebhookUrl>)]
|
||||||
|
#[serde(default)]
|
||||||
|
url: Setting<String>,
|
||||||
|
#[schema(value_type = Option<BTreeMap<String, String>>, example = json!({"Authorization":"Bearer a-secret-token"}))]
|
||||||
|
#[deserr(default, error = DeserrJsonError<InvalidWebhookHeaders>)]
|
||||||
|
#[serde(default)]
|
||||||
|
headers: Setting<BTreeMap<String, Setting<String>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn deny_immutable_fields_webhook(
|
||||||
|
field: &str,
|
||||||
|
accepted: &[&str],
|
||||||
|
location: ValuePointerRef,
|
||||||
|
) -> DeserrJsonError {
|
||||||
|
match field {
|
||||||
|
"uuid" => immutable_field_error(field, accepted, Code::ImmutableWebhookUuid),
|
||||||
|
"isEditable" => immutable_field_error(field, accepted, Code::ImmutableWebhookIsEditable),
|
||||||
|
_ => deserr::take_cf_content(DeserrJsonError::<BadRequest>::error::<Infallible>(
|
||||||
|
None,
|
||||||
|
deserr::ErrorKind::UnknownKey { key: field, accepted },
|
||||||
|
location,
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, ToSchema)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[schema(rename_all = "camelCase")]
|
||||||
|
pub(super) struct WebhookWithMetadata {
|
||||||
|
uuid: Uuid,
|
||||||
|
is_editable: bool,
|
||||||
|
#[schema(value_type = WebhookSettings)]
|
||||||
|
#[serde(flatten)]
|
||||||
|
webhook: Webhook,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WebhookWithMetadata {
|
||||||
|
pub fn from(uuid: Uuid, webhook: Webhook) -> Self {
|
||||||
|
Self { uuid, is_editable: uuid != Uuid::nil(), webhook }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, ToSchema)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub(super) struct WebhookResults {
|
||||||
|
results: Vec<WebhookWithMetadata>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
get,
|
||||||
|
path = "",
|
||||||
|
tag = "Webhooks",
|
||||||
|
security(("Bearer" = ["webhooks.get", "webhooks.*", "*.get", "*"])),
|
||||||
|
responses(
|
||||||
|
(status = OK, description = "Webhooks are returned", body = WebhookResults, content_type = "application/json", example = json!({
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"uuid": "550e8400-e29b-41d4-a716-446655440000",
|
||||||
|
"url": "https://your.site/on-tasks-completed",
|
||||||
|
"headers": {
|
||||||
|
"Authorization": "Bearer a-secret-token"
|
||||||
|
},
|
||||||
|
"isEditable": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"uuid": "550e8400-e29b-41d4-a716-446655440001",
|
||||||
|
"url": "https://another.site/on-tasks-completed",
|
||||||
|
"isEditable": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})),
|
||||||
|
(status = 401, description = "The authorization header is missing", body = ResponseError, content_type = "application/json", example = json!(
|
||||||
|
{
|
||||||
|
"message": "The Authorization header is missing. It must use the bearer authorization method.",
|
||||||
|
"code": "missing_authorization_header",
|
||||||
|
"type": "auth",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#missing_authorization_header"
|
||||||
|
}
|
||||||
|
)),
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
async fn get_webhooks(
|
||||||
|
index_scheduler: GuardedData<ActionPolicy<{ actions::WEBHOOKS_GET }>, Data<IndexScheduler>>,
|
||||||
|
) -> Result<HttpResponse, ResponseError> {
|
||||||
|
let webhooks = index_scheduler.webhooks_view();
|
||||||
|
let results = webhooks
|
||||||
|
.webhooks
|
||||||
|
.into_iter()
|
||||||
|
.map(|(uuid, webhook)| WebhookWithMetadata::from(uuid, webhook))
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let results = WebhookResults { results };
|
||||||
|
|
||||||
|
debug!(returns = ?results, "Get webhooks");
|
||||||
|
Ok(HttpResponse::Ok().json(results))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Default)]
|
||||||
|
pub struct PatchWebhooksAnalytics {
|
||||||
|
patch_webhook_count: usize,
|
||||||
|
post_webhook_count: usize,
|
||||||
|
delete_webhook_count: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PatchWebhooksAnalytics {
|
||||||
|
pub fn patch_webhook() -> Self {
|
||||||
|
PatchWebhooksAnalytics { patch_webhook_count: 1, ..Default::default() }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn post_webhook() -> Self {
|
||||||
|
PatchWebhooksAnalytics { post_webhook_count: 1, ..Default::default() }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn delete_webhook() -> Self {
|
||||||
|
PatchWebhooksAnalytics { delete_webhook_count: 1, ..Default::default() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Aggregate for PatchWebhooksAnalytics {
|
||||||
|
fn event_name(&self) -> &'static str {
|
||||||
|
"Webhooks Updated"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn aggregate(self: Box<Self>, new: Box<Self>) -> Box<Self> {
|
||||||
|
Box::new(PatchWebhooksAnalytics {
|
||||||
|
patch_webhook_count: self.patch_webhook_count + new.patch_webhook_count,
|
||||||
|
post_webhook_count: self.post_webhook_count + new.post_webhook_count,
|
||||||
|
delete_webhook_count: self.delete_webhook_count + new.delete_webhook_count,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn into_event(self: Box<Self>) -> serde_json::Value {
|
||||||
|
serde_json::to_value(*self).unwrap_or_default()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, thiserror::Error)]
|
||||||
|
enum WebhooksError {
|
||||||
|
#[error("The URL for the webhook `{0}` is missing.")]
|
||||||
|
MissingUrl(Uuid),
|
||||||
|
#[error("Defining too many webhooks would crush the server. Please limit the number of webhooks to 20. You may use a third-party proxy server to dispatch events to more than 20 endpoints.")]
|
||||||
|
TooManyWebhooks,
|
||||||
|
#[error("Too many headers for the webhook `{0}`. Please limit the number of headers to 200. Hint: To remove an already defined header set its value to `null`")]
|
||||||
|
TooManyHeaders(Uuid),
|
||||||
|
#[error("Webhook `{0}` is immutable. The webhook defined from the command line cannot be modified using the API.")]
|
||||||
|
ImmutableWebhook(Uuid),
|
||||||
|
#[error("Webhook `{0}` not found.")]
|
||||||
|
WebhookNotFound(Uuid),
|
||||||
|
#[error("Invalid header name `{0}`: {1}")]
|
||||||
|
InvalidHeaderName(String, ActixInvalidHeaderName),
|
||||||
|
#[error("Invalid header value `{0}`: {1}")]
|
||||||
|
InvalidHeaderValue(String, ActixInvalidHeaderValue),
|
||||||
|
#[error("Invalid URL `{0}`: {1}")]
|
||||||
|
InvalidUrl(String, url::ParseError),
|
||||||
|
#[error("Invalid UUID: {0}")]
|
||||||
|
InvalidUuid(uuid::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ErrorCode for WebhooksError {
|
||||||
|
fn error_code(&self) -> meilisearch_types::error::Code {
|
||||||
|
match self {
|
||||||
|
MissingUrl(_) => meilisearch_types::error::Code::InvalidWebhookUrl,
|
||||||
|
TooManyWebhooks => meilisearch_types::error::Code::InvalidWebhooks,
|
||||||
|
TooManyHeaders(_) => meilisearch_types::error::Code::InvalidWebhookHeaders,
|
||||||
|
ImmutableWebhook(_) => meilisearch_types::error::Code::ImmutableWebhook,
|
||||||
|
WebhookNotFound(_) => meilisearch_types::error::Code::WebhookNotFound,
|
||||||
|
InvalidHeaderName(_, _) => meilisearch_types::error::Code::InvalidWebhookHeaders,
|
||||||
|
InvalidHeaderValue(_, _) => meilisearch_types::error::Code::InvalidWebhookHeaders,
|
||||||
|
InvalidUrl(_, _) => meilisearch_types::error::Code::InvalidWebhookUrl,
|
||||||
|
InvalidUuid(_) => meilisearch_types::error::Code::InvalidWebhookUuid,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn patch_webhook_inner(
|
||||||
|
uuid: &Uuid,
|
||||||
|
old_webhook: Webhook,
|
||||||
|
new_webhook: WebhookSettings,
|
||||||
|
) -> Result<Webhook, WebhooksError> {
|
||||||
|
let Webhook { url: old_url, mut headers } = old_webhook;
|
||||||
|
|
||||||
|
let url = match new_webhook.url {
|
||||||
|
Setting::Set(url) => url,
|
||||||
|
Setting::NotSet => old_url,
|
||||||
|
Setting::Reset => return Err(MissingUrl(uuid.to_owned())),
|
||||||
|
};
|
||||||
|
|
||||||
|
match new_webhook.headers {
|
||||||
|
Setting::Set(new_headers) => {
|
||||||
|
for (name, value) in new_headers {
|
||||||
|
match value {
|
||||||
|
Setting::Set(value) => {
|
||||||
|
headers.insert(name, value);
|
||||||
|
}
|
||||||
|
Setting::NotSet => continue,
|
||||||
|
Setting::Reset => {
|
||||||
|
headers.remove(&name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Setting::Reset => headers.clear(),
|
||||||
|
Setting::NotSet => (),
|
||||||
|
};
|
||||||
|
|
||||||
|
if headers.len() > 200 {
|
||||||
|
return Err(TooManyHeaders(uuid.to_owned()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Webhook { url, headers })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn check_changed(uuid: Uuid, webhook: &Webhook) -> Result<(), WebhooksError> {
|
||||||
|
if uuid.is_nil() {
|
||||||
|
return Err(ImmutableWebhook(uuid));
|
||||||
|
}
|
||||||
|
|
||||||
|
if webhook.url.is_empty() {
|
||||||
|
return Err(MissingUrl(uuid));
|
||||||
|
}
|
||||||
|
|
||||||
|
if webhook.headers.len() > 200 {
|
||||||
|
return Err(TooManyHeaders(uuid));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (header, value) in &webhook.headers {
|
||||||
|
HeaderName::from_bytes(header.as_bytes())
|
||||||
|
.map_err(|e| InvalidHeaderName(header.to_owned(), e))?;
|
||||||
|
HeaderValue::from_str(value).map_err(|e| InvalidHeaderValue(header.to_owned(), e))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Err(e) = Url::parse(&webhook.url) {
|
||||||
|
return Err(InvalidUrl(webhook.url.to_owned(), e));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
get,
|
||||||
|
path = "/{uuid}",
|
||||||
|
tag = "Webhooks",
|
||||||
|
security(("Bearer" = ["webhooks.get", "webhooks.*", "*.get", "*"])),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Webhook found", body = WebhookWithMetadata, content_type = "application/json", example = json!({
|
||||||
|
"uuid": "550e8400-e29b-41d4-a716-446655440000",
|
||||||
|
"url": "https://your.site/on-tasks-completed",
|
||||||
|
"headers": {
|
||||||
|
"Authorization": "Bearer a-secret"
|
||||||
|
},
|
||||||
|
"isEditable": true
|
||||||
|
})),
|
||||||
|
(status = 404, description = "Webhook not found", body = ResponseError, content_type = "application/json"),
|
||||||
|
(status = 401, description = "The authorization header is missing", body = ResponseError, content_type = "application/json"),
|
||||||
|
),
|
||||||
|
params(
|
||||||
|
("uuid" = Uuid, Path, description = "The universally unique identifier of the webhook")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
async fn get_webhook(
|
||||||
|
index_scheduler: GuardedData<ActionPolicy<{ actions::WEBHOOKS_GET }>, Data<IndexScheduler>>,
|
||||||
|
uuid: Path<String>,
|
||||||
|
) -> Result<HttpResponse, ResponseError> {
|
||||||
|
let uuid = Uuid::from_str(&uuid.into_inner()).map_err(InvalidUuid)?;
|
||||||
|
let mut webhooks = index_scheduler.webhooks_view();
|
||||||
|
|
||||||
|
let webhook = webhooks.webhooks.remove(&uuid).ok_or(WebhookNotFound(uuid))?;
|
||||||
|
let webhook = WebhookWithMetadata::from(uuid, webhook);
|
||||||
|
|
||||||
|
debug!(returns = ?webhook, "Get webhook");
|
||||||
|
Ok(HttpResponse::Ok().json(webhook))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
post,
|
||||||
|
path = "",
|
||||||
|
tag = "Webhooks",
|
||||||
|
request_body = WebhookSettings,
|
||||||
|
security(("Bearer" = ["webhooks.create", "webhooks.*", "*"])),
|
||||||
|
responses(
|
||||||
|
(status = 201, description = "Webhook created successfully", body = WebhookWithMetadata, content_type = "application/json", example = json!({
|
||||||
|
"uuid": "550e8400-e29b-41d4-a716-446655440000",
|
||||||
|
"url": "https://your.site/on-tasks-completed",
|
||||||
|
"headers": {
|
||||||
|
"Authorization": "Bearer a-secret-token"
|
||||||
|
},
|
||||||
|
"isEditable": true
|
||||||
|
})),
|
||||||
|
(status = 401, description = "The authorization header is missing", body = ResponseError, content_type = "application/json"),
|
||||||
|
(status = 400, description = "Bad request", body = ResponseError, content_type = "application/json"),
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
async fn post_webhook(
|
||||||
|
index_scheduler: GuardedData<ActionPolicy<{ actions::WEBHOOKS_CREATE }>, Data<IndexScheduler>>,
|
||||||
|
webhook_settings: AwebJson<WebhookSettings, DeserrJsonError>,
|
||||||
|
req: HttpRequest,
|
||||||
|
analytics: Data<Analytics>,
|
||||||
|
) -> Result<HttpResponse, ResponseError> {
|
||||||
|
let webhook_settings = webhook_settings.into_inner();
|
||||||
|
debug!(parameters = ?webhook_settings, "Post webhook");
|
||||||
|
|
||||||
|
let uuid = Uuid::new_v4();
|
||||||
|
if webhook_settings.headers.as_ref().set().is_some_and(|h| h.len() > 200) {
|
||||||
|
return Err(TooManyHeaders(uuid).into());
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut webhooks = index_scheduler.retrieve_runtime_webhooks();
|
||||||
|
if webhooks.len() >= 20 {
|
||||||
|
return Err(TooManyWebhooks.into());
|
||||||
|
}
|
||||||
|
|
||||||
|
let webhook = Webhook {
|
||||||
|
url: webhook_settings.url.set().ok_or(MissingUrl(uuid))?,
|
||||||
|
headers: webhook_settings
|
||||||
|
.headers
|
||||||
|
.set()
|
||||||
|
.map(|h| h.into_iter().map(|(k, v)| (k, v.set().unwrap_or_default())).collect())
|
||||||
|
.unwrap_or_default(),
|
||||||
|
};
|
||||||
|
|
||||||
|
check_changed(uuid, &webhook)?;
|
||||||
|
webhooks.insert(uuid, webhook.clone());
|
||||||
|
index_scheduler.update_runtime_webhooks(webhooks)?;
|
||||||
|
|
||||||
|
analytics.publish(PatchWebhooksAnalytics::post_webhook(), &req);
|
||||||
|
|
||||||
|
let response = WebhookWithMetadata::from(uuid, webhook);
|
||||||
|
debug!(returns = ?response, "Post webhook");
|
||||||
|
Ok(HttpResponse::Created().json(response))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
patch,
|
||||||
|
path = "/{uuid}",
|
||||||
|
tag = "Webhooks",
|
||||||
|
request_body = WebhookSettings,
|
||||||
|
security(("Bearer" = ["webhooks.update", "webhooks.*", "*"])),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Webhook updated successfully", body = WebhookWithMetadata, content_type = "application/json", example = json!({
|
||||||
|
"uuid": "550e8400-e29b-41d4-a716-446655440000",
|
||||||
|
"url": "https://your.site/on-tasks-completed",
|
||||||
|
"headers": {
|
||||||
|
"Authorization": "Bearer a-secret-token"
|
||||||
|
},
|
||||||
|
"isEditable": true
|
||||||
|
})),
|
||||||
|
(status = 401, description = "The authorization header is missing", body = ResponseError, content_type = "application/json"),
|
||||||
|
(status = 400, description = "Bad request", body = ResponseError, content_type = "application/json"),
|
||||||
|
),
|
||||||
|
params(
|
||||||
|
("uuid" = Uuid, Path, description = "The universally unique identifier of the webhook")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
async fn patch_webhook(
|
||||||
|
index_scheduler: GuardedData<ActionPolicy<{ actions::WEBHOOKS_UPDATE }>, Data<IndexScheduler>>,
|
||||||
|
uuid: Path<String>,
|
||||||
|
webhook_settings: AwebJson<WebhookSettings, DeserrJsonError>,
|
||||||
|
req: HttpRequest,
|
||||||
|
analytics: Data<Analytics>,
|
||||||
|
) -> Result<HttpResponse, ResponseError> {
|
||||||
|
let uuid = Uuid::from_str(&uuid.into_inner()).map_err(InvalidUuid)?;
|
||||||
|
let webhook_settings = webhook_settings.into_inner();
|
||||||
|
debug!(parameters = ?(uuid, &webhook_settings), "Patch webhook");
|
||||||
|
|
||||||
|
if uuid.is_nil() {
|
||||||
|
return Err(ImmutableWebhook(uuid).into());
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut webhooks = index_scheduler.retrieve_runtime_webhooks();
|
||||||
|
let old_webhook = webhooks.remove(&uuid).ok_or(WebhookNotFound(uuid))?;
|
||||||
|
let webhook = patch_webhook_inner(&uuid, old_webhook, webhook_settings)?;
|
||||||
|
|
||||||
|
check_changed(uuid, &webhook)?;
|
||||||
|
webhooks.insert(uuid, webhook.clone());
|
||||||
|
index_scheduler.update_runtime_webhooks(webhooks)?;
|
||||||
|
|
||||||
|
analytics.publish(PatchWebhooksAnalytics::patch_webhook(), &req);
|
||||||
|
|
||||||
|
let response = WebhookWithMetadata::from(uuid, webhook);
|
||||||
|
debug!(returns = ?response, "Patch webhook");
|
||||||
|
Ok(HttpResponse::Ok().json(response))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
delete,
|
||||||
|
path = "/{uuid}",
|
||||||
|
tag = "Webhooks",
|
||||||
|
security(("Bearer" = ["webhooks.delete", "webhooks.*", "*"])),
|
||||||
|
responses(
|
||||||
|
(status = 204, description = "Webhook deleted successfully"),
|
||||||
|
(status = 404, description = "Webhook not found", body = ResponseError, content_type = "application/json"),
|
||||||
|
(status = 401, description = "The authorization header is missing", body = ResponseError, content_type = "application/json"),
|
||||||
|
),
|
||||||
|
params(
|
||||||
|
("uuid" = Uuid, Path, description = "The universally unique identifier of the webhook")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
async fn delete_webhook(
|
||||||
|
index_scheduler: GuardedData<ActionPolicy<{ actions::WEBHOOKS_DELETE }>, Data<IndexScheduler>>,
|
||||||
|
uuid: Path<String>,
|
||||||
|
req: HttpRequest,
|
||||||
|
analytics: Data<Analytics>,
|
||||||
|
) -> Result<HttpResponse, ResponseError> {
|
||||||
|
let uuid = Uuid::from_str(&uuid.into_inner()).map_err(InvalidUuid)?;
|
||||||
|
debug!(parameters = ?uuid, "Delete webhook");
|
||||||
|
|
||||||
|
if uuid.is_nil() {
|
||||||
|
return Err(ImmutableWebhook(uuid).into());
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut webhooks = index_scheduler.retrieve_runtime_webhooks();
|
||||||
|
webhooks.remove(&uuid).ok_or(WebhookNotFound(uuid))?;
|
||||||
|
index_scheduler.update_runtime_webhooks(webhooks)?;
|
||||||
|
|
||||||
|
analytics.publish(PatchWebhooksAnalytics::delete_webhook(), &req);
|
||||||
|
|
||||||
|
debug!(returns = "No Content", "Delete webhook");
|
||||||
|
Ok(HttpResponse::NoContent().finish())
|
||||||
|
}
|
@ -421,7 +421,7 @@ async fn error_add_api_key_invalid_parameters_actions() {
|
|||||||
meili_snap::snapshot!(code, @"400 Bad Request");
|
meili_snap::snapshot!(code, @"400 Bad Request");
|
||||||
meili_snap::snapshot!(meili_snap::json_string!(response, { ".createdAt" => "[ignored]", ".updatedAt" => "[ignored]" }), @r#"
|
meili_snap::snapshot!(meili_snap::json_string!(response, { ".createdAt" => "[ignored]", ".updatedAt" => "[ignored]" }), @r#"
|
||||||
{
|
{
|
||||||
"message": "Unknown value `doc.add` at `.actions[0]`: expected one of `*`, `search`, `documents.*`, `documents.add`, `documents.get`, `documents.delete`, `indexes.*`, `indexes.create`, `indexes.get`, `indexes.update`, `indexes.delete`, `indexes.swap`, `tasks.*`, `tasks.cancel`, `tasks.delete`, `tasks.get`, `settings.*`, `settings.get`, `settings.update`, `stats.*`, `stats.get`, `metrics.*`, `metrics.get`, `dumps.*`, `dumps.create`, `snapshots.*`, `snapshots.create`, `version`, `keys.create`, `keys.get`, `keys.update`, `keys.delete`, `experimental.get`, `experimental.update`, `export`, `network.get`, `network.update`, `chatCompletions`, `chats.*`, `chats.get`, `chats.delete`, `chatsSettings.*`, `chatsSettings.get`, `chatsSettings.update`, `*.get`",
|
"message": "Unknown value `doc.add` at `.actions[0]`: expected one of `*`, `search`, `documents.*`, `documents.add`, `documents.get`, `documents.delete`, `indexes.*`, `indexes.create`, `indexes.get`, `indexes.update`, `indexes.delete`, `indexes.swap`, `tasks.*`, `tasks.cancel`, `tasks.delete`, `tasks.get`, `settings.*`, `settings.get`, `settings.update`, `stats.*`, `stats.get`, `metrics.*`, `metrics.get`, `dumps.*`, `dumps.create`, `snapshots.*`, `snapshots.create`, `version`, `keys.create`, `keys.get`, `keys.update`, `keys.delete`, `experimental.get`, `experimental.update`, `export`, `network.get`, `network.update`, `chatCompletions`, `chats.*`, `chats.get`, `chats.delete`, `chatsSettings.*`, `chatsSettings.get`, `chatsSettings.update`, `*.get`, `webhooks.get`, `webhooks.update`, `webhooks.delete`, `webhooks.create`, `webhooks.*`",
|
||||||
"code": "invalid_api_key_actions",
|
"code": "invalid_api_key_actions",
|
||||||
"type": "invalid_request",
|
"type": "invalid_request",
|
||||||
"link": "https://docs.meilisearch.com/errors#invalid_api_key_actions"
|
"link": "https://docs.meilisearch.com/errors#invalid_api_key_actions"
|
||||||
|
@ -93,7 +93,7 @@ async fn create_api_key_bad_actions() {
|
|||||||
snapshot!(code, @"400 Bad Request");
|
snapshot!(code, @"400 Bad Request");
|
||||||
snapshot!(json_string!(response), @r#"
|
snapshot!(json_string!(response), @r#"
|
||||||
{
|
{
|
||||||
"message": "Unknown value `doggo` at `.actions[0]`: expected one of `*`, `search`, `documents.*`, `documents.add`, `documents.get`, `documents.delete`, `indexes.*`, `indexes.create`, `indexes.get`, `indexes.update`, `indexes.delete`, `indexes.swap`, `tasks.*`, `tasks.cancel`, `tasks.delete`, `tasks.get`, `settings.*`, `settings.get`, `settings.update`, `stats.*`, `stats.get`, `metrics.*`, `metrics.get`, `dumps.*`, `dumps.create`, `snapshots.*`, `snapshots.create`, `version`, `keys.create`, `keys.get`, `keys.update`, `keys.delete`, `experimental.get`, `experimental.update`, `export`, `network.get`, `network.update`, `chatCompletions`, `chats.*`, `chats.get`, `chats.delete`, `chatsSettings.*`, `chatsSettings.get`, `chatsSettings.update`, `*.get`",
|
"message": "Unknown value `doggo` at `.actions[0]`: expected one of `*`, `search`, `documents.*`, `documents.add`, `documents.get`, `documents.delete`, `indexes.*`, `indexes.create`, `indexes.get`, `indexes.update`, `indexes.delete`, `indexes.swap`, `tasks.*`, `tasks.cancel`, `tasks.delete`, `tasks.get`, `settings.*`, `settings.get`, `settings.update`, `stats.*`, `stats.get`, `metrics.*`, `metrics.get`, `dumps.*`, `dumps.create`, `snapshots.*`, `snapshots.create`, `version`, `keys.create`, `keys.get`, `keys.update`, `keys.delete`, `experimental.get`, `experimental.update`, `export`, `network.get`, `network.update`, `chatCompletions`, `chats.*`, `chats.get`, `chats.delete`, `chatsSettings.*`, `chatsSettings.get`, `chatsSettings.update`, `*.get`, `webhooks.get`, `webhooks.update`, `webhooks.delete`, `webhooks.create`, `webhooks.*`",
|
||||||
"code": "invalid_api_key_actions",
|
"code": "invalid_api_key_actions",
|
||||||
"type": "invalid_request",
|
"type": "invalid_request",
|
||||||
"link": "https://docs.meilisearch.com/errors#invalid_api_key_actions"
|
"link": "https://docs.meilisearch.com/errors#invalid_api_key_actions"
|
||||||
|
@ -182,6 +182,25 @@ impl Server<Owned> {
|
|||||||
self.service.patch("/network", value).await
|
self.service.patch("/network", value).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn create_webhook(&self, value: Value) -> (Value, StatusCode) {
|
||||||
|
self.service.post("/webhooks", value).await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_webhook(&self, uuid: impl AsRef<str>) -> (Value, StatusCode) {
|
||||||
|
let url = format!("/webhooks/{}", uuid.as_ref());
|
||||||
|
self.service.get(url).await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn delete_webhook(&self, uuid: impl AsRef<str>) -> (Value, StatusCode) {
|
||||||
|
let url = format!("/webhooks/{}", uuid.as_ref());
|
||||||
|
self.service.delete(url).await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn patch_webhook(&self, uuid: impl AsRef<str>, value: Value) -> (Value, StatusCode) {
|
||||||
|
let url = format!("/webhooks/{}", uuid.as_ref());
|
||||||
|
self.service.patch(url, value).await
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn get_metrics(&self) -> (Value, StatusCode) {
|
pub async fn get_metrics(&self) -> (Value, StatusCode) {
|
||||||
self.service.get("/metrics").await
|
self.service.get("/metrics").await
|
||||||
}
|
}
|
||||||
@ -447,6 +466,10 @@ impl<State> Server<State> {
|
|||||||
pub async fn get_network(&self) -> (Value, StatusCode) {
|
pub async fn get_network(&self) -> (Value, StatusCode) {
|
||||||
self.service.get("/network").await
|
self.service.get("/network").await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn get_webhooks(&self) -> (Value, StatusCode) {
|
||||||
|
self.service.get("/webhooks").await
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn default_settings(dir: impl AsRef<Path>) -> Opt {
|
pub fn default_settings(dir: impl AsRef<Path>) -> Opt {
|
||||||
|
@ -2,16 +2,18 @@
|
|||||||
//! post requests. The webhook handle starts a server and forwards all the
|
//! post requests. The webhook handle starts a server and forwards all the
|
||||||
//! received requests into a channel for you to handle.
|
//! received requests into a channel for you to handle.
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use actix_http::body::MessageBody;
|
use actix_http::body::MessageBody;
|
||||||
use actix_web::dev::{ServiceFactory, ServiceResponse};
|
use actix_web::dev::{ServiceFactory, ServiceResponse};
|
||||||
use actix_web::web::{Bytes, Data};
|
use actix_web::web::{Bytes, Data};
|
||||||
use actix_web::{post, App, HttpRequest, HttpResponse, HttpServer};
|
use actix_web::{post, App, HttpRequest, HttpResponse, HttpServer};
|
||||||
use meili_snap::snapshot;
|
use meili_snap::{json_string, snapshot};
|
||||||
use meilisearch::Opt;
|
use meilisearch::Opt;
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::common::{self, default_settings, Server};
|
use crate::common::{self, default_settings, Server};
|
||||||
use crate::json;
|
use crate::json;
|
||||||
@ -68,21 +70,55 @@ async fn create_webhook_server() -> WebhookHandle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[actix_web::test]
|
#[actix_web::test]
|
||||||
async fn test_basic_webhook() {
|
async fn cli_only() {
|
||||||
let WebhookHandle { server_handle, url, mut receiver } = create_webhook_server().await;
|
|
||||||
|
|
||||||
let db_path = tempfile::tempdir().unwrap();
|
let db_path = tempfile::tempdir().unwrap();
|
||||||
let server = Server::new_with_options(Opt {
|
let server = Server::new_with_options(Opt {
|
||||||
task_webhook_url: Some(Url::parse(&url).unwrap()),
|
task_webhook_url: Some(Url::parse("https://example-cli.com/").unwrap()),
|
||||||
|
task_webhook_authorization_header: Some(String::from("Bearer a-secret-token")),
|
||||||
..default_settings(db_path.path())
|
..default_settings(db_path.path())
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let index = server.index("tamo");
|
let (webhooks, code) = server.get_webhooks().await;
|
||||||
|
snapshot!(code, @"200 OK");
|
||||||
|
snapshot!(webhooks, @r#"
|
||||||
|
{
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"uuid": "00000000-0000-0000-0000-000000000000",
|
||||||
|
"isEditable": false,
|
||||||
|
"url": "https://example-cli.com/",
|
||||||
|
"headers": {
|
||||||
|
"Authorization": "Bearer a-secret-token"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn single_receives_data() {
|
||||||
|
let WebhookHandle { server_handle, url, mut receiver } = create_webhook_server().await;
|
||||||
|
|
||||||
|
let server = Server::new().await;
|
||||||
|
|
||||||
|
let (value, code) = server.create_webhook(json!({ "url": url })).await;
|
||||||
|
snapshot!(code, @"201 Created");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]", ".url" => "[ignored]" }), @r#"
|
||||||
|
{
|
||||||
|
"uuid": "[uuid]",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "[ignored]",
|
||||||
|
"headers": {}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
// May be flaky: we're relying on the fact that while the first document addition is processed, the other
|
// May be flaky: we're relying on the fact that while the first document addition is processed, the other
|
||||||
// operations will be received and will be batched together. If it doesn't happen it's not a problem
|
// operations will be received and will be batched together. If it doesn't happen it's not a problem
|
||||||
// the rest of the test won't assume anything about the number of tasks per batch.
|
// the rest of the test won't assume anything about the number of tasks per batch.
|
||||||
|
let index = server.index("tamo");
|
||||||
for i in 0..5 {
|
for i in 0..5 {
|
||||||
let (_, _status) = index.add_documents(json!({ "id": i, "doggo": "bone" }), None).await;
|
let (_, _status) = index.add_documents(json!({ "id": i, "doggo": "bone" }), None).await;
|
||||||
}
|
}
|
||||||
@ -127,3 +163,496 @@ async fn test_basic_webhook() {
|
|||||||
|
|
||||||
server_handle.abort();
|
server_handle.abort();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn multiple_receive_data() {
|
||||||
|
let WebhookHandle { server_handle: handle1, url: url1, receiver: mut receiver1 } =
|
||||||
|
create_webhook_server().await;
|
||||||
|
let WebhookHandle { server_handle: handle2, url: url2, receiver: mut receiver2 } =
|
||||||
|
create_webhook_server().await;
|
||||||
|
let WebhookHandle { server_handle: handle3, url: url3, receiver: mut receiver3 } =
|
||||||
|
create_webhook_server().await;
|
||||||
|
|
||||||
|
let db_path = tempfile::tempdir().unwrap();
|
||||||
|
let server = Server::new_with_options(Opt {
|
||||||
|
task_webhook_url: Some(Url::parse(&url3).unwrap()),
|
||||||
|
..default_settings(db_path.path())
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
for url in [url1, url2] {
|
||||||
|
let (value, code) = server.create_webhook(json!({ "url": url })).await;
|
||||||
|
snapshot!(code, @"201 Created");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]", ".url" => "[ignored]" }), @r#"
|
||||||
|
{
|
||||||
|
"uuid": "[uuid]",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "[ignored]",
|
||||||
|
"headers": {}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
let index = server.index("tamo");
|
||||||
|
let (_, status) = index.add_documents(json!({ "id": 1, "doggo": "bone" }), None).await;
|
||||||
|
snapshot!(status, @"202 Accepted");
|
||||||
|
|
||||||
|
let mut count1 = 0;
|
||||||
|
let mut count2 = 0;
|
||||||
|
let mut count3 = 0;
|
||||||
|
while count1 == 0 || count2 == 0 || count3 == 0 {
|
||||||
|
tokio::select! {
|
||||||
|
msg = receiver1.recv() => { if msg.is_some() { count1 += 1; } },
|
||||||
|
msg = receiver2.recv() => { if msg.is_some() { count2 += 1; } },
|
||||||
|
msg = receiver3.recv() => { if msg.is_some() { count3 += 1; } },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assert_eq!(count1, 1);
|
||||||
|
assert_eq!(count2, 1);
|
||||||
|
assert_eq!(count3, 1);
|
||||||
|
|
||||||
|
handle1.abort();
|
||||||
|
handle2.abort();
|
||||||
|
handle3.abort();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn cli_with_dumps() {
|
||||||
|
let db_path = tempfile::tempdir().unwrap();
|
||||||
|
let server = Server::new_with_options(Opt {
|
||||||
|
task_webhook_url: Some(Url::parse("http://defined-in-test-cli.com").unwrap()),
|
||||||
|
task_webhook_authorization_header: Some(String::from(
|
||||||
|
"Bearer a-secret-token-defined-in-test-cli",
|
||||||
|
)),
|
||||||
|
import_dump: Some(PathBuf::from("../dump/tests/assets/v6-with-webhooks.dump")),
|
||||||
|
..default_settings(db_path.path())
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let (webhooks, code) = server.get_webhooks().await;
|
||||||
|
snapshot!(code, @"200 OK");
|
||||||
|
snapshot!(webhooks, @r#"
|
||||||
|
{
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"uuid": "00000000-0000-0000-0000-000000000000",
|
||||||
|
"isEditable": false,
|
||||||
|
"url": "http://defined-in-test-cli.com/",
|
||||||
|
"headers": {
|
||||||
|
"Authorization": "Bearer a-secret-token-defined-in-test-cli"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"uuid": "627ea538-733d-4545-8d2d-03526eb381ce",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://example.com/authorization-less",
|
||||||
|
"headers": {}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"uuid": "771b0a28-ef28-4082-b984-536f82958c65",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": {
|
||||||
|
"authorization": "TOKEN"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"uuid": "f3583083-f8a7-4cbf-a5e7-fb3f1e28a7e9",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://third.com",
|
||||||
|
"headers": {}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn reserved_names() {
|
||||||
|
let db_path = tempfile::tempdir().unwrap();
|
||||||
|
let server = Server::new_with_options(Opt {
|
||||||
|
task_webhook_url: Some(Url::parse("https://example-cli.com/").unwrap()),
|
||||||
|
task_webhook_authorization_header: Some(String::from("Bearer a-secret-token")),
|
||||||
|
..default_settings(db_path.path())
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let (value, code) = server
|
||||||
|
.patch_webhook(Uuid::nil().to_string(), json!({ "url": "http://localhost:8080" }))
|
||||||
|
.await;
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Webhook `[uuid]` is immutable. The webhook defined from the command line cannot be modified using the API.",
|
||||||
|
"code": "immutable_webhook",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#immutable_webhook"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
|
||||||
|
let (value, code) = server.delete_webhook(Uuid::nil().to_string()).await;
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Webhook `[uuid]` is immutable. The webhook defined from the command line cannot be modified using the API.",
|
||||||
|
"code": "immutable_webhook",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#immutable_webhook"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn over_limits() {
|
||||||
|
let server = Server::new().await;
|
||||||
|
|
||||||
|
// Too many webhooks
|
||||||
|
let mut uuids = Vec::new();
|
||||||
|
for _ in 0..20 {
|
||||||
|
let (value, code) = server.create_webhook(json!({ "url": "http://localhost:8080" } )).await;
|
||||||
|
snapshot!(code, @"201 Created");
|
||||||
|
uuids.push(value.get("uuid").unwrap().as_str().unwrap().to_string());
|
||||||
|
}
|
||||||
|
let (value, code) = server.create_webhook(json!({ "url": "http://localhost:8080" })).await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Defining too many webhooks would crush the server. Please limit the number of webhooks to 20. You may use a third-party proxy server to dispatch events to more than 20 endpoints.",
|
||||||
|
"code": "invalid_webhooks",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhooks"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
// Reset webhooks
|
||||||
|
for uuid in uuids {
|
||||||
|
let (_value, code) = server.delete_webhook(&uuid).await;
|
||||||
|
snapshot!(code, @"204 No Content");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test too many headers
|
||||||
|
let (value, code) = server.create_webhook(json!({ "url": "http://localhost:8080" })).await;
|
||||||
|
snapshot!(code, @"201 Created");
|
||||||
|
let uuid = value.get("uuid").unwrap().as_str().unwrap();
|
||||||
|
for i in 0..200 {
|
||||||
|
let header_name = format!("header_{i}");
|
||||||
|
let (_value, code) =
|
||||||
|
server.patch_webhook(uuid, json!({ "headers": { header_name: "" } })).await;
|
||||||
|
snapshot!(code, @"200 OK");
|
||||||
|
}
|
||||||
|
let (value, code) =
|
||||||
|
server.patch_webhook(uuid, json!({ "headers": { "header_200": "" } })).await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Too many headers for the webhook `[uuid]`. Please limit the number of headers to 200. Hint: To remove an already defined header set its value to `null`",
|
||||||
|
"code": "invalid_webhook_headers",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_headers"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn post_get_delete() {
|
||||||
|
let server = Server::new().await;
|
||||||
|
|
||||||
|
let (value, code) = server
|
||||||
|
.create_webhook(json!({
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": { "authorization": "TOKEN" }
|
||||||
|
}))
|
||||||
|
.await;
|
||||||
|
snapshot!(code, @"201 Created");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]" }), @r#"
|
||||||
|
{
|
||||||
|
"uuid": "[uuid]",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": {
|
||||||
|
"authorization": "TOKEN"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
let uuid = value.get("uuid").unwrap().as_str().unwrap();
|
||||||
|
let (value, code) = server.get_webhook(uuid).await;
|
||||||
|
snapshot!(code, @"200 OK");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]" }), @r#"
|
||||||
|
{
|
||||||
|
"uuid": "[uuid]",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": {
|
||||||
|
"authorization": "TOKEN"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
let (_value, code) = server.delete_webhook(uuid).await;
|
||||||
|
snapshot!(code, @"204 No Content");
|
||||||
|
|
||||||
|
let (_value, code) = server.get_webhook(uuid).await;
|
||||||
|
snapshot!(code, @"404 Not Found");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn create_and_patch() {
|
||||||
|
let server = Server::new().await;
|
||||||
|
|
||||||
|
let (value, code) =
|
||||||
|
server.create_webhook(json!({ "headers": { "authorization": "TOKEN" } })).await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "The URL for the webhook `[uuid]` is missing.",
|
||||||
|
"code": "invalid_webhook_url",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_url"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
let (value, code) = server.create_webhook(json!({ "url": "https://example.com/hook" })).await;
|
||||||
|
snapshot!(code, @"201 Created");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]" }), @r#"
|
||||||
|
{
|
||||||
|
"uuid": "[uuid]",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": {}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
let uuid = value.get("uuid").unwrap().as_str().unwrap();
|
||||||
|
let (value, code) =
|
||||||
|
server.patch_webhook(&uuid, json!({ "headers": { "authorization": "TOKEN" } })).await;
|
||||||
|
snapshot!(code, @"200 OK");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]" }), @r#"
|
||||||
|
{
|
||||||
|
"uuid": "[uuid]",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": {
|
||||||
|
"authorization": "TOKEN"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
let (value, code) =
|
||||||
|
server.patch_webhook(&uuid, json!({ "headers": { "authorization2": "TOKEN" } })).await;
|
||||||
|
snapshot!(code, @"200 OK");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]" }), @r#"
|
||||||
|
{
|
||||||
|
"uuid": "[uuid]",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": {
|
||||||
|
"authorization": "TOKEN",
|
||||||
|
"authorization2": "TOKEN"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
let (value, code) =
|
||||||
|
server.patch_webhook(&uuid, json!({ "headers": { "authorization": null } })).await;
|
||||||
|
snapshot!(code, @"200 OK");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]" }), @r#"
|
||||||
|
{
|
||||||
|
"uuid": "[uuid]",
|
||||||
|
"isEditable": true,
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": {
|
||||||
|
"authorization2": "TOKEN"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
let (value, code) = server.patch_webhook(&uuid, json!({ "url": null })).await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]" }), @r#"
|
||||||
|
{
|
||||||
|
"message": "The URL for the webhook `[uuid]` is missing.",
|
||||||
|
"code": "invalid_webhook_url",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_url"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn invalid_url_and_headers() {
|
||||||
|
let server = Server::new().await;
|
||||||
|
|
||||||
|
// Test invalid URL format
|
||||||
|
let (value, code) = server.create_webhook(json!({ "url": "not-a-valid-url" })).await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Invalid URL `not-a-valid-url`: relative URL without a base",
|
||||||
|
"code": "invalid_webhook_url",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_url"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
// Test invalid header name (containing spaces)
|
||||||
|
let (value, code) = server
|
||||||
|
.create_webhook(json!({
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": { "invalid header name": "value" }
|
||||||
|
}))
|
||||||
|
.await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Invalid header name `invalid header name`: invalid HTTP header name",
|
||||||
|
"code": "invalid_webhook_headers",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_headers"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
// Test invalid header value (containing control characters)
|
||||||
|
let (value, code) = server
|
||||||
|
.create_webhook(json!({
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"headers": { "authorization": "token\nwith\nnewlines" }
|
||||||
|
}))
|
||||||
|
.await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Invalid header value `authorization`: failed to parse header value",
|
||||||
|
"code": "invalid_webhook_headers",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_headers"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn invalid_uuid() {
|
||||||
|
let server = Server::new().await;
|
||||||
|
|
||||||
|
// Test get webhook with invalid UUID
|
||||||
|
let (value, code) = server.get_webhook("invalid-uuid").await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Invalid UUID: invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `i` at 1",
|
||||||
|
"code": "invalid_webhook_uuid",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_uuid"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
// Test update webhook with invalid UUID
|
||||||
|
let (value, code) =
|
||||||
|
server.patch_webhook("invalid-uuid", json!({ "url": "https://example.com/hook" })).await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Invalid UUID: invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `i` at 1",
|
||||||
|
"code": "invalid_webhook_uuid",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_uuid"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
// Test delete webhook with invalid UUID
|
||||||
|
let (value, code) = server.delete_webhook("invalid-uuid").await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Invalid UUID: invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `i` at 1",
|
||||||
|
"code": "invalid_webhook_uuid",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#invalid_webhook_uuid"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn forbidden_fields() {
|
||||||
|
let server = Server::new().await;
|
||||||
|
|
||||||
|
// Test creating webhook with uuid field
|
||||||
|
let custom_uuid = Uuid::new_v4();
|
||||||
|
let (value, code) = server
|
||||||
|
.create_webhook(json!({
|
||||||
|
"url": "https://example.com/hook",
|
||||||
|
"uuid": custom_uuid.to_string(),
|
||||||
|
"headers": { "authorization": "TOKEN" }
|
||||||
|
}))
|
||||||
|
.await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Immutable field `uuid`: expected one of `url`, `headers`",
|
||||||
|
"code": "immutable_webhook_uuid",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#immutable_webhook_uuid"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
// Test creating webhook with isEditable field
|
||||||
|
let (value, code) = server
|
||||||
|
.create_webhook(json!({
|
||||||
|
"url": "https://example.com/hook2",
|
||||||
|
"isEditable": false,
|
||||||
|
"headers": { "authorization": "TOKEN" }
|
||||||
|
}))
|
||||||
|
.await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Immutable field `isEditable`: expected one of `url`, `headers`",
|
||||||
|
"code": "immutable_webhook_is_editable",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#immutable_webhook_is_editable"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
// Test patching webhook with uuid field
|
||||||
|
let (value, code) = server
|
||||||
|
.patch_webhook(
|
||||||
|
"uuid-whatever",
|
||||||
|
json!({
|
||||||
|
"uuid": Uuid::new_v4(),
|
||||||
|
"headers": { "new-header": "value" }
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(value, @r#"
|
||||||
|
{
|
||||||
|
"message": "Immutable field `uuid`: expected one of `url`, `headers`",
|
||||||
|
"code": "immutable_webhook_uuid",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#immutable_webhook_uuid"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
|
||||||
|
// Test patching webhook with isEditable field
|
||||||
|
let (value, code) = server
|
||||||
|
.patch_webhook(
|
||||||
|
"uuid-whatever",
|
||||||
|
json!({
|
||||||
|
"isEditable": false,
|
||||||
|
"headers": { "another-header": "value" }
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
snapshot!(code, @"400 Bad Request");
|
||||||
|
snapshot!(json_string!(value, { ".uuid" => "[uuid]" }), @r#"
|
||||||
|
{
|
||||||
|
"message": "Immutable field `isEditable`: expected one of `url`, `headers`",
|
||||||
|
"code": "immutable_webhook_is_editable",
|
||||||
|
"type": "invalid_request",
|
||||||
|
"link": "https://docs.meilisearch.com/errors#immutable_webhook_is_editable"
|
||||||
|
}
|
||||||
|
"#);
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user