Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions packages/core/pegboard-serverless/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
use std::{

Check warning on line 1 in packages/core/pegboard-serverless/src/lib.rs

View workflow job for this annotation

GitHub Actions / Rustfmt

Diff in /home/runner/work/engine/engine/packages/core/pegboard-serverless/src/lib.rs

Check warning on line 1 in packages/core/pegboard-serverless/src/lib.rs

View workflow job for this annotation

GitHub Actions / Rustfmt

Diff in /home/runner/work/engine/engine/packages/core/pegboard-serverless/src/lib.rs
collections::HashMap,
sync::{
Arc,
atomic::{AtomicBool, Ordering},
Arc,
},
};

use anyhow::Result;

Check warning on line 9 in packages/core/pegboard-serverless/src/lib.rs

View workflow job for this annotation

GitHub Actions / Rustfmt

Diff in /home/runner/work/engine/engine/packages/core/pegboard-serverless/src/lib.rs

Check warning on line 9 in packages/core/pegboard-serverless/src/lib.rs

View workflow job for this annotation

GitHub Actions / Rustfmt

Diff in /home/runner/work/engine/engine/packages/core/pegboard-serverless/src/lib.rs
use base64::Engine;
use base64::engine::general_purpose::STANDARD as BASE64;
use base64::Engine;
use futures_util::{StreamExt, TryStreamExt};
use gas::prelude::*;
use pegboard::keys;
Expand Down Expand Up @@ -271,6 +271,16 @@
let current_dc = ctx.config().topology().current_dc()?;

let client = rivet_pools::reqwest::client_no_timeout().await?;

let token = if let Some(auth) = &ctx.config().auth {
Some((
X_RIVET_TOKEN,
HeaderValue::try_from(auth.admin_token.read())?,
))
} else {
None
};

let headers = headers
.into_iter()
.flat_map(|(k, v)| {
Expand All @@ -292,19 +302,7 @@
(X_RIVET_RUNNER_NAME, HeaderValue::try_from(runner_name)?),
(X_RIVET_NAMESPACE_ID, HeaderValue::try_from(namespace_name)?),
])
// Add token if auth is enabled
.chain(
ctx.config()
.auth
.as_ref()
.map(|auth| {
anyhow::Ok((
X_RIVET_TOKEN,
HeaderValue::try_from(auth.admin_token.read())?,
))
})
.transpose()?,
)
.chain(token)
.collect();

let req = client.get(url).headers(headers);
Expand Down
Loading