From 29250418cb5d666b81043695a1df09e4df94e539 Mon Sep 17 00:00:00 2001
From: Anton Popov <anton@clickhouse.com>
Date: Fri, 17 May 2024 20:43:40 +0000
Subject: [PATCH] fix backward incompatibility

---
 .../AzureBlobStorage/AzureBlobStorageCommon.cpp   | 15 +++++++++++++--
 .../test.py                                       |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
index a39cc89b93b..11253d25e3d 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
@@ -92,6 +92,17 @@ Endpoint processEndpoint(const Poco::Util::AbstractConfiguration & config, const
     String container_name;
     String prefix;
 
+    auto get_container_name = [&]
+    {
+        if (config.has(config_prefix + ".container_name"))
+            return config.getString(config_prefix + ".container_name");
+
+        if (config.has(config_prefix + ".container"))
+            return config.getString(config_prefix + ".container");
+
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected either `container` or `container_name` parameter in config");
+    };
+
     if (config.has(config_prefix + ".endpoint"))
     {
         String endpoint = config.getString(config_prefix + ".endpoint");
@@ -154,13 +165,13 @@ Endpoint processEndpoint(const Poco::Util::AbstractConfiguration & config, const
     else if (config.has(config_prefix + ".connection_string"))
     {
         storage_url = config.getString(config_prefix + ".connection_string");
-        container_name = config.getString(config_prefix + ".container_name");
+        container_name = get_container_name();
     }
     else if (config.has(config_prefix + ".storage_account_url"))
     {
         storage_url = config.getString(config_prefix + ".storage_account_url");
         validateStorageAccountUrl(storage_url);
-        container_name = config.getString(config_prefix + ".container_name");
+        container_name = get_container_name();
     }
     else
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected either `storage_account_url` or `connection_string` or `endpoint` in config");
diff --git a/tests/integration/test_backup_restore_azure_blob_storage/test.py b/tests/integration/test_backup_restore_azure_blob_storage/test.py
index 6765a519a6d..1a1458cb68e 100644
--- a/tests/integration/test_backup_restore_azure_blob_storage/test.py
+++ b/tests/integration/test_backup_restore_azure_blob_storage/test.py
@@ -30,12 +30,12 @@ def generate_cluster_def(port):
     <named_collections>
         <azure_conf1>
             <connection_string>DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite1:{port}/devstoreaccount1;</connection_string>
-            <container_name>cont</container_name>
+            <container>cont</container>
             <format>CSV</format>
         </azure_conf1>
         <azure_conf2>
             <storage_account_url>http://azurite1:{port}/devstoreaccount1</storage_account_url>
-            <container_name>cont</container_name>
+            <container>cont</container>
             <format>CSV</format>
             <account_name>devstoreaccount1</account_name>
             <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>