fix Object Disks path parsing from config, remove unnecessary "/"

Altinity · Nov 27, 2023 · fd34cf2 · fd34cf2
1 parent 53893c1
commit fd34cf2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.4.8
+BUG FIXES
+- fix Object Disks path parsing from config, remove unnecessary "/"
+
 # v2.4.7
 BUG FIXES
 - `--partitions=(v1,'v2')` could calculate wrong partition expression if system.columns will return fields in different order than they described in PARTITION BY clause, fix [791](https://github.com/Altinity/clickhouse-backup/issues/791)

diff --git a/pkg/storage/object_disk/object_disk.go b/pkg/storage/object_disk/object_disk.go
@@ -468,7 +468,7 @@ func makeObjectDiskConnection(ctx context.Context, ch *clickhouse.ClickHouse, cf
 			if len(hostParts) >= 3 {
 				s3cfg.Region = hostParts[2]
 			}
-			s3cfg.Path = s3URL.Path
+			s3cfg.Path = strings.Trim(s3URL.Path, "/")
 			s3cfg.ForcePathStyle = false
 		} else {
 			pathItems := strings.Split(strings.Trim(s3URL.Path, "/"), "/")
@@ -503,7 +503,7 @@ func makeObjectDiskConnection(ctx context.Context, ch *clickhouse.ClickHouse, cf
 			azureCfg.AccountName = creds.AzureAccountName
 		}
 		if azureURL.Path != "" {
-			azureCfg.Path = azureURL.Path
+			azureCfg.Path = strings.Trim(azureURL.Path, "/")
 			if azureCfg.AccountName != "" && strings.HasPrefix(azureCfg.Path, "/"+creds.AzureAccountName) {
 				azureCfg.Path = strings.TrimPrefix(azureURL.Path, "/"+creds.AzureAccountName)
 			}