Skip to content

chore: Update azure url parsing #699

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
kylebarron merged 1 commit into from
May 29, 2026
Merged

chore: Update azure url parsing #699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 34 additions & 21 deletions pyo3-object_store/src/azure/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,30 +417,41 @@ fn parse_url(config: Option<PyAzureConfig>, parsed: &Url) -> object_store::Resul
// or the convention for the hadoop driver abfs[s]://<file_system>@<account_name>.dfs.core.windows.net/<path>
if parsed.username().is_empty() {
config.insert_if_not_exists(AzureConfigKey::ContainerName, validate(host)?);
} else if let Some(a) = host.strip_suffix(".dfs.core.windows.net") {
config.insert_if_not_exists(
AzureConfigKey::ContainerName,
validate(parsed.username())?,
);
config.insert_if_not_exists(AzureConfigKey::AccountName, validate(a)?);
} else if let Some(a) = host.strip_suffix(".dfs.fabric.microsoft.com") {
config.insert_if_not_exists(
AzureConfigKey::ContainerName,
validate(parsed.username())?,
);
config.insert_if_not_exists(AzureConfigKey::AccountName, validate(a)?);
config.insert_if_not_exists(AzureConfigKey::UseFabricEndpoint, "true");
} else {
return Err(ParseUrlError::UrlNotRecognised {
url: parsed.as_str().to_string(),
match host.split_once('.') {
Some((a, "dfs.core.windows.net")) | Some((a, "blob.core.windows.net")) => {
config.insert_if_not_exists(AzureConfigKey::AccountName, validate(a)?);
config.insert_if_not_exists(
AzureConfigKey::ContainerName,
validate(parsed.username())?,
);
}
Some((a, "dfs.fabric.microsoft.com"))
| Some((a, "blob.fabric.microsoft.com")) => {
config.insert_if_not_exists(AzureConfigKey::AccountName, validate(a)?);
config.insert_if_not_exists(
AzureConfigKey::ContainerName,
validate(parsed.username())?,
);
config.insert_if_not_exists(AzureConfigKey::UseFabricEndpoint, "true");
}
_ => {
return Err(ParseUrlError::UrlNotRecognised {
url: parsed.as_str().to_string(),
}
.into())
}
}
.into());
}
}
"https" => match host.split_once('.') {
Some((a, "dfs.core.windows.net")) | Some((a, "blob.core.windows.net")) => {
config.insert_if_not_exists(AzureConfigKey::AccountName, validate(a)?);
if let Some(container) = parsed.path_segments().unwrap().next() {
let container =
parsed.path_segments().unwrap().next().expect(
"iterator always contains at least one string (which may be empty)",
);
if !container.is_empty() {
config
.insert_if_not_exists(AzureConfigKey::ContainerName, validate(container)?);
}
Expand All @@ -452,10 +463,12 @@ fn parse_url(config: Option<PyAzureConfig>, parsed: &Url) -> object_store::Resul
// - https://onelake.dfs.fabric.microsoft.com/<workspace>/<item>.<itemtype>/<path>/<fileName>
//
// See <https://learn.microsoft.com/en-us/fabric/onelake/onelake-access-api>
if let Some(workspace) = parsed.path_segments().unwrap().next() {
if !workspace.is_empty() {
config.insert_if_not_exists(AzureConfigKey::ContainerName, workspace);
}
let workspace =
parsed.path_segments().unwrap().next().expect(
"iterator always contains at least one string (which may be empty)",
);
if !workspace.is_empty() {
config.insert_if_not_exists(AzureConfigKey::ContainerName, workspace);
}
config.insert_if_not_exists(AzureConfigKey::UseFabricEndpoint, "true");
}
Expand Down
Loading