diff --git a/.github/workflows/publish-deb-brew-pkg.yml b/.github/workflows/publish-deb-brew-pkg.yml index 79da1e4e4..1f84b84c5 100644 --- a/.github/workflows/publish-deb-brew-pkg.yml +++ b/.github/workflows/publish-deb-brew-pkg.yml @@ -25,7 +25,7 @@ jobs: run: cargo install cargo-deb - uses: actions/checkout@v3 - name: Build deb package - run: cargo deb -p meilisearch-http -o target/debian/meilisearch.deb + run: cargo deb -p meilisearch -o target/debian/meilisearch.deb - name: Upload debian pkg to release uses: svenstaro/upload-release-action@2.3.0 with: diff --git a/Cargo.lock b/Cargo.lock index e0a864200..f824f785c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2266,25 +2266,8 @@ dependencies = [ ] [[package]] -name = "meilisearch-auth" -version = "1.0.0" -dependencies = [ - "enum-iterator", - "hmac", - "meilisearch-types", - "rand", - "roaring", - "serde", - "serde_json", - "sha2", - "thiserror", - "time", - "uuid 1.2.1", -] - -[[package]] -name = "meilisearch-http" -version = "1.0.0" +name = "meilisearch" +version = "0.30.1" dependencies = [ "actix-cors", "actix-http", @@ -2365,6 +2348,23 @@ dependencies = [ "zip", ] +[[package]] +name = "meilisearch-auth" +version = "1.0.0" +dependencies = [ + "enum-iterator", + "hmac", + "meilisearch-types", + "rand", + "roaring", + "serde", + "serde_json", + "sha2", + "thiserror", + "time", + "uuid 1.2.1", +] + [[package]] name = "meilisearch-types" version = "1.0.0" diff --git a/Cargo.toml b/Cargo.toml index 2b756f87c..b3be0075a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "meilisearch-http", + "meilisearch", "meilisearch-types", "meilisearch-auth", "meili-snap", diff --git a/meilisearch-http/Cargo.toml b/meilisearch/Cargo.toml similarity index 98% rename from meilisearch-http/Cargo.toml rename to meilisearch/Cargo.toml index f8370cae5..b3d40b35c 100644 --- a/meilisearch-http/Cargo.toml +++ b/meilisearch/Cargo.toml @@ -3,12 +3,8 @@ authors = ["Quentin de Quelen ", "Clément Renault { - let post_query: meilisearch_http::routes::search::SearchQueryPost = + let post_query: meilisearch::routes::search::SearchQueryPost = serde_json::from_str(&$query.clone().to_string()).unwrap(); - let get_query: meilisearch_http::routes::search::SearchQuery = post_query.into(); + let get_query: meilisearch::routes::search::SearchQuery = post_query.into(); let get_query = ::serde_url_params::to_string(&get_query).unwrap(); let ($response, $status_code) = $server.search_get(&get_query).await; let _ = ::std::panic::catch_unwind(|| $block) diff --git a/meilisearch-http/tests/common/server.rs b/meilisearch/tests/common/server.rs similarity index 98% rename from meilisearch-http/tests/common/server.rs rename to meilisearch/tests/common/server.rs index f96c659a4..c3c9b7c60 100644 --- a/meilisearch-http/tests/common/server.rs +++ b/meilisearch/tests/common/server.rs @@ -8,8 +8,8 @@ use actix_web::dev::ServiceResponse; use actix_web::http::StatusCode; use byte_unit::{Byte, ByteUnit}; use clap::Parser; -use meilisearch_http::option::{IndexerOpts, MaxMemory, Opt}; -use meilisearch_http::{analytics, create_app, setup_meilisearch}; +use meilisearch::option::{IndexerOpts, MaxMemory, Opt}; +use meilisearch::{analytics, create_app, setup_meilisearch}; use once_cell::sync::Lazy; use serde_json::{json, Value}; use tempfile::TempDir; diff --git a/meilisearch-http/tests/common/service.rs b/meilisearch/tests/common/service.rs similarity index 98% rename from meilisearch-http/tests/common/service.rs rename to meilisearch/tests/common/service.rs index 945ff4c13..f7c9b8294 100644 --- a/meilisearch-http/tests/common/service.rs +++ b/meilisearch/tests/common/service.rs @@ -6,7 +6,7 @@ use actix_web::test; use actix_web::test::TestRequest; use index_scheduler::IndexScheduler; use meilisearch_auth::AuthController; -use meilisearch_http::{analytics, create_app, Opt}; +use meilisearch::{analytics, create_app, Opt}; use serde_json::Value; use crate::common::encoder::Encoder; diff --git a/meilisearch-http/tests/content_type.rs b/meilisearch/tests/content_type.rs similarity index 100% rename from meilisearch-http/tests/content_type.rs rename to meilisearch/tests/content_type.rs diff --git a/meilisearch-http/tests/dashboard/mod.rs b/meilisearch/tests/dashboard/mod.rs similarity index 100% rename from meilisearch-http/tests/dashboard/mod.rs rename to meilisearch/tests/dashboard/mod.rs diff --git a/meilisearch-http/tests/documents/add_documents.rs b/meilisearch/tests/documents/add_documents.rs similarity index 100% rename from meilisearch-http/tests/documents/add_documents.rs rename to meilisearch/tests/documents/add_documents.rs diff --git a/meilisearch-http/tests/documents/delete_documents.rs b/meilisearch/tests/documents/delete_documents.rs similarity index 100% rename from meilisearch-http/tests/documents/delete_documents.rs rename to meilisearch/tests/documents/delete_documents.rs diff --git a/meilisearch-http/tests/documents/get_documents.rs b/meilisearch/tests/documents/get_documents.rs similarity index 100% rename from meilisearch-http/tests/documents/get_documents.rs rename to meilisearch/tests/documents/get_documents.rs diff --git a/meilisearch-http/tests/documents/mod.rs b/meilisearch/tests/documents/mod.rs similarity index 100% rename from meilisearch-http/tests/documents/mod.rs rename to meilisearch/tests/documents/mod.rs diff --git a/meilisearch-http/tests/documents/update_documents.rs b/meilisearch/tests/documents/update_documents.rs similarity index 100% rename from meilisearch-http/tests/documents/update_documents.rs rename to meilisearch/tests/documents/update_documents.rs diff --git a/meilisearch-http/tests/dumps/data.rs b/meilisearch/tests/dumps/data.rs similarity index 100% rename from meilisearch-http/tests/dumps/data.rs rename to meilisearch/tests/dumps/data.rs diff --git a/meilisearch-http/tests/dumps/mod.rs b/meilisearch/tests/dumps/mod.rs similarity index 99% rename from meilisearch-http/tests/dumps/mod.rs rename to meilisearch/tests/dumps/mod.rs index 10098c60f..0759454e8 100644 --- a/meilisearch-http/tests/dumps/mod.rs +++ b/meilisearch/tests/dumps/mod.rs @@ -1,6 +1,6 @@ mod data; -use meilisearch_http::Opt; +use meilisearch::Opt; use serde_json::json; use self::data::GetDump; diff --git a/meilisearch-http/tests/index/create_index.rs b/meilisearch/tests/index/create_index.rs similarity index 100% rename from meilisearch-http/tests/index/create_index.rs rename to meilisearch/tests/index/create_index.rs diff --git a/meilisearch-http/tests/index/delete_index.rs b/meilisearch/tests/index/delete_index.rs similarity index 100% rename from meilisearch-http/tests/index/delete_index.rs rename to meilisearch/tests/index/delete_index.rs diff --git a/meilisearch-http/tests/index/get_index.rs b/meilisearch/tests/index/get_index.rs similarity index 100% rename from meilisearch-http/tests/index/get_index.rs rename to meilisearch/tests/index/get_index.rs diff --git a/meilisearch-http/tests/index/mod.rs b/meilisearch/tests/index/mod.rs similarity index 100% rename from meilisearch-http/tests/index/mod.rs rename to meilisearch/tests/index/mod.rs diff --git a/meilisearch-http/tests/index/stats.rs b/meilisearch/tests/index/stats.rs similarity index 100% rename from meilisearch-http/tests/index/stats.rs rename to meilisearch/tests/index/stats.rs diff --git a/meilisearch-http/tests/index/update_index.rs b/meilisearch/tests/index/update_index.rs similarity index 100% rename from meilisearch-http/tests/index/update_index.rs rename to meilisearch/tests/index/update_index.rs diff --git a/meilisearch-http/tests/integration.rs b/meilisearch/tests/integration.rs similarity index 100% rename from meilisearch-http/tests/integration.rs rename to meilisearch/tests/integration.rs diff --git a/meilisearch-http/tests/search/errors.rs b/meilisearch/tests/search/errors.rs similarity index 100% rename from meilisearch-http/tests/search/errors.rs rename to meilisearch/tests/search/errors.rs diff --git a/meilisearch-http/tests/search/formatted.rs b/meilisearch/tests/search/formatted.rs similarity index 100% rename from meilisearch-http/tests/search/formatted.rs rename to meilisearch/tests/search/formatted.rs diff --git a/meilisearch-http/tests/search/mod.rs b/meilisearch/tests/search/mod.rs similarity index 100% rename from meilisearch-http/tests/search/mod.rs rename to meilisearch/tests/search/mod.rs diff --git a/meilisearch-http/tests/search/pagination.rs b/meilisearch/tests/search/pagination.rs similarity index 100% rename from meilisearch-http/tests/search/pagination.rs rename to meilisearch/tests/search/pagination.rs diff --git a/meilisearch-http/tests/settings/distinct.rs b/meilisearch/tests/settings/distinct.rs similarity index 100% rename from meilisearch-http/tests/settings/distinct.rs rename to meilisearch/tests/settings/distinct.rs diff --git a/meilisearch-http/tests/settings/get_settings.rs b/meilisearch/tests/settings/get_settings.rs similarity index 100% rename from meilisearch-http/tests/settings/get_settings.rs rename to meilisearch/tests/settings/get_settings.rs diff --git a/meilisearch-http/tests/settings/mod.rs b/meilisearch/tests/settings/mod.rs similarity index 100% rename from meilisearch-http/tests/settings/mod.rs rename to meilisearch/tests/settings/mod.rs diff --git a/meilisearch-http/tests/snapshot/mod.rs b/meilisearch/tests/snapshot/mod.rs similarity index 98% rename from meilisearch-http/tests/snapshot/mod.rs rename to meilisearch/tests/snapshot/mod.rs index 1c2e33534..eba260722 100644 --- a/meilisearch-http/tests/snapshot/mod.rs +++ b/meilisearch/tests/snapshot/mod.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use meilisearch_http::Opt; +use meilisearch::Opt; use tokio::time::sleep; use crate::common::server::default_settings; diff --git a/meilisearch-http/tests/stats/mod.rs b/meilisearch/tests/stats/mod.rs similarity index 100% rename from meilisearch-http/tests/stats/mod.rs rename to meilisearch/tests/stats/mod.rs diff --git a/meilisearch-http/tests/tasks/mod.rs b/meilisearch/tests/tasks/mod.rs similarity index 100% rename from meilisearch-http/tests/tasks/mod.rs rename to meilisearch/tests/tasks/mod.rs