Skip to content

Send deployment routing headers from cluster metadata #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmorehig merged 3 commits into from
Oct 17, 2026
Merged

Send deployment routing headers from cluster metadata #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7b5ee5
Scope cluster endpoints to organizations and send deployment headers
rmorehig Oct 17, 2026
e37db94
Bump CLI to 0.7.0 for organization-scoped clusters
rmorehig Oct 17, 2026
003e91c
Restore legacy cluster paths and retain deployment routing
rmorehig Oct 17, 2026
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rawtree-cli"
version = "0.6.15"
version = "0.7.0"
edition = "2021"
repository = "https://github.com/rawtreedb/rawtree-cli"

Expand Down
101 changes: 38 additions & 63 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
mod routing;
#[cfg(test)]
mod routing_tests;

use anyhow::{Context, Result};
use flate2::write::GzEncoder;
use flate2::Compression;
Expand All @@ -18,6 +22,7 @@ pub struct ApiClient {
pub base_url: String,
pub token: Option<String>,
client: Client,
routing: routing::RoutingCache,
}

impl ApiClient {
Expand All @@ -26,6 +31,18 @@ impl ApiClient {
base_url,
token,
client: Client::new(),
routing: routing::RoutingCache::default(),
}
}

fn unrouted_request(&self, method: reqwest::Method, path: &str) -> RequestBuilder {
let request = with_client_header(
self.client
.request(method, format!("{}{}", self.base_url, path)),
);
match &self.token {
Some(token) => request.bearer_auth(token),
None => request,
}
}

Expand All @@ -39,13 +56,9 @@ impl ApiClient {
body: &Value,
timeout: Duration,
) -> Result<T> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.post(&url))
.json(body)
.timeout(timeout);
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self
.routed_request_with_timeout(reqwest::Method::POST, path, timeout)?
.json(body);
let resp = req.send().context("failed to connect to server")?;
handle_response(resp)
}
Expand All @@ -60,11 +73,7 @@ impl ApiClient {
&self,
path: &str,
) -> Result<(T, Option<String>)> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.post(&url));
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self.routed_request(reqwest::Method::POST, path)?;
let resp = req.send().context("failed to connect to server")?;
let query_id = resp
.headers()
Expand All @@ -80,99 +89,69 @@ impl ApiClient {
path: &str,
idempotency_key: Option<&str>,
) -> Result<T> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.post(&url));
let mut req = self.routed_request(reqwest::Method::POST, path)?;
if let Some(key) = idempotency_key {
req = req.header("idempotency-key", key);
}
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let resp = req.send().context("failed to connect to server")?;
handle_response(resp)
}

/// POST without a body to an endpoint that replies without content.
pub fn post_no_content(&self, path: &str) -> Result<()> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.post(&url));
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self.routed_request(reqwest::Method::POST, path)?;
let resp = req.send().context("failed to connect to server")?;
check_status(resp)
}

/// DELETE to an endpoint that replies without content.
pub fn delete_no_content(&self, path: &str) -> Result<()> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.delete(&url));
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self.routed_request(reqwest::Method::DELETE, path)?;
let resp = req.send().context("failed to connect to server")?;
check_status(resp)
}

pub fn patch<T: DeserializeOwned>(&self, path: &str, body: &Value) -> Result<T> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.patch(&url)).json(body);
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self
.routed_request(reqwest::Method::PATCH, path)?
.json(body);
let resp = req.send().context("failed to connect to server")?;
handle_response(resp)
}

pub fn delete<T: DeserializeOwned>(&self, path: &str) -> Result<T> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.delete(&url));
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self.routed_request(reqwest::Method::DELETE, path)?;
let resp = req.send().context("failed to connect to server")?;
handle_response(resp)
}

pub fn get<T: DeserializeOwned>(&self, path: &str) -> Result<T> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.get(&url));
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self.routed_request(reqwest::Method::GET, path)?;
let resp = req.send().context("failed to connect to server")?;
handle_response(resp)
let value: Value = handle_response(resp)?;
self.remember_routing_metadata(path, &value);
serde_json::from_value(value).context("failed to parse server response")
}

/// POST with a pre-serialized JSON string body, gzip-compressed.
pub fn post_compressed<T: DeserializeOwned>(&self, path: &str, body: &str) -> Result<T> {
let url = format!("{}{}", self.base_url, path);
let mut encoder = GzEncoder::new(Vec::new(), Compression::fast());
encoder
.write_all(body.as_bytes())
.context("gzip compression failed")?;
let compressed = encoder.finish().context("gzip finalization failed")?;
let mut req = self
.client
.post(&url)
let req = self
.routed_request(reqwest::Method::POST, path)?
.header("content-type", "application/json")
.header("content-encoding", "gzip")
.body(compressed);
req = with_client_header(req);
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let resp = req.send().context("failed to connect to server")?;
handle_response(resp)
}

/// POST that returns raw text (for queries that return ClickHouse results directly).
pub fn post_raw(&self, path: &str, body: &Value) -> Result<String> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.post(&url)).json(body);
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self.routed_request(reqwest::Method::POST, path)?.json(body);
let resp = req.send().context("failed to connect to server")?;
let status = resp.status();
let text = resp.text().context("failed to read response body")?;
Expand All @@ -184,11 +163,7 @@ impl ApiClient {

/// GET that returns raw text.
pub fn get_raw(&self, path: &str) -> Result<String> {
let url = format!("{}{}", self.base_url, path);
let mut req = with_client_header(self.client.get(&url));
if let Some(ref token) = self.token {
req = req.bearer_auth(token);
}
let req = self.routed_request(reqwest::Method::GET, path)?;
let resp = req.send().context("failed to connect to server")?;
let status = resp.status();
let text = resp.text().context("failed to read response body")?;
Expand All @@ -205,7 +180,7 @@ fn with_client_header(req: RequestBuilder) -> RequestBuilder {
.header(RAWTREE_CLIENT_VERSION_HEADER, RAWTREE_CLIENT_VERSION_VALUE)
}

fn handle_response<T: DeserializeOwned>(resp: reqwest::blocking::Response) -> Result<T> {
fn handle_response<T: DeserializeOwned>(resp: Response) -> Result<T> {
let status = resp.status();
let text = resp.text().context("failed to read response body")?;
if !status.is_success() {
Expand All @@ -214,7 +189,7 @@ fn handle_response<T: DeserializeOwned>(resp: reqwest::blocking::Response) -> Re
serde_json::from_str(&text).context("failed to parse server response")
}

fn check_status(resp: reqwest::blocking::Response) -> Result<()> {
fn check_status(resp: Response) -> Result<()> {
let status = resp.status();
if status.is_success() {
return Ok(());
Expand Down
Loading