Skip to content

chore: Reflect upstream #711 #732

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
Jun 25, 2026
Merged

chore: Reflect upstream #711 #732

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
51 changes: 51 additions & 0 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 @@ -419,6 +419,29 @@ fn parse_url(config: Option<PyAzureConfig>, parsed: &Url) -> object_store::Resul
config.insert_if_not_exists(AzureConfigKey::ContainerName, validate(host)?);
} else {
match host.split_once('.') {
// Workspace-level Private Link detection
// "{workspaceid}.z??.(onelake|dfs|blob).fabric.microsoft.com"
Some((workspaceid, rest))
if rest.starts_with('z') && rest.ends_with("fabric.microsoft.com") =>
{
// Account name for WS-PL is two labels: "{workspaceid}.z{xy}"
let (zone, _) = rest.split_once('.').unwrap_or((rest, ""));

config.insert_if_not_exists(
AzureConfigKey::AccountName,
format!("{workspaceid}.{zone}"),
);
config.insert_if_not_exists(
AzureConfigKey::Endpoint,
format!("https://{}", host),
);

config.insert_if_not_exists(
AzureConfigKey::ContainerName,
validate(parsed.username())?,
);
config.insert_if_not_exists(AzureConfigKey::UseFabricEndpoint, "true");
}
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(
Expand All @@ -445,6 +468,34 @@ fn parse_url(config: Option<PyAzureConfig>, parsed: &Url) -> object_store::Resul
}
}
"https" => match host.split_once('.') {
// Workspace-level Private Link detection
// "{workspaceid}.z??.(onelake|dfs|blob).fabric.microsoft.com"
Some((workspaceid, rest))
if rest.starts_with('z') && rest.ends_with("fabric.microsoft.com") =>
{
// rest looks like: "z28.dfs.fabric.microsoft.com" / "z28.blob.fabric.microsoft.com" / etc.
// Account name for WS-PL is two labels: "{workspaceid}.z{xy}"
let (zone, _) = rest.split_once('.').unwrap_or((rest, ""));

config.insert_if_not_exists(
AzureConfigKey::AccountName,
format!("{workspaceid}.{zone}"),
);
config.insert_if_not_exists(AzureConfigKey::Endpoint, format!("https://{}", host));

// Attempt to infer the container name from the URL
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)?);
}

config.insert_if_not_exists(AzureConfigKey::UseFabricEndpoint, "true");
}
Some((a, "dfs.core.windows.net")) | Some((a, "blob.core.windows.net")) => {
config.insert_if_not_exists(AzureConfigKey::AccountName, validate(a)?);
let container =
Expand Down
Loading