Merge #3112

3112: Rename meilisearch-http r=Kerollmops a=colbsmcdolbs

# Pull Request

## Related issue
Fixes #3073 

## What does this PR do?
- Renames all references of `meilisearch-http` to `meilisearch`
- Might need to be rebased before the 1.0.0 release

## PR checklist
Please check if your PR fulfills the following requirements:
- [X] Does this PR fix an existing issue, or have you listed the changes applied in the PR description (and why they are needed)?
- [X] Have you read the contributing guidelines?
- [X] Have you made sure that the title is accurate and descriptive of the changes?

Thank you so much for contributing to Meilisearch!


Co-authored-by: Colby Allen <colbyjayallen@gmail.com>

.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:

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"

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-    "meilisearch-http",
+    "meilisearch",
     "meilisearch-types",
     "meilisearch-auth",
     "meili-snap",

meilisearch/Cargo.toml

@@ -3,12 +3,8 @@ authors = ["Quentin de Quelen <quentin@dequelen.me>", "Clément Renault <clement
 description = "Meilisearch HTTP server"
 edition = "2021"
 license = "MIT"
-name = "meilisearch-http"
-version = "1.0.0"
-
-[[bin]]
 name = "meilisearch"
-path = "src/main.rs"
+version = "0.30.1"
 
 [dependencies]
 actix-cors = "0.6.3"

meilisearch/src/main.rs

@@ -6,9 +6,9 @@ use actix_web::http::KeepAlive;
 use actix_web::web::Data;
 use actix_web::HttpServer;
 use index_scheduler::IndexScheduler;
+use meilisearch::analytics::Analytics;
+use meilisearch::{analytics, create_app, setup_meilisearch, Opt};
 use meilisearch_auth::AuthController;
-use meilisearch_http::analytics::Analytics;
-use meilisearch_http::{analytics, create_app, setup_meilisearch, Opt};
 
 #[global_allocator]
 static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;

meilisearch/src/option.rs

@@ -734,7 +734,7 @@ mod test {
     #[ignore]
     fn test_meilli_config_file_path_valid() {
         temp_env::with_vars(
-            vec![("MEILI_CONFIG_FILE_PATH", Some("../config.toml"))], // Relative path in meilisearch_http package
+            vec![("MEILI_CONFIG_FILE_PATH", Some("../config.toml"))], // Relative path in meilisearch package
             || {
                 assert!(Opt::try_build().is_ok());
             },

meilisearch/tests/common/mod.rs

@@ -10,9 +10,9 @@ pub use server::{default_settings, Server};
 #[macro_export]
 macro_rules! test_post_get_search {
     ($server:expr, $query:expr, |$response:ident, $status_code:ident | $block:expr) => {
-        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)

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;

meilisearch/tests/common/service.rs

@@ -5,8 +5,8 @@ use actix_web::http::StatusCode;
 use actix_web::test;
 use actix_web::test::TestRequest;
 use index_scheduler::IndexScheduler;
+use meilisearch::{analytics, create_app, Opt};
 use meilisearch_auth::AuthController;
-use meilisearch_http::{analytics, create_app, Opt};
 use serde_json::Value;
 
 use crate::common::encoder::Encoder;

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;

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;