fix backup for azblob disk behavior when storage_account_url contains container as first part in hostname

Slach · Slach · commit 207af82221ef · 2025-05-26T18:15:06.000+05:00
Signed-off-by: Slach &lt;bloodjazman@gmail.com&gt;
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,6 @@
+# v2.6.20
+- fix backup for azblob disk behavior when `storage_account_url` contains container as first part in hostname
+
 # v2.6.19
 BUG FIXES
 - fix `clickhouse_backup_number_backups_remote` and `last_backup_size_remote` metrics behavior in `watch` command, fix [1152](https://github.com/Altinity/clickhouse-backup/issues/1152)
diff --git a/pkg/storage/object_disk/object_disk.go b/pkg/storage/object_disk/object_disk.go
@@ -587,7 +587,7 @@ func makeObjectDiskConnection(ctx context.Context, ch *clickhouse.ClickHouse, cf
 		azureCfg.EndpointSuffix = azureURL.Host
 		if creds.AzureAccountName != "" {
 			azureCfg.AccountName = creds.AzureAccountName
-			azureCfg.EndpointSuffix = strings.TrimPrefix(azureCfg.EndpointSuffix, azureCfg.AccountName+".")
+			azureCfg.EndpointSuffix = strings.TrimPrefix(azureCfg.EndpointSuffix, azureCfg.AccountName+".blob.")
 		}
 		if azureURL.Path != "" {
 			azureCfg.Path = azureURL.Path

Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ func makeObjectDiskConnection(ctx context.Context, ch *clickhouse.ClickHouse, cf`
`587`	`587`	`azureCfg.EndpointSuffix = azureURL.Host`
`588`	`588`	`if creds.AzureAccountName != "" {`
`589`	`589`	`azureCfg.AccountName = creds.AzureAccountName`
`590`		`- azureCfg.EndpointSuffix = strings.TrimPrefix(azureCfg.EndpointSuffix, azureCfg.AccountName+".")`
	`590`	`+ azureCfg.EndpointSuffix = strings.TrimPrefix(azureCfg.EndpointSuffix, azureCfg.AccountName+".blob.")`
`591`	`591`	`}`
`592`	`592`	`if azureURL.Path != "" {`
`593`	`593`	`azureCfg.Path = azureURL.Path`