fix toolchain compile

This commit is contained in:
Diego Imbert
2025-09-02 18:23:58 +02:00
parent dedb43c94f
commit e608fbc43e
3 changed files with 16 additions and 13 deletions
+1 -1
View File
@@ -251,7 +251,7 @@ regex = "^1"
semver = "^1"
duckdb = { version = "^1.3.2", features = ["bundled"] }
aws-sigv4 = "^1.3.4"
aws-sdk-config = "^1.83.0"
aws-sdk-config = "^1.68.0"
v8 = "=130.0.7" # Exact version NOTE: Do not forget to update version and hash in flake.nix
deno_fetch = "0.214.0"
+13 -10
View File
@@ -350,6 +350,18 @@ pub struct AzureBlobResource {
pub federated_token_file: Option<String>,
}
impl AzureBlobResource {
pub fn get_endpoint_url(&self) -> error::Result<String> {
Ok(render_endpoint(
self.endpoint.clone().unwrap_or_else(|| "".to_string()),
self.use_ssl.unwrap_or(false),
None,
None,
"".to_string(),
))
}
}
fn as_string<'de, D>(deserializer: D) -> Result<String, D::Error>
where
D: serde::de::Deserializer<'de>,
@@ -1123,16 +1135,7 @@ impl ObjectStoreResource {
"https://storage.googleapis.com/{}",
gcs_resource.bucket
)),
ObjectStoreResource::Azure(az_resource) => Ok(render_endpoint(
az_resource
.endpoint
.clone()
.unwrap_or_else(|| "".to_string()),
az_resource.use_ssl.unwrap_or(false),
None,
None,
"".to_string(),
)),
ObjectStoreResource::Azure(az_resource) => az_resource.get_endpoint_url(),
}
}
}
@@ -201,8 +201,8 @@ pub async fn do_duckdb(
};
conn.execute_batch(&format!(
"INSTALL httpfs;
LOAD httpfs;
"INSTALL httpfs; LOAD httpfs;
INSTALL azure; LOAD azure;
CREATE OR REPLACE SECRET s3_secret (
TYPE s3,
PROVIDER config,