Merge pull request #196 from JanKaul/fmt

JanKaul · web-flow · commit abfed1ce5d7f · 2025-06-19T13:42:54.000+02:00
run cargo fmt
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -37,3 +37,7 @@ jobs:
       run: rustup component add clippy
     - name: Run Clippy
       run: make clippy
+    - name: Install Format
+      run: rustup component add rustfmt
+    - name: Run fmt
+      run: make fmt
diff --git a/Makefile b/Makefile
@@ -19,3 +19,5 @@ test-sql-catalog:
 	cargo test -p iceberg-sql-catalog --lib && cargo clean -p iceberg-sql-catalog
 clippy:
 	cargo clippy --all-targets --all-features -- -D warnings
+fmt:
+	cargo fmt --all -- --check
diff --git a/catalogs/iceberg-glue-catalog/src/utils.rs b/catalogs/iceberg-glue-catalog/src/utils.rs
@@ -7,10 +7,9 @@ pub(crate) const TABLE_TYPE: &str = "table_type";
 /// Parameter value `table_type` for `TableInput`
 pub(crate) const ICEBERG: &str = "ICEBERG";
 
-pub(crate) fn get_parameters (metadata_location: &str) -> HashMap<String, String> {
+pub(crate) fn get_parameters(metadata_location: &str) -> HashMap<String, String> {
     HashMap::from([
         (TABLE_TYPE.to_string(), ICEBERG.to_string()),
-        (METADATA_LOCATION.to_string(), metadata_location.to_string())
+        (METADATA_LOCATION.to_string(), metadata_location.to_string()),
     ])
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/apis/configuration_api_api.rs b/catalogs/iceberg-rest-catalog/src/apis/configuration_api_api.rs
@@ -4,16 +4,14 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
-
+use super::{configuration, Error};
+use crate::{apis::ResponseContent, models};
 use reqwest;
 use serde::{Deserialize, Serialize};
-use crate::{apis::ResponseContent, models};
-use super::{Error, configuration};
-
 
 /// struct for typed errors of method [`get_config`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -28,9 +26,11 @@ pub enum GetConfigError {
     UnknownValue(serde_json::Value),
 }
 
-
-///  All REST clients should first call this route to get catalog configuration properties from the server to configure the catalog and its HTTP client. Configuration from the server consists of two sets of key/value pairs. - defaults -  properties that should be used as default configuration; applied before client configuration - overrides - properties that should be used to override client configuration; applied after defaults and client configuration  Catalog configuration is constructed by setting the defaults, then client- provided configuration, and finally overrides. The final property set is then used to configure the catalog.  For example, a default configuration property might set the size of the client pool, which can be replaced with a client-specific setting. An override might be used to set the warehouse location, which is stored on the server rather than in client configuration.  Common catalog configuration settings are documented at https://iceberg.apache.org/docs/latest/configuration/#catalog-properties  The catalog configuration also holds an optional `endpoints` field that contains information about the endpoints supported by the server. If a server does not send the `endpoints` field, a default set of endpoints is assumed: - GET /v1/{prefix}/namespaces - POST /v1/{prefix}/namespaces - GET /v1/{prefix}/namespaces/{namespace} - HEAD /v1/{prefix}/namespaces/{namespace} - DELETE /v1/{prefix}/namespaces/{namespace} - POST /v1/{prefix}/namespaces/{namespace}/properties - GET /v1/{prefix}/namespaces/{namespace}/tables - POST /v1/{prefix}/namespaces/{namespace}/tables - GET /v1/{prefix}/namespaces/{namespace}/tables/{table} - HEAD /v1/{prefix}/namespaces/{namespace}/tables/{table} - POST /v1/{prefix}/namespaces/{namespace}/tables/{table} - DELETE /v1/{prefix}/namespaces/{namespace}/tables/{table} - POST /v1/{prefix}/namespaces/{namespace}/register - POST /v1/{prefix}/namespaces/{namespace}/tables/{table}/metrics - POST /v1/{prefix}/tables/rename - POST /v1/{prefix}/transactions/commit 
-pub async fn get_config(configuration: &configuration::Configuration, warehouse: Option<&str>) -> Result<models::CatalogConfig, Error<GetConfigError>> {
+///  All REST clients should first call this route to get catalog configuration properties from the server to configure the catalog and its HTTP client. Configuration from the server consists of two sets of key/value pairs. - defaults -  properties that should be used as default configuration; applied before client configuration - overrides - properties that should be used to override client configuration; applied after defaults and client configuration  Catalog configuration is constructed by setting the defaults, then client- provided configuration, and finally overrides. The final property set is then used to configure the catalog.  For example, a default configuration property might set the size of the client pool, which can be replaced with a client-specific setting. An override might be used to set the warehouse location, which is stored on the server rather than in client configuration.  Common catalog configuration settings are documented at https://iceberg.apache.org/docs/latest/configuration/#catalog-properties  The catalog configuration also holds an optional `endpoints` field that contains information about the endpoints supported by the server. If a server does not send the `endpoints` field, a default set of endpoints is assumed: - GET /v1/{prefix}/namespaces - POST /v1/{prefix}/namespaces - GET /v1/{prefix}/namespaces/{namespace} - HEAD /v1/{prefix}/namespaces/{namespace} - DELETE /v1/{prefix}/namespaces/{namespace} - POST /v1/{prefix}/namespaces/{namespace}/properties - GET /v1/{prefix}/namespaces/{namespace}/tables - POST /v1/{prefix}/namespaces/{namespace}/tables - GET /v1/{prefix}/namespaces/{namespace}/tables/{table} - HEAD /v1/{prefix}/namespaces/{namespace}/tables/{table} - POST /v1/{prefix}/namespaces/{namespace}/tables/{table} - DELETE /v1/{prefix}/namespaces/{namespace}/tables/{table} - POST /v1/{prefix}/namespaces/{namespace}/register - POST /v1/{prefix}/namespaces/{namespace}/tables/{table}/metrics - POST /v1/{prefix}/tables/rename - POST /v1/{prefix}/transactions/commit
+pub async fn get_config(
+    configuration: &configuration::Configuration,
+    warehouse: Option<&str>,
+) -> Result<models::CatalogConfig, Error<GetConfigError>> {
     // add a prefix to parameters to efficiently prevent name collisions
     let p_warehouse = warehouse;
 
@@ -41,17 +41,13 @@ pub async fn get_config(configuration: &configuration::Configuration, warehouse:
         req_builder = req_builder.query(&[("warehouse", &param_value.to_string())]);
     }
     if let Some(ref aws_v4_key) = configuration.aws_v4_key {
-        let new_headers = match aws_v4_key.sign(
-	    &uri_str,
-	    "GET",
-	    "",
-	    ) {
-	      Ok(new_headers) => new_headers,
-	      Err(err) => return Err(Error::AWSV4SignatureError(err)),
-	    };
-	for (name, value) in new_headers.iter() {
-	    req_builder = req_builder.header(name.as_str(), value.as_str());
-	}
+        let new_headers = match aws_v4_key.sign(&uri_str, "GET", "") {
+            Ok(new_headers) => new_headers,
+            Err(err) => return Err(Error::AWSV4SignatureError(err)),
+        };
+        for (name, value) in new_headers.iter() {
+            req_builder = req_builder.header(name.as_str(), value.as_str());
+        }
     }
     if let Some(ref user_agent) = configuration.user_agent {
         req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
@@ -74,7 +70,10 @@ pub async fn get_config(configuration: &configuration::Configuration, warehouse:
     } else {
         let content = resp.text().await?;
         let entity: Option<GetConfigError> = serde_json::from_str(&content).ok();
-        Err(Error::ResponseError(ResponseContent { status, content, entity }))
+        Err(Error::ResponseError(ResponseContent {
+            status,
+            content,
+            entity,
+        }))
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/lib.rs b/catalogs/iceberg-rest-catalog/src/lib.rs
@@ -3,10 +3,10 @@
 
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_repr;
 extern crate reqwest;
 extern crate serde;
 extern crate serde_json;
+extern crate serde_repr;
 extern crate url;
 
 #[allow(clippy::all)]
diff --git a/catalogs/iceberg-rest-catalog/src/models/catalog_config.rs b/catalogs/iceberg-rest-catalog/src/models/catalog_config.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -27,12 +27,14 @@ pub struct CatalogConfig {
 
 impl CatalogConfig {
     /// Server-provided configuration for the catalog.
-    pub fn new(overrides: std::collections::HashMap<String, String>, defaults: std::collections::HashMap<String, String>) -> CatalogConfig {
+    pub fn new(
+        overrides: std::collections::HashMap<String, String>,
+        defaults: std::collections::HashMap<String, String>,
+    ) -> CatalogConfig {
         CatalogConfig {
             overrides,
             defaults,
             endpoints: None,
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/create_namespace_request.rs b/catalogs/iceberg-rest-catalog/src/models/create_namespace_request.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -29,4 +29,3 @@ impl CreateNamespaceRequest {
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/create_namespace_response.rs b/catalogs/iceberg-rest-catalog/src/models/create_namespace_response.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -29,4 +29,3 @@ impl CreateNamespaceResponse {
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/error_model.rs b/catalogs/iceberg-rest-catalog/src/models/error_model.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -38,4 +38,3 @@ impl ErrorModel {
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/get_namespace_response.rs b/catalogs/iceberg-rest-catalog/src/models/get_namespace_response.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -29,4 +29,3 @@ impl GetNamespaceResponse {
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/iceberg_error_response.rs b/catalogs/iceberg-rest-catalog/src/models/iceberg_error_response.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -21,9 +21,6 @@ pub struct IcebergErrorResponse {
 impl IcebergErrorResponse {
     /// JSON wrapper for all error responses (non-2xx)
     pub fn new(error: models::ErrorModel) -> IcebergErrorResponse {
-        IcebergErrorResponse {
-            error,
-        }
+        IcebergErrorResponse { error }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/list_namespaces_response.rs b/catalogs/iceberg-rest-catalog/src/models/list_namespaces_response.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -28,4 +28,3 @@ impl ListNamespacesResponse {
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/load_credentials_response.rs b/catalogs/iceberg-rest-catalog/src/models/load_credentials_response.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -24,4 +24,3 @@ impl LoadCredentialsResponse {
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/metric_result.rs b/catalogs/iceberg-rest-catalog/src/models/metric_result.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -26,7 +26,13 @@ pub struct MetricResult {
 }
 
 impl MetricResult {
-    pub fn new(unit: String, value: i64, time_unit: String, count: i64, total_duration: i64) -> MetricResult {
+    pub fn new(
+        unit: String,
+        value: i64,
+        time_unit: String,
+        count: i64,
+        total_duration: i64,
+    ) -> MetricResult {
         MetricResult {
             unit,
             value,
@@ -36,4 +42,3 @@ impl MetricResult {
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/o_auth_error.rs b/catalogs/iceberg-rest-catalog/src/models/o_auth_error.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -32,7 +32,7 @@ impl OAuthError {
         }
     }
 }
-/// 
+///
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
 pub enum Error {
     #[serde(rename = "invalid_request")]
@@ -54,4 +54,3 @@ impl Default for Error {
         Self::InvalidRequest
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/o_auth_token_response.rs b/catalogs/iceberg-rest-catalog/src/models/o_auth_token_response.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -62,4 +62,3 @@ impl Default for TokenType {
         Self::Bearer
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/register_table_request.rs b/catalogs/iceberg-rest-catalog/src/models/register_table_request.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -27,4 +27,3 @@ impl RegisterTableRequest {
         }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/storage_credential.rs b/catalogs/iceberg-rest-catalog/src/models/storage_credential.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -21,11 +21,10 @@ pub struct StorageCredential {
 }
 
 impl StorageCredential {
-    pub fn new(prefix: String, config: std::collections::HashMap<String, String>) -> StorageCredential {
-        StorageCredential {
-            prefix,
-            config,
-        }
+    pub fn new(
+        prefix: String,
+        config: std::collections::HashMap<String, String>,
+    ) -> StorageCredential {
+        StorageCredential { prefix, config }
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/token_type.rs b/catalogs/iceberg-rest-catalog/src/models/token_type.rs
@@ -4,7 +4,7 @@
  * Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.
  *
  * The version of the OpenAPI document: 0.0.1
- * 
+ *
  * Generated by: https://openapi-generator.tech
  */
 
@@ -27,18 +27,29 @@ pub enum TokenType {
     UrnColonIetfColonParamsColonOauthColonTokenTypeColonSaml2,
     #[serde(rename = "urn:ietf:params:oauth:token-type:jwt")]
     UrnColonIetfColonParamsColonOauthColonTokenTypeColonJwt,
-
 }
 
 impl std::fmt::Display for TokenType {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
-            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonAccessToken => write!(f, "urn:ietf:params:oauth:token-type:access_token"),
-            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonRefreshToken => write!(f, "urn:ietf:params:oauth:token-type:refresh_token"),
-            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonIdToken => write!(f, "urn:ietf:params:oauth:token-type:id_token"),
-            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonSaml1 => write!(f, "urn:ietf:params:oauth:token-type:saml1"),
-            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonSaml2 => write!(f, "urn:ietf:params:oauth:token-type:saml2"),
-            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonJwt => write!(f, "urn:ietf:params:oauth:token-type:jwt"),
+            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonAccessToken => {
+                write!(f, "urn:ietf:params:oauth:token-type:access_token")
+            }
+            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonRefreshToken => {
+                write!(f, "urn:ietf:params:oauth:token-type:refresh_token")
+            }
+            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonIdToken => {
+                write!(f, "urn:ietf:params:oauth:token-type:id_token")
+            }
+            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonSaml1 => {
+                write!(f, "urn:ietf:params:oauth:token-type:saml1")
+            }
+            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonSaml2 => {
+                write!(f, "urn:ietf:params:oauth:token-type:saml2")
+            }
+            Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonJwt => {
+                write!(f, "urn:ietf:params:oauth:token-type:jwt")
+            }
         }
     }
 }
@@ -48,4 +59,3 @@ impl Default for TokenType {
         Self::UrnColonIetfColonParamsColonOauthColonTokenTypeColonAccessToken
     }
 }
-
diff --git a/catalogs/iceberg-rest-catalog/src/models/update_namespace_properties_request.rs b/catalogs/iceberg-rest-catalog/src/models/update_namespace_properties_request.rs
diff --git a/catalogs/iceberg-rest-catalog/src/models/update_namespace_properties_response.rs b/catalogs/iceberg-rest-catalog/src/models/update_namespace_properties_response.rs
diff --git a/iceberg-rust/src/object_store/store.rs b/iceberg-rust/src/object_store/store.rs
diff --git a/iceberg-rust/src/table/manifest_list.rs b/iceberg-rust/src/table/manifest_list.rs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* Defines the specification for the first version of the REST Catalog API. Implementations should ideally support both Iceberg table specs v1 and v2, with priority given to v2.`
`5`	`5`	`*`
`6`	`6`	`* The version of the OpenAPI document: 0.0.1`
`7`		`- *`
	`7`	`+ *`
`8`	`8`	`* Generated by: https://openapi-generator.tech`
`9`	`9`	`*/`
`10`	`10`
`@@ -27,12 +27,14 @@ pub struct CatalogConfig {`
`27`	`27`
`28`	`28`	`impl CatalogConfig {`
`29`	`29`	`/// Server-provided configuration for the catalog.`
`30`		`- pub fn new(overrides: std::collections::HashMap<String, String>, defaults: std::collections::HashMap<String, String>) -> CatalogConfig {`
	`30`	`+ pub fn new(`
	`31`	`+ overrides: std::collections::HashMap<String, String>,`
	`32`	`+ defaults: std::collections::HashMap<String, String>,`
	`33`	`+ ) -> CatalogConfig {`
`31`	`34`	`CatalogConfig {`
`32`	`35`	`overrides,`
`33`	`36`	`defaults,`
`34`	`37`	`endpoints: None,`
`35`	`38`	`}`
`36`	`39`	`}`
`37`	`40`	`}`
`38`		`-`