From 13f258513f78e047f975502cb8a8a9abd0422ed5 Mon Sep 17 00:00:00 2001 From: Tamo Date: Wed, 22 Jun 2022 16:44:16 +0200 Subject: [PATCH 1/8] meilisearch-lib was missing a feature in its cargo.toml --- meilisearch-lib/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meilisearch-lib/Cargo.toml b/meilisearch-lib/Cargo.toml index 094c79901..be26663b8 100644 --- a/meilisearch-lib/Cargo.toml +++ b/meilisearch-lib/Cargo.toml @@ -11,7 +11,7 @@ anyhow = { version = "1.0.56", features = ["backtrace"] } async-stream = "0.3.3" async-trait = "0.1.52" atomic_refcell = "0.1.8" -byte-unit = { version = "4.0.14", default-features = false, features = ["std"] } +byte-unit = { version = "4.0.14", default-features = false, features = ["std", "serde"] } bytes = "1.1.0" clap = { version = "3.1.6", features = ["derive", "env"] } crossbeam-channel = "0.5.2" From 9b660e1058eabe31ff1ebde64043f6970afee851 Mon Sep 17 00:00:00 2001 From: Ryan Russell Date: Mon, 27 Jun 2022 17:57:48 -0500 Subject: [PATCH 2/8] chore(routes): correct typo Signed-off-by: Ryan Russell --- meilisearch-http/src/routes/indexes/documents.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meilisearch-http/src/routes/indexes/documents.rs b/meilisearch-http/src/routes/indexes/documents.rs index 2becc6db1..3e3db86b2 100644 --- a/meilisearch-http/src/routes/indexes/documents.rs +++ b/meilisearch-http/src/routes/indexes/documents.rs @@ -46,7 +46,7 @@ fn payload_to_stream(mut payload: Payload) -> impl Stream Result, MeilisearchHttpError> { match req.mime_type() { Ok(Some(mime)) => Ok(Some(mime)), From a626cf4c99100e729da1757dbeaf83b84ef33276 Mon Sep 17 00:00:00 2001 From: Ryan Russell Date: Mon, 27 Jun 2022 17:58:11 -0500 Subject: [PATCH 3/8] chore: test comment readability improvements Signed-off-by: Ryan Russell --- meilisearch-http/tests/documents/add_documents.rs | 2 +- meilisearch-http/tests/search/mod.rs | 2 +- meilisearch-http/tests/tasks/mod.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meilisearch-http/tests/documents/add_documents.rs b/meilisearch-http/tests/documents/add_documents.rs index c3baf0cb0..85b88ca36 100644 --- a/meilisearch-http/tests/documents/add_documents.rs +++ b/meilisearch-http/tests/documents/add_documents.rs @@ -625,7 +625,7 @@ async fn add_documents_no_index_creation() { OffsetDateTime::parse(response["enqueuedAt"].as_str().unwrap(), &Rfc3339).unwrap(); assert!(processed_at > enqueued_at); - // index was created, and primary key was infered. + // index was created, and primary key was inferred. let (response, code) = index.get().await; assert_eq!(code, 200); assert_eq!(response["primaryKey"], "id"); diff --git a/meilisearch-http/tests/search/mod.rs b/meilisearch-http/tests/search/mod.rs index 02cdc751f..5b23f9d34 100644 --- a/meilisearch-http/tests/search/mod.rs +++ b/meilisearch-http/tests/search/mod.rs @@ -1,4 +1,4 @@ -// This modules contains all the test concerning search. Each particular feture of the search +// This modules contains all the test concerning search. Each particular feature of the search // should be tested in its own module to isolate tests and keep the tests readable. mod errors; diff --git a/meilisearch-http/tests/tasks/mod.rs b/meilisearch-http/tests/tasks/mod.rs index 9d0940562..785e0284e 100644 --- a/meilisearch-http/tests/tasks/mod.rs +++ b/meilisearch-http/tests/tasks/mod.rs @@ -39,7 +39,7 @@ async fn get_task_status() { index.wait_task(0).await; let (_response, code) = index.get_task(1).await; assert_eq!(code, 200); - // TODO check resonse format, as per #48 + // TODO check response format, as per #48 } #[actix_rt::test] From 28609c41768eeb17b4b457ab39c6f6c028de8064 Mon Sep 17 00:00:00 2001 From: Ryan Russell Date: Mon, 27 Jun 2022 17:59:33 -0500 Subject: [PATCH 4/8] chore(auth test): Correct `compute_authorized_search` macro Signed-off-by: Ryan Russell --- meilisearch-http/tests/auth/tenant_token.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meilisearch-http/tests/auth/tenant_token.rs b/meilisearch-http/tests/auth/tenant_token.rs index d82e170aa..6e2127aeb 100644 --- a/meilisearch-http/tests/auth/tenant_token.rs +++ b/meilisearch-http/tests/auth/tenant_token.rs @@ -115,7 +115,7 @@ static REFUSED_KEYS: Lazy> = Lazy::new(|| { ] }); -macro_rules! compute_autorized_search { +macro_rules! compute_authorized_search { ($tenant_tokens:expr, $filter:expr, $expected_count:expr) => { let mut server = Server::new_auth().await; server.use_admin_key("MASTER_KEY").await; @@ -251,7 +251,7 @@ async fn search_authorized_simple_token() { }, ]; - compute_autorized_search!(tenant_tokens, {}, 5); + compute_authorized_search!(tenant_tokens, {}, 5); } #[actix_rt::test] @@ -305,7 +305,7 @@ async fn search_authorized_filter_token() { }, ]; - compute_autorized_search!(tenant_tokens, {}, 3); + compute_authorized_search!(tenant_tokens, {}, 3); } #[actix_rt::test] @@ -359,7 +359,7 @@ async fn filter_search_authorized_filter_token() { }, ]; - compute_autorized_search!(tenant_tokens, "color = yellow", 1); + compute_authorized_search!(tenant_tokens, "color = yellow", 1); } #[actix_rt::test] From 19f732e62319ce3bd3dc8024d961629553da1c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine=20Urquizar?= Date: Wed, 29 Jun 2022 11:35:41 +0200 Subject: [PATCH 5/8] Update manifest for dependabot --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2998c8d37..4a711a2c7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,7 @@ updates: directory: "/" schedule: interval: "monthly" + labels: + - 'skip changelog' + - 'dependencies' + rebase-strategy: disabled From 9ea96fa5c1060c6d11b6923584b161f5b6e72a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 17:06:38 +0000 Subject: [PATCH 6/8] Bump docker/login-action from 1 to 2 Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker-images.yml b/.github/workflows/publish-docker-images.yml index be38d4844..fcadb5196 100644 --- a/.github/workflows/publish-docker-images.yml +++ b/.github/workflows/publish-docker-images.yml @@ -22,7 +22,7 @@ jobs: - name: Login to DockerHub if: github.event_name != 'schedule' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} From 6f7a4d95d9c37af2978ad4013df018c15f3a5c0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 17:06:40 +0000 Subject: [PATCH 7/8] Bump Swatinem/rust-cache from 1.3.0 to 1.4.0 Bumps [Swatinem/rust-cache](https://github.com/Swatinem/rust-cache) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/Swatinem/rust-cache/releases) - [Changelog](https://github.com/Swatinem/rust-cache/blob/v1/CHANGELOG.md) - [Commits](https://github.com/Swatinem/rust-cache/compare/v1.3.0...v1.4.0) --- updated-dependencies: - dependency-name: Swatinem/rust-cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/rust.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 71c20fd7a..183365f4f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Cache dependencies - uses: Swatinem/rust-cache@v1.3.0 + uses: Swatinem/rust-cache@v1.4.0 - name: Run cargo check without any default features uses: actions-rs/cargo@v1 with: @@ -49,7 +49,7 @@ jobs: toolchain: stable override: true - name: Cache dependencies - uses: Swatinem/rust-cache@v1.3.0 + uses: Swatinem/rust-cache@v1.4.0 - name: Run tests in debug uses: actions-rs/cargo@v1 with: @@ -68,7 +68,7 @@ jobs: override: true components: clippy - name: Cache dependencies - uses: Swatinem/rust-cache@v1.3.0 + uses: Swatinem/rust-cache@v1.4.0 - name: Run cargo clippy uses: actions-rs/cargo@v1 with: @@ -87,6 +87,6 @@ jobs: override: true components: rustfmt - name: Cache dependencies - uses: Swatinem/rust-cache@v1.3.0 + uses: Swatinem/rust-cache@v1.4.0 - name: Run cargo fmt run: cargo fmt --all -- --check From d1296d03ea31eeaf0124fafe49b1cac4f893f6ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 17:06:44 +0000 Subject: [PATCH 8/8] Bump docker/build-push-action from 2 to 3 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker-images.yml b/.github/workflows/publish-docker-images.yml index be38d4844..625352998 100644 --- a/.github/workflows/publish-docker-images.yml +++ b/.github/workflows/publish-docker-images.yml @@ -56,7 +56,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: # We do not push tags for the cron jobs, this is only for test purposes push: ${{ github.event_name != 'schedule' }}