final changes to fix backup for azblob disk behavior when storage_account_url contains container as first part in hostname, fix #1153

Signed-off-by: Slach <[email protected]>

Author: Slach

ChangeLog.md

@@ -1,12 +1,17 @@
+# v2.6.21
+BUG FIXES
+- final changes to fix backup for azblob disk behavior when `storage_account_url` contains container as first part in hostname, fix [1153](https://github.com/Altinity/clickhouse-backup/issues/1153)
+
 # v2.6.20
-- fix backup for azblob disk behavior when `storage_account_url` contains container as first part in hostname
+BUG FIXES
+- fix backup for azblob disk behavior when `storage_account_url` contains container as first part in hostname, fix [1153](https://github.com/Altinity/clickhouse-backup/issues/1153)
 
 # 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)
 - fix empty `path` and non-empty `object_disk_path` config parameters, allows unexpected deletion backup object disk data, fix [859](https://github.com/Altinity/clickhouse-backup/issues/859) 
 - reproduce behavior `<metadata_path>` parameter in clickhouse `<storage_configuration>` don't contain trailing slash, restore make hardlinks to wrong directory, look details in https://github.com/Altinity/clickhouse-backup/issues/859#issuecomment-2896880448, https://github.com/ClickHouse/ClickHouse/issues/80647 
-- fix backup for azblob disk behavior when `storage_account_url` contains container as first part in hostname
+- fix backup for azblob disk behavior when `storage_account_url` contains container as first part in hostname, fix [1153](https://github.com/Altinity/clickhouse-backup/issues/1153)
 - fix wrong unescape special characters in table create query, fix [1151](https://github.com/Altinity/clickhouse-backup/issues/1151), affected aversions from 2.6.6 to 2.6.18, backups which created in these versions which contains `\` in create table definition, requires manual replacing  `\` to `\\` for properly restore.
 
 # v2.6.18

pkg/storage/azblob.go

@@ -324,7 +324,12 @@ func (a *AzureBlob) WalkAbsolute(ctx context.Context, prefix string, recursive b
 func (a *AzureBlob) CopyObject(ctx context.Context, srcSize int64, srcBucket, srcKey, dstKey string) (int64, error) {
 	dstKey = path.Join(a.Config.ObjectDiskPath, dstKey)
 	a.logf("AZBLOB->CopyObject %s/%s -> %s/%s", srcBucket, srcKey, a.Config.Container, dstKey)
-	srcURLString := fmt.Sprintf("%s://%s.%s/%s/%s", a.Config.EndpointSchema, a.Config.AccountName, a.Config.EndpointSuffix, srcBucket, srcKey)
+	//ugly hack ;(
+	endpoint := a.Config.EndpointSuffix
+	if strings.HasSuffix(endpoint, "core.windows.net") || !strings.HasPrefix(endpoint, "blob.") {
+		endpoint = "blob." + endpoint
+	}
+	srcURLString := fmt.Sprintf("%s://%s.%s/%s/%s", a.Config.EndpointSchema, a.Config.AccountName, endpoint, strings.Trim(srcBucket, "/"), strings.Trim(srcKey, "/"))
 	srcURL, err := url.Parse(srcURLString)
 	if err != nil {
 		return 0, err