From ca27bcaac72bfcc08252e9e0fe2207ac442a2ba4 Mon Sep 17 00:00:00 2001
From: Mubelotix <simon@meilisearch.com>
Date: Thu, 31 Jul 2025 11:34:47 +0200
Subject: [PATCH] Update tests

---
 crates/dump/src/reader/mod.rs                 |  16 ++---
 .../dump/tests/assets/v6-with-webhooks.dump   | Bin 1913 -> 1389 bytes
 crates/meilisearch/tests/tasks/webhook.rs     |  58 +++++++++++-------
 3 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/crates/dump/src/reader/mod.rs b/crates/dump/src/reader/mod.rs
index 85e5df432..844aadc99 100644
--- a/crates/dump/src/reader/mod.rs
+++ b/crates/dump/src/reader/mod.rs
@@ -449,7 +449,7 @@ pub(crate) mod test {
         let dump = DumpReader::open(dump).unwrap();
 
         // top level infos
-        insta::assert_snapshot!(dump.date().unwrap(), @"2025-07-31 7:28:28.091553 +00:00:00");
+        insta::assert_snapshot!(dump.date().unwrap(), @"2025-07-31 9:21:30.479544 +00:00:00");
         insta::assert_debug_snapshot!(dump.instance_uid().unwrap(), @r"
         Some(
             cb887dcc-34b3-48d1-addd-9815ae721a81,
@@ -462,23 +462,23 @@ pub(crate) mod test {
         insta::assert_json_snapshot!(webhooks, @r#"
         {
           "webhooks": {
-            "_cli": {
+            "00000000-0000-0000-0000-000000000000": {
               "url": "https://defined-in-dump.com/",
               "headers": {
                 "Authorization": "Bearer defined in dump"
               }
             },
-            "exampleName": {
+            "627ea538-733d-4545-8d2d-03526eb381ce": {
+              "url": "https://example.com/authorization-less",
+              "headers": {}
+            },
+            "771b0a28-ef28-4082-b984-536f82958c65": {
               "url": "https://example.com/hook",
               "headers": {
                 "authorization": "TOKEN"
               }
             },
-            "otherName": {
-              "url": "https://example.com/authorization-less",
-              "headers": {}
-            },
-            "third": {
+            "f3583083-f8a7-4cbf-a5e7-fb3f1e28a7e9": {
               "url": "https://third.com",
               "headers": {}
             }
diff --git a/crates/dump/tests/assets/v6-with-webhooks.dump b/crates/dump/tests/assets/v6-with-webhooks.dump
index 83989f25c4cc882dafeea5c60d917d594867f019..c8f9649d88429ab8c16f3375f94a6c4474d3e79f 100644
GIT binary patch
literal 1389
zcmV-z1(Nz7iwFP!00000|Ls~)Z`(Ey_H%!QrpLl`NQx5WyroGC3<cJqYx~e)C@At+
zYmp^SqR?hW{`-!yoiuinIGydSjXoHbM4e3Pj(5lV%+b+c@1Rsr8OL~}R3?if<zjJM
zV8CK3coO-KZ<hkw;=uvXHcr(+F!;Avy~yhLoggm_e1>MQPdwcIj3zwl?SBAd%IV4f
z(EhQEd;1>%OZy-F)j|uSKbxv72D=8DlO{qu#QqWW$H4*c=;J@Wf2rX^o10OKUxVG_
zUi;&{HT&~eM!o$H0G*|&G+L8LWDyamVMG~Y$T(%O0?C<5*`UV{3-~;PI-f%6R6#5#
z*VfQ<d0?<J+~@xhOV<5g2roZ403Nyj&%-IWI@e8jY*o>~Ff6K%&FiXlaMc1PcW0Gu
z{VZvoUA$;Z?eeO;y00soJ(x&d<b{L!s<{OBsjAPfu0Mi%qnh)pU%J_euBNl9$sIhO
zW?&4|*CWys<xcT-0lwSo_Gw$Vd|DY*ESoL|Jsyaqk#_9yH*s(NN1tEwf0i)W`~Lwj
z4;v_KcwDwcF$`;%Ru0g^=9j%MJqlp-S4KIt&j4_r|1-Yn|B@!X{~rMJ(6rOpJ50A-
zMi1X5;V?AWbpso*WJG-<%AF~nu|rOIOsFIgdqc;^oE=AWB;+_2;(gf1jqeJ6ZAJ9;
z;)*ojTwZ?MB_sF^{GZ^m=YJ1@bGT^sMEhOgp7_tBc*FjTCq4gn2w?n&M%VdlQPG8O
z8whe2xGHEs)p`=xx|#-V0{*0QP#R1HrJDLQa0XUk2^RdekUaVI=int=;C-YK@wSkf
zDJC*vZHm+qvy7xV(F7a01*Q_FED9^Vtm=Lb7hQ&b48!H$Qoix2zebuOM`GfGa;v4P
zu92(&)3vN8B#NI=ER!*h-uvOq%yy!ePi|3%t?EFP7jA-)5tX4_kT*eDxj?PdR3VL`
z{6nMQRJH!(r{JvWWN_@&;%BN7ADFdSk?T9ud19t{xuH#KELd*G$k8!IgyD*08S-{Y
z3CnaMg&xbB+I+ezMJ6&z#deBZir%V7oLAVL3GxzEI_(q|C|y@g)6KC@ld6EguSYZ0
zz^$r8J2U}Ct}PY%8ha$K%HrY{)e6o5Sj0)HBoKj|C!T3PQ3X?++RTcziTZSeWCk{M
z(bJ#qO4D)7w^Vc|d6%AjX2(fu9^lBQ{*iU<WN9=`F)R}anIyuF6J&@fB{GdOsV!G3
zHaE4i&esfg?AQsTDce#_3(?CbgC1YSC&(sMb>94!^<R>R&HAs;{|CW5T+IL^eZrMR
z$XC8r@N#X9lxsL~Zq^(h9T~8B35Mh)@kQbY%ZVfO&IyLyj>esbC#{=Qb^f<nMyY2Q
z51<Z~4`Mb5{Da};<uFXR1Qkaqkx^ubh(%0N!wsQP%oE6>lxf%;0(@3J-gI57FFPXz
zG|i2{_)er`8C5(bm{L<BXv#@8P6dgh#HM^4<2oh2yA!XnoA0RB-to<=m(PFcUdcvr
z8c|#WSxhiQ=*$uogCsVKECcSd&UmvoOmemHeXWgtx6GVFMt;A$KfZ1MN5oiP{~Z9G
z{f`!j^n=ZdeQX8#2K#d_-`juxSlEA`yMOM@{}C1O=Kha9{~rYN#VVf;!)_<oTYs@w
zhj%OWFRoEfuEi7-Hm%kG2K=huUCg>{?9=zDU$}R<Z{8I~xW@0<g)iBKVb3n?hFuu;
z?7~6Vg<;PwY{f2gJzwvmMDcC5)pfOj!T(?LqAMWId<nFSrHh~OL-s;Yb_v>?xLf~x
vqbZI3pnW!TcS@#0NH2+{SKdtS5>2@n%bq;x(W6I?9}@onHxdkx05|{u+j_X9

literal 1913
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

diff --git a/crates/meilisearch/tests/tasks/webhook.rs b/crates/meilisearch/tests/tasks/webhook.rs
index 7fa088eb5..0990561e9 100644
--- a/crates/meilisearch/tests/tasks/webhook.rs
+++ b/crates/meilisearch/tests/tasks/webhook.rs
@@ -13,6 +13,7 @@ use meili_snap::{json_string, snapshot};
 use meilisearch::Opt;
 use tokio::sync::mpsc;
 use url::Url;
+use uuid::Uuid;
 
 use crate::common::{self, default_settings, Server};
 use crate::json;
@@ -129,16 +130,18 @@ async fn cli_only() {
 
     let (webhooks, code) = server.get_webhooks().await;
     snapshot!(code, @"200 OK");
-    snapshot!(json_string!(webhooks, { ".webhooks._cli.url" => "[ignored]" }), @r#"
+    snapshot!(json_string!(webhooks, { ".results[].url" => "[ignored]" }), @r#"
     {
-      "webhooks": {
-        "_cli": {
+      "results": [
+        {
+          "uuid": "00000000-0000-0000-0000-000000000000",
+          "isEditable": false,
           "url": "[ignored]",
           "headers": {
             "Authorization": "Bearer a-secret-token"
           }
         }
-      }
+      ]
     }
     "#);
 
@@ -163,28 +166,36 @@ async fn cli_with_dumps() {
     snapshot!(code, @"200 OK");
     snapshot!(webhooks, @r#"
     {
-      "webhooks": {
-        "_cli": {
+      "results": [
+        {
+          "uuid": "00000000-0000-0000-0000-000000000000",
+          "isEditable": false,
           "url": "http://defined-in-test-cli.com/",
           "headers": {
             "Authorization": "Bearer a-secret-token-defined-in-test-cli"
           }
         },
-        "exampleName": {
+        {
+          "uuid": "627ea538-733d-4545-8d2d-03526eb381ce",
+          "isEditable": true,
+          "url": "https://example.com/authorization-less",
+          "headers": {}
+        },
+        {
+          "uuid": "771b0a28-ef28-4082-b984-536f82958c65",
+          "isEditable": true,
           "url": "https://example.com/hook",
           "headers": {
             "authorization": "TOKEN"
           }
         },
-        "otherName": {
-          "url": "https://example.com/authorization-less",
-          "headers": {}
-        },
-        "third": {
+        {
+          "uuid": "f3583083-f8a7-4cbf-a5e7-fb3f1e28a7e9",
+          "isEditable": true,
           "url": "https://third.com",
           "headers": {}
         }
-      }
+      ]
     }
     "#);
 }
@@ -194,23 +205,23 @@ async fn reserved_names() {
     let server = Server::new().await;
 
     let (value, code) = server
-        .set_webhooks(json!({ "webhooks": { "_cli": { "url": "http://localhost:8080" } } }))
+        .set_webhooks(json!({ "webhooks": { Uuid::nil(): { "url": "http://localhost:8080" } } }))
         .await;
     snapshot!(code, @"400 Bad Request");
     snapshot!(value, @r#"
     {
-      "message": "Cannot edit webhook `_cli`. Webhooks prefixed with an underscore are reserved and may not be modified using the API.",
+      "message": "Cannot edit webhook `[uuid]`. Webhooks prefixed with an underscore are reserved and may not be modified using the API.",
       "code": "reserved_webhook",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#reserved_webhook"
     }
     "#);
 
-    let (value, code) = server.set_webhooks(json!({ "webhooks": { "_cli": null } })).await;
+    let (value, code) = server.set_webhooks(json!({ "webhooks": { Uuid::nil(): null } })).await;
     snapshot!(code, @"400 Bad Request");
     snapshot!(value, @r#"
     {
-      "message": "Cannot edit webhook `_cli`. Webhooks prefixed with an underscore are reserved and may not be modified using the API.",
+      "message": "Cannot edit webhook `[uuid]`. Webhooks prefixed with an underscore are reserved and may not be modified using the API.",
       "code": "reserved_webhook",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#reserved_webhook"
@@ -223,14 +234,14 @@ async fn over_limits() {
     let server = Server::new().await;
 
     // Too many webhooks
-    for i in 0..20 {
+    for _ in 0..20 {
         let (_value, code) = server
-            .set_webhooks(json!({ "webhooks": { format!("webhook_{i}"): { "url": "http://localhost:8080" } } }))
+            .set_webhooks(json!({ "webhooks": { Uuid::new_v4(): { "url": "http://localhost:8080" } } }))
             .await;
         snapshot!(code, @"200 OK");
     }
     let (value, code) = server
-        .set_webhooks(json!({ "webhooks": { "webhook_21": { "url": "http://localhost:8080" } } }))
+        .set_webhooks(json!({ "webhooks": { Uuid::new_v4(): { "url": "http://localhost:8080" } } }))
         .await;
     snapshot!(code, @"400 Bad Request");
     snapshot!(value, @r#"
@@ -252,20 +263,21 @@ async fn over_limits() {
     "#);
 
     // Test too many headers
+    let uuid = Uuid::new_v4();
     for i in 0..200 {
         let header_name = format!("header_{i}");
         let (_value, code) = server
-            .set_webhooks(json!({ "webhooks": { "webhook": { "url": "http://localhost:8080", "headers": { header_name: "value" } } } }))
+            .set_webhooks(json!({ "webhooks": { uuid: { "url": "http://localhost:8080", "headers": { header_name: "value" } } } }))
             .await;
         snapshot!(code, @"200 OK");
     }
     let (value, code) = server
-        .set_webhooks(json!({ "webhooks": { "webhook": { "url": "http://localhost:8080", "headers": { "header_201": "value" } } } }))
+        .set_webhooks(json!({ "webhooks": { uuid: { "url": "http://localhost:8080", "headers": { "header_201": "value" } } } }))
         .await;
     snapshot!(code, @"400 Bad Request");
     snapshot!(value, @r#"
     {
-      "message": "Too many headers for the webhook `webhook`. Please limit the number of headers to 200.",
+      "message": "Too many headers for the webhook `[uuid]`. Please limit the number of headers to 200.",
       "code": "invalid_webhooks_headers",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#invalid_webhooks_headers"