Fokko commented on code in PR #306:
URL: https://github.com/apache/iceberg-rust/pull/306#discussion_r1541090474
##########
crates/catalog/rest/src/catalog.rs:
##########
@@ -963,6 +993,76 @@ mod tests {
);
}
+ #[tokio::test]
+ async fn test_get_default_headers() {
+ let server = Server::new_async().await;
+ let mut props = HashMap::new();
+ props.insert("credential".to_string(), "client1:secret1".to_string());
+
+ let config = RestCatalogConfig::builder()
+ .uri(server.url())
+ .props(props)
+ .build();
+ let headers: HeaderMap = config.get_default_headers().unwrap();
+
+ let expected_headers = HeaderMap::from_iter([
+ (
+ header::CONTENT_TYPE,
+ HeaderValue::from_static("application/json"),
+ ),
+ (
+ HeaderName::from_static("x-client-version"),
+ HeaderValue::from_static(ICEBERG_REST_SPEC_VERSION),
+ ),
+ (
+ header::USER_AGENT,
+ HeaderValue::from_str(&format!("iceberg-rs/{}",
CARGO_PKG_VERSION)).unwrap(),
+ ),
+ ]);
+ assert_eq!(headers, expected_headers);
+ }
+
+ #[tokio::test]
+ async fn test_get_default_headers_with_custom_headers() {
+ let server = Server::new_async().await;
+ let mut props = HashMap::new();
+ props.insert("credential".to_string(), "client1:secret1".to_string());
+ props.insert(
+ "header.content-type".to_string(),
Review Comment:
For REST we have the `rest.` prefix for REST-specific config, see:
https://py.iceberg.apache.org/configuration/
We might want to consider it here as well, WDYT?
##########
crates/catalog/rest/src/catalog.rs:
##########
@@ -956,6 +983,68 @@ mod tests {
);
}
+ #[tokio::test]
+ async fn test_get_default_headers() {
+ let server = Server::new_async().await;
+ let mut props = HashMap::new();
+ props.insert("credential".to_string(), "client1:secret1".to_string());
+
+ let config = RestCatalogConfig::builder()
+ .uri(server.url())
+ .props(props)
+ .build();
+ let headers: HeaderMap = config.get_default_headers().unwrap();
+
+ let expected_headers = HeaderMap::from_iter([
+ (
+ header::CONTENT_TYPE,
+ HeaderValue::from_static("application/json"),
+ ),
+ (
+ HeaderName::from_static("x-client-version"),
+ HeaderValue::from_static(ICEBERG_REST_SPEC_VERSION),
+ ),
+ (
+ header::USER_AGENT,
+ HeaderValue::from_str(&format!("iceberg-rs/{}",
CARGO_PKG_VERSION)).unwrap(),
+ ),
+ ]);
+ assert_eq!(headers, expected_headers);
+ }
+
+ #[tokio::test]
+ async fn test_get_default_headers_with_custom_headers() {
+ let server = Server::new_async().await;
+ let mut props = HashMap::new();
+ props.insert("credential".to_string(), "client1:secret1".to_string());
+ props.insert(
+ "header.content-type".to_string(),
+ "application/yaml".to_string(),
Review Comment:
We don't want to override default headers.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For additional commands, e-mail: issues-h...@iceberg.apache.org
