searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-15 13:58:36 +02:00
Code Issues Releases Wiki Activity

Get rid of bearer

Browse source
This commit is contained in:
Mubelotix 2025-07-11 11:32:05 +02:00
parent 9bdfdd395b
commit 3f42f1a036
No known key found for this signature in database
GPG key ID: 0406DF6C3A69B942
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/index-scheduler/src/scheduler/process_export.rs
View file

@ -62,13 +62,14 @@ impl IndexScheduler {
let ExportIndexSettings { filter, override_settings } = export_settings; let ExportIndexSettings { filter, override_settings } = export_settings;
let index = self.index(uid)?; let index = self.index(uid)?;
let index_rtxn = index.read_txn()?; let index_rtxn = index.read_txn()?;
let bearer = api_key.map(|api_key| format!("Bearer {api_key}"));
// First, check if the index already exists // First, check if the index already exists
let url = format!("{base_url}/indexes/{uid}"); let url = format!("{base_url}/indexes/{uid}");
let response = retry(&must_stop_processing, || { let response = retry(&must_stop_processing, || {
let mut request = agent.get(&url); let mut request = agent.get(&url);
if let Some(api_key) = api_key { if let Some(bearer) = &bearer {
request = request.set("Authorization", &format!("Bearer {api_key}")); request = request.set("Authorization", bearer);
} }
request.send_bytes(Default::default()).map_err(into_backoff_error) request.send_bytes(Default::default()).map_err(into_backoff_error)
@ -90,8 +91,8 @@ impl IndexScheduler {
let url = format!("{base_url}/indexes"); let url = format!("{base_url}/indexes");
retry(&must_stop_processing, || { retry(&must_stop_processing, || {
let mut request = agent.post(&url); let mut request = agent.post(&url);
if let Some(api_key) = api_key { if let Some(bearer) = &bearer {
request = request.set("Authorization", &format!("Bearer {api_key}")); request = request.set("Authorization", bearer);
} }
let index_param = json!({ "uid": uid, "primaryKey": primary_key }); let index_param = json!({ "uid": uid, "primaryKey": primary_key });
request.send_json(&index_param).map_err(into_backoff_error) request.send_json(&index_param).map_err(into_backoff_error)
@ -103,8 +104,8 @@ impl IndexScheduler {
let url = format!("{base_url}/indexes/{uid}"); let url = format!("{base_url}/indexes/{uid}");
retry(&must_stop_processing, || { retry(&must_stop_processing, || {
let mut request = agent.patch(&url); let mut request = agent.patch(&url);
if let Some(api_key) = api_key { if let Some(bearer) = &bearer {
request = request.set("Authorization", &format!("Bearer {api_key}")); request = request.set("Authorization", bearer);
} }
let index_param = json!({ "primaryKey": primary_key }); let index_param = json!({ "primaryKey": primary_key });
request.send_json(&index_param).map_err(into_backoff_error) request.send_json(&index_param).map_err(into_backoff_error)
@ -122,7 +123,6 @@ impl IndexScheduler {
} }
// Retry logic for sending settings // Retry logic for sending settings
let url = format!("{base_url}/indexes/{uid}/settings"); let url = format!("{base_url}/indexes/{uid}/settings");
let bearer = api_key.map(|api_key| format!("Bearer {api_key}"));
retry(&must_stop_processing, || { retry(&must_stop_processing, || {
let mut request = agent.patch(&url); let mut request = agent.patch(&url);
if let Some(bearer) = bearer.as_ref() { if let Some(bearer) = bearer.as_ref() {
@ -265,9 +265,8 @@ impl IndexScheduler {
let mut request = agent.post(&documents_url); let mut request = agent.post(&documents_url);
request = request.set("Content-Type", "application/x-ndjson"); request = request.set("Content-Type", "application/x-ndjson");
request = request.set("Content-Encoding", "gzip"); request = request.set("Content-Encoding", "gzip");
if let Some(api_key) = api_key { if let Some(bearer) = &bearer {
request = request request = request.set("Authorization", bearer);
.set("Authorization", &(format!("Bearer {api_key}")));
} }
request.send_bytes(&compressed_buffer).map_err(into_backoff_error) request.send_bytes(&compressed_buffer).map_err(into_backoff_error)
})?; })?;
@ -284,8 +283,8 @@ impl IndexScheduler {
retry(&must_stop_processing, || { retry(&must_stop_processing, || {
let mut request = agent.post(&documents_url); let mut request = agent.post(&documents_url);
request = request.set("Content-Type", "application/x-ndjson"); request = request.set("Content-Type", "application/x-ndjson");
if let Some(api_key) = api_key { if let Some(bearer) = &bearer {
request = request.set("Authorization", &(format!("Bearer {api_key}"))); request = request.set("Authorization", bearer);
} }
request.send_bytes(&buffer).map_err(into_backoff_error) request.send_bytes(&buffer).map_err(into_backoff_error)
})?; })?;