Fix analytics

3456: Bump tokio from 1.24.1 to 1.24.2 r=curquiza a=dependabot[bot]

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.24.1 to 1.24.2.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/tokio-rs/tokio/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio&package-manager=cargo&previous-version=1.24.1&new-version=1.24.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/meilisearch/meilisearch/network/alerts).

</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/uffizzi/Dockerfile

@@ -7,7 +7,8 @@ WORKDIR /meilisearch
 
 ARG     COMMIT_SHA
 ARG     COMMIT_DATE
-ENV     COMMIT_SHA=${COMMIT_SHA} COMMIT_DATE=${COMMIT_DATE}
+ARG     GIT_TAG
+ENV     COMMIT_SHA=${COMMIT_SHA} COMMIT_DATE=${COMMIT_DATE} VERGEN_GIT_SEMVER_LIGHTWEIGHT=${GIT_TAG}
 ENV     RUSTFLAGS="-C target-feature=-crt-static"
 
 COPY    . .

.github/workflows/publish-docker-images.yml

@@ -92,6 +92,7 @@ jobs:
           build-args: |
             COMMIT_SHA=${{ github.sha }}
             COMMIT_DATE=${{ steps.build-metadata.outputs.date }}
+            GIT_TAG=$(printf "%q" ${{ github.ref_name }})
 
       # /!\ Don't touch this without checking with Cloud team
       - name: Send CI information to Cloud team

CONTRIBUTING.md

@@ -121,15 +121,19 @@ The full Meilisearch release process is described in [this guide](https://github
 Depending on the developed feature, you might need to provide a prototyped version of Meilisearch to make it easier to test by the users.
 
 The prototype name must follow this convention: `prototype-X-Y` where
-- `X` is the feature name formatted in `kebab-case`
+- `X` is the feature name formatted in `kebab-case`. It should not end with a single number.
 - `Y` is the version of the prototype, starting from `0`.
 
-Example: `prototype-auto-resize-0`.
+✅ Example: `prototype-auto-resize-0`. </br>
+❌ Bad example: `auto-resize-0`: lacks the `prototype` prefix. </br>
+❌ Bad example: `prototype-auto-resize`: lacks the version suffix. </br>
+❌ Bad example: `prototype-auto-resize-0-0`: feature name ends with a single number.
 
 Steps to create a prototype:
 
 1. In your terminal, go to the last commit of your branch (the one you want to provide as a prototype).
 2. Create a tag following the convention: `git tag prototype-X-Y`
+3. Run Meilisearch and check that its launch summary features a line: `Prototype: prototype-X-Y` (you may need to switch branches and back after tagging for this to work).
 3. Push the tag: `git push origin prototype-X-Y`
 4. Check the [Docker CI](https://github.com/meilisearch/meilisearch/actions/workflows/publish-docker-images.yml) is now running.
 
@@ -138,7 +142,7 @@ More information about [how to run Meilisearch with Docker](https://docs.meilise
 
 ⚙️ However, no binaries will be created. If the users do not use Docker, they can go to the `prototype-X-Y` tag in the Meilisearch repository and compile from the source code.
 
-⚠️ When sharing a prototype with users, prevent them from using it in production. Prototypes are only for test purposes.
+⚠️ When sharing a prototype with users, remind them to not use it in production. Prototypes are solely for test purposes.
 
 ### Release assets
 

Cargo.lock

@@ -3867,9 +3867,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.24.1"
+version = "1.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
+checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
 dependencies = [
  "autocfg",
  "bytes",

Dockerfile

@@ -7,7 +7,8 @@ WORKDIR /meilisearch
 
 ARG     COMMIT_SHA
 ARG     COMMIT_DATE
-ENV     VERGEN_GIT_SHA=${COMMIT_SHA} VERGEN_GIT_COMMIT_TIMESTAMP=${COMMIT_DATE}
+ARG     GIT_TAG
+ENV     VERGEN_GIT_SHA=${COMMIT_SHA} VERGEN_GIT_COMMIT_TIMESTAMP=${COMMIT_DATE} VERGEN_GIT_SEMVER_LIGHTWEIGHT=${GIT_TAG}
 ENV     RUSTFLAGS="-C target-feature=-crt-static"
 
 COPY    . .

meilisearch-types/Cargo.toml

@@ -25,7 +25,7 @@ tar = "0.4.38"
 tempfile = "3.3.0"
 thiserror = "1.0.30"
 time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] }
-tokio = "1.0"
+tokio = "1.24"
 uuid = { version = "1.1.2", features = ["serde", "v4"] }
 
 [dev-dependencies]

meilisearch/Cargo.toml

@@ -65,7 +65,7 @@ tar = "0.4.38"
 tempfile = "3.3.0"
 thiserror = "1.0.37"
 time = { version = "0.3.15", features = ["serde-well-known", "formatting", "parsing", "macros"] }
-tokio = { version = "1.21.2", features = ["full"] }
+tokio = { version = "1.24.2", features = ["full"] }
 tokio-stream = "0.1.10"
 toml = "0.5.9"
 uuid = { version = "1.1.2", features = ["serde", "v4"] }

meilisearch/build.rs

@@ -1,11 +1,12 @@
 use vergen::{vergen, Config, SemverKind};
 
 fn main() {
+    // Note: any code that needs VERGEN_ environment variables should take care to define them manually in the Dockerfile and pass them
+    // in the corresponding GitHub workflow (publish_docker.yml).
+    // This is due to the Dockerfile building the binary outside of the git directory.
     let mut config = Config::default();
     // allow using non-annotated tags
     *config.git_mut().semver_kind_mut() = SemverKind::Lightweight;
-    // add -dirty suffix when we're not right on the tag
-    *config.git_mut().semver_dirty_mut() = Some("-dirty");
 
     if let Err(e) = vergen(config) {
         println!("cargo:warning=vergen: {}", e);

meilisearch/src/analytics/segment_analytics.rs

@@ -755,7 +755,8 @@ impl MultiSearchAggregator {
 
         let user_agents = extract_user_agents(request).into_iter().collect();
 
-        let distinct_indexes: HashSet<_> = query.iter().map(|query| &query.index_uid).collect();
+        let distinct_indexes: HashSet<_> =
+            query.iter().map(|query| query.index_uid.as_str()).collect();
 
         Self {
             timestamp,

meilisearch/src/lib.rs

@@ -435,18 +435,13 @@ pub fn configure_metrics_route(config: &mut web::ServiceConfig, enable_metrics_r
 /// Returns `Some(prototype_name)` if the following conditions are met on this value:
 ///
 /// 1. starts with `prototype-`,
-/// 2. does not end with `dirty-`,
-/// 3. ends with `-<some_number>`,
-/// 4. does not end with `<some_number>-<some_number>`.
+/// 2. ends with `-<some_number>`,
+/// 3. does not end with `<some_number>-<some_number>`.
 ///
 /// Otherwise, returns `None`.
 pub fn prototype_name() -> Option<&'static str> {
     let prototype: &'static str = option_env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT")?;
 
-    if prototype.ends_with("-dirty") {
-        return None;
-    }
-
     if !prototype.starts_with("prototype-") {
         return None;
     }

meilisearch/src/routes/multi_search.rs

@@ -5,6 +5,7 @@ use log::debug;
 use meilisearch_types::deserr::DeserrJsonError;
 use meilisearch_types::error::ResponseError;
 use meilisearch_types::keys::actions;
+use serde::Serialize;
 
 use crate::analytics::{Analytics, MultiSearchAggregator};
 use crate::extractors::authentication::policies::ActionPolicy;
@@ -19,13 +20,24 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
     cfg.service(web::resource("").route(web::post().to(SeqHandler(search_with_post))));
 }
 
+#[derive(Serialize)]
+struct SearchResults {
+    results: Vec<SearchResultWithIndex>,
+}
+
+#[derive(Debug, deserr::DeserializeFromValue)]
+#[deserr(error = DeserrJsonError, rename_all = camelCase, deny_unknown_fields)]
+pub struct SearchQueries {
+    queries: Vec<SearchQueryWithIndex>,
+}
+
 pub async fn search_with_post(
     index_scheduler: GuardedData<ActionPolicy<{ actions::SEARCH }>, Data<IndexScheduler>>,
-    params: ValidatedJson<Vec<SearchQueryWithIndex>, DeserrJsonError>,
+    params: ValidatedJson<SearchQueries, DeserrJsonError>,
     req: HttpRequest,
     analytics: web::Data<dyn Analytics>,
 ) -> Result<HttpResponse, ResponseError> {
-    let queries = params.into_inner();
+    let queries = params.into_inner().queries;
 
     let mut multi_aggregate = MultiSearchAggregator::from_queries(&queries, &req);
 
@@ -48,7 +60,10 @@ pub async fn search_with_post(
                 let search_result =
                     tokio::task::spawn_blocking(move || perform_search(&index, query)).await?;
 
-                search_results.push(SearchResultWithIndex { index_uid, result: search_result? });
+                search_results.push(SearchResultWithIndex {
+                    index_uid: index_uid.into_inner(),
+                    result: search_result?,
+                });
             }
             Ok(search_results)
         }
@@ -64,5 +79,5 @@ pub async fn search_with_post(
 
     debug!("returns: {:?}", search_results);
 
-    Ok(HttpResponse::Ok().json(search_results))
+    Ok(HttpResponse::Ok().json(SearchResults { results: search_results }))
 }

meilisearch/src/search.rs

@@ -8,6 +8,7 @@ use either::Either;
 use meilisearch_auth::IndexSearchRules;
 use meilisearch_types::deserr::DeserrJsonError;
 use meilisearch_types::error::deserr_codes::*;
+use meilisearch_types::index_uid::IndexUid;
 use meilisearch_types::settings::DEFAULT_PAGINATION_MAX_TOTAL_HITS;
 use meilisearch_types::{milli, Document};
 use milli::tokenizer::TokenizerBuilder;
@@ -82,7 +83,8 @@ impl SearchQuery {
 #[derive(Debug, deserr::DeserializeFromValue)]
 #[deserr(error = DeserrJsonError, rename_all = camelCase, deny_unknown_fields)]
 pub struct SearchQueryWithIndex {
-    pub index_uid: String,
+    #[deserr(error = DeserrJsonError<InvalidIndexUid>, missing_field_error = DeserrJsonError::missing_index_uid)]
+    pub index_uid: IndexUid,
     #[deserr(default, error = DeserrJsonError<InvalidSearchQ>)]
     pub q: Option<String>,
     #[deserr(default = DEFAULT_SEARCH_OFFSET(), error = DeserrJsonError<InvalidSearchOffset>)]
@@ -120,7 +122,7 @@ pub struct SearchQueryWithIndex {
 }
 
 impl SearchQueryWithIndex {
-    pub fn into_index_query(self) -> (String, SearchQuery) {
+    pub fn into_index_query(self) -> (IndexUid, SearchQuery) {
         let SearchQueryWithIndex {
             index_uid,
             q,

meilisearch/tests/search/multi.rs

@@ -8,9 +8,13 @@ use crate::common::Server;
 async fn search_empty_list() {
     let server = Server::new().await;
 
-    let (response, code) = server.search(json!([])).await;
+    let (response, code) = server.search(json!({"queries": []})).await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(response), @"[]");
+    snapshot!(json_string!(response), @r###"
+    {
+      "results": []
+    }
+    "###);
 }
 
 #[actix_rt::test]
@@ -21,7 +25,23 @@ async fn search_json_object() {
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r###"
     {
-      "message": "Invalid value type: expected an array, but found an object: `{}`",
+      "message": "Missing field `queries`",
+      "code": "bad_request",
+      "type": "invalid_request",
+      "link": "https://docs.meilisearch.com/errors#bad_request"
+    }
+    "###);
+}
+
+#[actix_rt::test]
+async fn search_json_array() {
+    let server = Server::new().await;
+
+    let (response, code) = server.search(json!([])).await;
+    snapshot!(code, @"400 Bad Request");
+    snapshot!(json_string!(response), @r###"
+    {
+      "message": "Invalid value type: expected an object, but found an array: `[]`",
       "code": "bad_request",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#bad_request"
@@ -39,13 +59,13 @@ async fn simple_search_single_index() {
     index.wait_task(0).await;
 
     let (response, code) = server
-        .search(json!([
+        .search(json!({"queries": [
         {"indexUid" : "test", "q": "glass"},
         {"indexUid": "test", "q": "captain"},
-        ]))
+        ]}))
         .await;
     snapshot!(code, @"200 OK");
-    insta::assert_json_snapshot!(response, { "[].processingTimeMs" => "[time]" }, @r###"
+    insta::assert_json_snapshot!(response["results"], { "[].processingTimeMs" => "[time]" }, @r###"
     [
       {
         "indexUid": "test",
@@ -79,6 +99,56 @@ async fn simple_search_single_index() {
     "###);
 }
 
+#[actix_rt::test]
+async fn simple_search_missing_index_uid() {
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
+    let (response, code) = server
+        .search(json!({"queries": [
+        {"q": "glass"},
+        ]}))
+        .await;
+    snapshot!(code, @"400 Bad Request");
+    insta::assert_json_snapshot!(response, @r###"
+    {
+      "message": "Missing field `indexUid` inside `.queries[0]`",
+      "code": "missing_index_uid",
+      "type": "invalid_request",
+      "link": "https://docs.meilisearch.com/errors#missing_index_uid"
+    }
+    "###);
+}
+
+#[actix_rt::test]
+async fn simple_search_illegal_index_uid() {
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
+    let (response, code) = server
+        .search(json!({"queries": [
+        {"indexUid": "hé", "q": "glass"},
+        ]}))
+        .await;
+    snapshot!(code, @"400 Bad Request");
+    insta::assert_json_snapshot!(response, @r###"
+    {
+      "message": "Invalid value at `.queries[0].indexUid`: `hé` is not a valid index uid. Index uid can be an integer or a string containing only alphanumeric characters, hyphens (-) and underscores (_).",
+      "code": "invalid_index_uid",
+      "type": "invalid_request",
+      "link": "https://docs.meilisearch.com/errors#invalid_index_uid"
+    }
+    "###);
+}
+
 #[actix_rt::test]
 async fn simple_search_two_indexes() {
     let server = Server::new().await;
@@ -94,13 +164,13 @@ async fn simple_search_two_indexes() {
     index.wait_task(1).await;
 
     let (response, code) = server
-        .search(json!([
+        .search(json!({"queries": [
         {"indexUid" : "test", "q": "glass"},
         {"indexUid": "nested", "q": "pesti"},
-        ]))
+        ]}))
         .await;
     snapshot!(code, @"200 OK");
-    insta::assert_json_snapshot!(response, { "[].processingTimeMs" => "[time]" }, @r###"
+    insta::assert_json_snapshot!(response["results"], { "[].processingTimeMs" => "[time]" }, @r###"
     [
       {
         "indexUid": "test",
@@ -171,10 +241,10 @@ async fn search_one_index_doesnt_exist() {
     index.wait_task(0).await;
 
     let (response, code) = server
-        .search(json!([
+        .search(json!({"queries": [
         {"indexUid" : "test", "q": "glass"},
         {"indexUid": "nested", "q": "pesti"},
-        ]))
+        ]}))
         .await;
     snapshot!(code, @"404 Not Found");
     snapshot!(json_string!(response), @r###"
@@ -192,10 +262,10 @@ async fn search_multiple_indexes_dont_exist() {
     let server = Server::new().await;
 
     let (response, code) = server
-        .search(json!([
+        .search(json!({"queries": [
         {"indexUid" : "test", "q": "glass"},
         {"indexUid": "nested", "q": "pesti"},
-        ]))
+        ]}))
         .await;
     snapshot!(code, @"404 Not Found");
     snapshot!(json_string!(response), @r###"
@@ -224,10 +294,10 @@ async fn search_one_query_error() {
     index.wait_task(1).await;
 
     let (response, code) = server
-        .search(json!([
+        .search(json!({"queries": [
         {"indexUid" : "test", "q": "glass", "facets": ["title"]},
         {"indexUid": "nested", "q": "pesti"},
-        ]))
+        ]}))
         .await;
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r###"
@@ -256,10 +326,10 @@ async fn search_multiple_query_errors() {
     index.wait_task(1).await;
 
     let (response, code) = server
-        .search(json!([
+        .search(json!({"queries": [
         {"indexUid" : "test", "q": "glass", "facets": ["title"]},
         {"indexUid": "nested", "q": "pesti", "facets": ["doggos"]},
-        ]))
+        ]}))
         .await;
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r###"