mirror of
https://github.com/meilisearch/MeiliSearch
synced 2025-07-04 20:37:15 +02:00
Merge #2414
2414: Improve index uid validation upon API key creation r=Kerollmops a=pierre-l - ~Use an IndexUid newtype to enforce stronger constraints~ - ~`cargo update -p vergen`~ (`rustup update` was the proper fix for this) - Add a new `meilisearch_types` crate - Move `meilisearch_error` to `meilisearch_types::error` - Move `meilisearch_lib::index_resolver::IndexUid` to `meilisearch_types::index_uid` - Add a new `InvalidIndexUid` error in `meilisearch_types::index_uid` - Move `meilisearch_http::routes::StarOr` to `meilisearch_types::star_or` - Use the `IndexUid` and `StarOr` in `meilisearch_auth::Key` Fixes #2158 Co-authored-by: pierre-l <pierre.larger@gmail.com>
This commit is contained in:
commit
de356061db
51 changed files with 362 additions and 193 deletions
|
@ -1,4 +1,5 @@
|
|||
use meilisearch_error::{internal_error, Code, ErrorCode};
|
||||
use meilisearch_types::error::{Code, ErrorCode};
|
||||
use meilisearch_types::internal_error;
|
||||
use tokio::task::JoinError;
|
||||
|
||||
use crate::update_file_store::UpdateFileStoreError;
|
||||
|
|
|
@ -55,9 +55,9 @@ mod test {
|
|||
task::{Task, TaskContent},
|
||||
};
|
||||
use crate::update_file_store::{Result as FileStoreResult, UpdateFileStore};
|
||||
use crate::IndexUid;
|
||||
|
||||
use super::*;
|
||||
use meilisearch_types::index_uid::IndexUid;
|
||||
use milli::update::IndexDocumentsMethod;
|
||||
use nelson::Mocker;
|
||||
use proptest::prelude::*;
|
||||
|
|
|
@ -534,10 +534,11 @@ fn make_batch(tasks: &mut TaskQueue, config: &SchedulerConfig) -> Processing {
|
|||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use meilisearch_types::index_uid::IndexUid;
|
||||
use milli::update::IndexDocumentsMethod;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{index_resolver::IndexUid, tasks::task::TaskContent};
|
||||
use crate::tasks::task::TaskContent;
|
||||
|
||||
use super::*;
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
use meilisearch_error::ResponseError;
|
||||
use meilisearch_types::error::ResponseError;
|
||||
use meilisearch_types::index_uid::IndexUid;
|
||||
use milli::update::{DocumentAdditionResult, IndexDocumentsMethod};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use time::OffsetDateTime;
|
||||
|
@ -6,7 +7,6 @@ use uuid::Uuid;
|
|||
|
||||
use super::batch::BatchId;
|
||||
use crate::index::{Settings, Unchecked};
|
||||
use crate::index_resolver::IndexUid;
|
||||
|
||||
pub type TaskId = u32;
|
||||
|
||||
|
|
|
@ -267,13 +267,11 @@ impl TaskStore {
|
|||
|
||||
#[cfg(test)]
|
||||
pub mod test {
|
||||
use crate::{
|
||||
tasks::{scheduler::Processing, task_store::store::test::tmp_env},
|
||||
IndexUid,
|
||||
};
|
||||
use crate::tasks::{scheduler::Processing, task_store::store::test::tmp_env};
|
||||
|
||||
use super::*;
|
||||
|
||||
use meilisearch_types::index_uid::IndexUid;
|
||||
use nelson::Mocker;
|
||||
use proptest::{
|
||||
strategy::Strategy,
|
||||
|
|
|
@ -179,11 +179,11 @@ impl Store {
|
|||
#[cfg(test)]
|
||||
pub mod test {
|
||||
use itertools::Itertools;
|
||||
use meilisearch_types::index_uid::IndexUid;
|
||||
use milli::heed::EnvOpenOptions;
|
||||
use nelson::Mocker;
|
||||
use tempfile::TempDir;
|
||||
|
||||
use crate::index_resolver::IndexUid;
|
||||
use crate::tasks::task::TaskContent;
|
||||
|
||||
use super::*;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue