Skip to content

Take into account query params when singing request #286

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

Open
osipovartem wants to merge 2 commits into
base: df50
Choose a base branch
from
Open

Take into account query params when singing request #286

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1c713e
Take into account query params when singing request
osipovartem Dec 4, 2025
b161a6a
Take into account query params when singing request
osipovartem Dec 4, 2025
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
32 changes: 24 additions & 8 deletions catalogs/iceberg-rest-catalog/src/apis/fetch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,23 @@ where
let uri = uri_base + uri_str;
let mut req_builder = client.request(method.clone(), &uri);

for (key, value) in query_params.unwrap_or_default() {
req_builder = req_builder.query(&[(key, value)]);
}

if let Some(ref aws_v4_key) = configuration.aws_v4_key {
let body_str = match serde_json::to_value(&request) {
Ok(serde_json::Value::Null) => "",
_ => &serde_json::to_string(&request).expect("param should serialize to string"),
};
let new_headers = match aws_v4_key.sign(&uri, method.as_str(), body_str) {
let uri_for_signing = match req_builder.try_clone() {
Some(cloned_builder) => match cloned_builder.build() {
Ok(tmp_req) => tmp_req.url().as_str().to_string(),
Err(_) => uri.clone(),
},
None => uri.clone(),
};
let new_headers = match aws_v4_key.sign(&uri_for_signing, method.as_str(), body_str) {
Ok(new_headers) => new_headers,
Err(err) => return Err(Error::AWSV4SignatureError(err)),
};
Expand All @@ -56,9 +67,6 @@ where
for (key, value) in headers.unwrap_or_default() {
req_builder = req_builder.header(key, value);
}
for (key, value) in query_params.unwrap_or_default() {
req_builder = req_builder.query(&[(key, value)]);
}
if let &reqwest::Method::POST | &reqwest::Method::PUT = &method {
req_builder = req_builder.json(request);
}
Expand Down Expand Up @@ -108,12 +116,23 @@ where
let uri = uri_base + uri_str;
let mut req_builder = client.request(method.clone(), &uri);

for (key, value) in query_params.unwrap_or_default() {
req_builder = req_builder.query(&[(key, value)]);
}

if let Some(ref aws_v4_key) = configuration.aws_v4_key {
let body_str = match serde_json::to_value(&request) {
Ok(serde_json::Value::Null) => "",
_ => &serde_json::to_string(&request).expect("param should serialize to string"),
};
let new_headers = match aws_v4_key.sign(&uri, method.as_str(), body_str) {
let uri_for_signing = match req_builder.try_clone() {
Some(cloned_builder) => match cloned_builder.build() {
Ok(tmp_req) => tmp_req.url().as_str().to_string(),
Err(_) => uri.clone(),
},
None => uri.clone(),
};
let new_headers = match aws_v4_key.sign(&uri_for_signing, method.as_str(), body_str) {
Ok(new_headers) => new_headers,
Err(err) => return Err(Error::AWSV4SignatureError(err)),
};
Expand All @@ -133,9 +152,6 @@ where
for (key, value) in headers.unwrap_or_default() {
req_builder = req_builder.header(key, value);
}
for (key, value) in query_params.unwrap_or_default() {
req_builder = req_builder.query(&[(key, value)]);
}
if let &reqwest::Method::POST | &reqwest::Method::PUT = &method {
req_builder = req_builder.json(request);
}
Expand Down