[Datalake] Fix connection string parsing (Azure#24779)

* Fix dfs conn str parsing

* Added unittest

* Some more tests

Author: annatisch

sdk/storage/azure-storage-blob/azure/storage/blob/_shared/base_client.py

@@ -402,7 +402,8 @@ def parse_connection_str(conn_str, credential, service):
             raise ValueError("Connection string missing required connection details.")
     if service == "dfs":
         primary = primary.replace(".blob.", ".dfs.")
-        secondary = secondary.replace(".blob.", ".dfs.")
+        if secondary:
+            secondary = secondary.replace(".blob.", ".dfs.")
     return primary, secondary, credential
 
 

sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/base_client.py

@@ -401,7 +401,8 @@ def parse_connection_str(conn_str, credential, service):
             raise ValueError("Connection string missing required connection details.")
     if service == "dfs":
         primary = primary.replace(".blob.", ".dfs.")
-        secondary = secondary.replace(".blob.", ".dfs.")
+        if secondary:
+            secondary = secondary.replace(".blob.", ".dfs.")
     return primary, secondary, credential
 
 

sdk/storage/azure-storage-file-datalake/tests/test_datalake_service_client.py

@@ -10,7 +10,12 @@
 from azure.core.exceptions import HttpResponseError
 
 
-from azure.storage.filedatalake import DataLakeServiceClient
+from azure.storage.filedatalake import (
+    DataLakeServiceClient,
+    FileSystemClient,
+    DataLakeFileClient,
+    DataLakeDirectoryClient
+)
 
 from settings.testcase import DataLakePreparer
 from devtools_testutils.storage import StorageTestCase
@@ -321,3 +326,25 @@ def test_set_cors(self, datalake_storage_account_name, datalake_storage_account_
         # Assert
         received_props = self.dsc.get_service_properties()
         self._assert_cors_equal(received_props['cors'], cors)
+
+    def test_connectionstring_without_secondary(self):
+        test_conn_str = "DefaultEndpointsProtocol=https;AccountName=foo;AccountKey=bar"
+        client = DataLakeServiceClient.from_connection_string(test_conn_str)
+        assert client.url == 'https://foo.dfs.core.windows.net/'
+        assert client.primary_hostname == 'foo.dfs.core.windows.net'
+        assert not client.secondary_hostname
+
+        client = FileSystemClient.from_connection_string(test_conn_str, "fsname")
+        assert client.url == 'https://foo.dfs.core.windows.net/fsname'
+        assert client.primary_hostname == 'foo.dfs.core.windows.net'
+        assert not client.secondary_hostname
+
+        client = DataLakeFileClient.from_connection_string(test_conn_str, "fsname", "fpath")
+        assert client.url == 'https://foo.dfs.core.windows.net/fsname/fpath'
+        assert client.primary_hostname == 'foo.dfs.core.windows.net'
+        assert not client.secondary_hostname
+
+        client = DataLakeDirectoryClient.from_connection_string(test_conn_str, "fsname", "dname")
+        assert client.url == 'https://foo.dfs.core.windows.net/fsname/dname'
+        assert client.primary_hostname == 'foo.dfs.core.windows.net'
+        assert not client.secondary_hostname

sdk/storage/azure-storage-file-datalake/tests/test_datalake_service_client_async.py

@@ -11,7 +11,12 @@
 from azure.core.exceptions import HttpResponseError
 
 
-from azure.storage.filedatalake.aio import DataLakeServiceClient
+from azure.storage.filedatalake.aio import (
+    DataLakeServiceClient,
+    FileSystemClient,
+    DataLakeFileClient,
+    DataLakeDirectoryClient
+)
 from devtools_testutils.storage.aio import AsyncStorageTestCase as StorageTestCase
 from settings.testcase import DataLakePreparer
 
@@ -316,3 +321,25 @@ async def test_set_cors(self, datalake_storage_account_name, datalake_storage_ac
         # Assert
         received_props = await self.dsc.get_service_properties()
         self._assert_cors_equal(received_props['cors'], cors)
+
+    async def test_connectionstring_without_secondary(self):
+        test_conn_str = "DefaultEndpointsProtocol=https;AccountName=foo;AccountKey=bar"
+        client = DataLakeServiceClient.from_connection_string(test_conn_str)
+        assert client.url == 'https://foo.dfs.core.windows.net/'
+        assert client.primary_hostname == 'foo.dfs.core.windows.net'
+        assert not client.secondary_hostname
+
+        client = FileSystemClient.from_connection_string(test_conn_str, "fsname")
+        assert client.url == 'https://foo.dfs.core.windows.net/fsname'
+        assert client.primary_hostname == 'foo.dfs.core.windows.net'
+        assert not client.secondary_hostname
+
+        client = DataLakeFileClient.from_connection_string(test_conn_str, "fsname", "fpath")
+        assert client.url == 'https://foo.dfs.core.windows.net/fsname/fpath'
+        assert client.primary_hostname == 'foo.dfs.core.windows.net'
+        assert not client.secondary_hostname
+
+        client = DataLakeDirectoryClient.from_connection_string(test_conn_str, "fsname", "dname")
+        assert client.url == 'https://foo.dfs.core.windows.net/fsname/dname'
+        assert client.primary_hostname == 'foo.dfs.core.windows.net'
+        assert not client.secondary_hostname

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/base_client.py

@@ -401,7 +401,8 @@ def parse_connection_str(conn_str, credential, service):
             raise ValueError("Connection string missing required connection details.")
     if service == "dfs":
         primary = primary.replace(".blob.", ".dfs.")
-        secondary = secondary.replace(".blob.", ".dfs.")
+        if secondary:
+            secondary = secondary.replace(".blob.", ".dfs.")
     return primary, secondary, credential
 
 

sdk/storage/azure-storage-queue/azure/storage/queue/_shared/base_client.py

@@ -401,7 +401,8 @@ def parse_connection_str(conn_str, credential, service):
             raise ValueError("Connection string missing required connection details.")
     if service == "dfs":
         primary = primary.replace(".blob.", ".dfs.")
-        secondary = secondary.replace(".blob.", ".dfs.")
+        if secondary:
+            secondary = secondary.replace(".blob.", ".dfs.")
     return primary, secondary, credential